Accepting request 692640 from Java:packages

Multibuild package for proper bootstrapping

OBS-URL: https://build.opensuse.org/request/show/692640
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javacc?expand=0&rev=21

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>bootstrap</package>
+</multibuild>

javacc.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  9 14:37:13 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Make this a multibuild package where the bootstrap version is
+  built using the included javacc.jar and the non-bootstrap version
+  uses the system javacc.jar
+
 -------------------------------------------------------------------
 Wed Feb  6 09:12:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

javacc.spec

@@ -17,7 +17,13 @@
 #
 
 
-Name:           javacc
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "bootstrap"
+%bcond_without bootstrap
+%else
+%bcond_with bootstrap
+%endif
+%global base_name javacc
 Version:        7.0.4
 Release:        0
 Summary:        A Parser and Scanner Generator for Java
@@ -26,13 +32,22 @@ Group:          Development/Libraries/Java
 URL:            http://javacc.org
 Source0:        https://github.com/javacc/javacc/archive/%{version}.tar.gz
 BuildRequires:  ant
+BuildArch:      noarch
+%if %{with bootstrap}
+Name:           %{base_name}-bootstrap
+BuildRequires:  javapackages-tools
+Provides:       %{base_name}
+%else
+Name:           %{base_name}
+BuildRequires:  %{base_name}
 BuildRequires:  fdupes
-BuildRequires:  javacc
 BuildRequires:  javapackages-local
 # Explicit javapackages-tools requires since scripts use
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
-BuildArch:      noarch
+Provides:       %{base_name}-bootstrap
+Obsoletes:      %{base_name}-bootstrap
+%endif
 
 %description
 Java Compiler Compiler (JavaCC) is the most popular parser generator
@@ -66,26 +81,38 @@ Group:          Documentation/HTML
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{base_name}-%{version}
+rm -f lib/*.jar
+%if %{without bootstrap}
+rm -f bootstrap/javacc.jar
+build-jar-repository -s -p bootstrap javacc
 
 find ./examples -type f -exec sed -i 's/\r//' {} \;
 
 # The pom dependencies are wrong
 %pom_xpath_remove pom:project/pom:dependencies
+%endif
 
 %build
-ant \
+%{ant} \
   -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+%if %{with bootstrap}
+  jar
+%else
   jar javadoc
+%endif
 
 %install
 # jar
 install -dm 0755 %{buildroot}%{_javadir}
-install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 0644 target/%{base_name}-%{version}.jar %{buildroot}%{_javadir}/%{base_name}.jar
+
+%if %{without bootstrap}
+
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom
-%add_maven_depmap %{name}.pom %{name}.jar
+%add_maven_depmap %{base_name}.pom %{base_name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
@@ -98,14 +125,22 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
 %jpackage_script jjdoc '' '' javacc jjdoc true
 %jpackage_script jjtree '' '' javacc jjtree true
 
+%endif
+
+%if %{with bootstrap}
+%files
+%{_javadir}/%{base_name}.jar
+%else
 %files -f .mfiles
-%license LICENSE
-%doc README
 %{_bindir}/javacc
 %{_bindir}/javacc.sh
 %{_bindir}/jjdoc
 %{_bindir}/jjtree
+%endif
+%license LICENSE
+%doc README
 
+%if %{without bootstrap}
 %files manual
 %doc www/*
 
@@ -115,5 +150,6 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
 %files javadoc
 %license LICENSE
 %{_javadocdir}/%{name}
+%endif
 
 %changelog