From 714ff47139e7c3ecc551c955c983f3ad7989edca15a2806f2144c6409d2bf72d Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Mon, 26 Aug 2013 12:19:32 +0000 Subject: [PATCH] - Don't build tests when bootstrapping - properly synchronized both spec files - don't build javadoc - fix build with antlr-bootstrap - Don't build tests when bootstrapping - properly synchronized both spec files OBS-URL: https://build.opensuse.org/package/show/Java:packages/jflex?expand=0&rev=9 --- jflex-bootstrap.changes | 16 ++++++++++++ jflex-bootstrap.spec | 57 ++++++++--------------------------------- jflex.changes | 6 +++++ jflex.spec | 9 +++++-- 4 files changed, 40 insertions(+), 48 deletions(-) diff --git a/jflex-bootstrap.changes b/jflex-bootstrap.changes index a95fccd..21c0612 100644 --- a/jflex-bootstrap.changes +++ b/jflex-bootstrap.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Aug 26 12:18:15 UTC 2013 - mvyskocil@suse.com + +- Don't build tests when bootstrapping +- properly synchronized both spec files + +------------------------------------------------------------------- +Fri Aug 23 09:06:21 UTC 2013 - mvyskocil@suse.com + +- don't build javadoc + +------------------------------------------------------------------- +Thu Feb 17 00:59:58 CET 2011 - mvyskocil@suse.cz + +- fix build with antlr-bootstrap + ------------------------------------------------------------------- Thu May 21 17:11:33 CEST 2009 - mvyskocil@suse.cz diff --git a/jflex-bootstrap.spec b/jflex-bootstrap.spec index 267b79e..4d6e927 100644 --- a/jflex-bootstrap.spec +++ b/jflex-bootstrap.spec @@ -46,12 +46,13 @@ Patch4: jflex-byaccj-utl.patch Requires: java_cup Requires: jpackage-utils BuildRequires: ant +BuildRequires: antlr-bootstrap BuildRequires: java-cup-bootstrap %if %without bootstrap BuildRequires: jflex-bootstrap +BuildRequires: junit %endif BuildRequires: java-1_5_0-gcj-compat-devel -BuildRequires: junit BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,27 +73,6 @@ Design goals The main design goals of JFlex are: %if %without bootstrap -%package javadoc -Summary: Javadoc for %{name} -Group: Development/Libraries/Java - -%description javadoc -JFlex is a lexical analyzer generator for Java written in Java. It is -also a rewrite of the very useful tool JLex which was developed by -Elliot Berk at Princeton University. As Vern Paxson states for his C/C++ -tool flex: they do not share any code though. - -Design goals The main design goals of JFlex are: - - * Full unicode support - * Fast generated scanners - * Fast scanner generation - * Convenient specification syntax - * Platform independence - * JLex compatibility - -This package contains javadoc for %{name}. - %package doc Summary: Documentation and examples for %{name} Group: Development/Libraries/Java @@ -129,9 +109,13 @@ pushd src popd %endif %patch0 -p1 + %if %with bootstrap %patch1 -p1 -%else + +echo `pwd` +rm -rf src/JFlex/tests +%else # with bootstrap # You must use Re jflex.spec and have a java-cup and jflex installed %patch2 -p1 #%patch3 -p1 @@ -141,16 +125,13 @@ popd %build pushd src %if %without bootstrap -export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex) +export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex antlr-bootstrap) %else -export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit) +export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit antlr-bootstrap) %endif export OPT_JAR_LIST=: -%ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar -%if %without bootstrap -%{__mkdir_p} ../dist/docs/api -%{javadoc} -d ../dist/docs/api `find . -type f -name "*.java"` -%endif +echo `pwd` +%ant jar popd %install @@ -162,20 +143,9 @@ popd # compatibility symlink (cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar) -%if %without bootstrap -# javadoc -%{__mkdir_p} 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -%endif - %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex -%clean -%{__rm} -rf %{buildroot} -%{__rm} -rf %{_builddir}/jflex - %files %defattr(0644,root,root,0755) %doc COPYRIGHT src/README src/changelog @@ -186,11 +156,6 @@ popd %if %without bootstrap -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} - %files doc %defattr(0644,root,root,0755) %doc examples doc diff --git a/jflex.changes b/jflex.changes index 6fa72e4..21c0612 100644 --- a/jflex.changes +++ b/jflex.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 26 12:18:15 UTC 2013 - mvyskocil@suse.com + +- Don't build tests when bootstrapping +- properly synchronized both spec files + ------------------------------------------------------------------- Fri Aug 23 09:06:21 UTC 2013 - mvyskocil@suse.com diff --git a/jflex.spec b/jflex.spec index 7296a84..4ccbb4c 100644 --- a/jflex.spec +++ b/jflex.spec @@ -49,9 +49,9 @@ BuildRequires: antlr-bootstrap BuildRequires: java-cup-bootstrap %if %without bootstrap BuildRequires: jflex-bootstrap +BuildRequires: junit %endif BuildRequires: java-1_5_0-gcj-compat-devel -BuildRequires: junit BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -108,9 +108,13 @@ pushd src popd %endif %patch0 -p1 + %if %with bootstrap %patch1 -p1 -%else + +echo `pwd` +rm -rf src/JFlex/tests +%else # with bootstrap # You must use Re jflex.spec and have a java-cup and jflex installed %patch2 -p1 #%patch3 -p1 @@ -125,6 +129,7 @@ export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex antlr-b export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit antlr-bootstrap) %endif export OPT_JAR_LIST=: +echo `pwd` %ant jar popd