pool/ant
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=93

Browse Source
This commit is contained in:
Fridrich Strba 2017-09-14 07:20:41 +00:00 committed by Git OBS Bridge
parent cd778b385e
commit 0efd11248a
7 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ant-antlr.changes
View File

@ -4,6 +4,10 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
- Allow bootstrapping with something else then
java-1_5_0-gcj-compat, but still require
java-1_5_0-gcj-compat-devel
- Added patch:
* apache-ant-bootstrap.patch
- Add -sourcepath option to fix build breakages with Eclipse
Compiler for Java(tm)
-------------------------------------------------------------------
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com

3
ant-antlr.spec
View File

@ -44,6 +44,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -353,6 +354,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%if ! %{with bootstrap}
%patch4 -p1
%endif
%patch5 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
@ -393,7 +395,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-source 1.5 -target 1.5"
sh -x ./build.sh --noconfig jars

4
ant-junit.changes
View File

@ -4,6 +4,10 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
- Allow bootstrapping with something else then
java-1_5_0-gcj-compat, but still require
java-1_5_0-gcj-compat-devel
- Added patch:
* apache-ant-bootstrap.patch
- Add -sourcepath option to fix build breakages with Eclipse
Compiler for Java(tm)
-------------------------------------------------------------------
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com

3
ant-junit.spec
View File

@ -44,6 +44,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -353,6 +354,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%if ! %{with bootstrap}
%patch4 -p1
%endif
%patch5 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
@ -393,7 +395,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-source 1.5 -target 1.5"
sh -x ./build.sh --noconfig jars

4
ant.changes
View File

@ -4,6 +4,10 @@ Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
- Allow bootstrapping with something else then
java-1_5_0-gcj-compat, but still require
java-1_5_0-gcj-compat-devel
- Added patch:
* apache-ant-bootstrap.patch
- Add -sourcepath option to fix build breakages with Eclipse
Compiler for Java(tm)
-------------------------------------------------------------------
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com

3
ant.spec
View File

@ -43,6 +43,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -352,6 +353,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%if ! %{with bootstrap}
%patch4 -p1
%endif
%patch5 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
@ -392,7 +394,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME="%{java_home}"
export CLASSPATH="$JAVA_HOME/lib/tools.jar"
export BOOTJAVAC_OPTS="-source 1.5 -target 1.5"
sh -x ./build.sh --noconfig jars

12
apache-ant-bootstrap.patch Normal file
View File

@ -0,0 +1,12 @@
--- apache-ant-1.9.9/bootstrap.sh 2017-02-02 18:55:08.000000000 +0100
+++ apache-ant-1.9.9/bootstrap.sh 2017-09-14 09:10:47.071433171 +0200
@@ -124,8 +124,7 @@
mkdir -p bin
echo ... Compiling Ant Classes
-
-"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} -sourcepath src/main ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
${TOOLS}/ant/util/regexp/RegexpMatcher.java \
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
${TOOLS}/ant/property/*.java \