Author: ebourg-guest
Date: 2013-03-27 13:05:41 +0000 (Wed, 27 Mar 2013)
New Revision: 16443
Modified:
trunk/ant/debian/ant.properties
trunk/ant/debian/changelog
trunk/ant/debian/control
trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch
trunk/ant/debian/patches/0005-add-gjdoc-task.patch
trunk/ant/debian/patches/0007-use-build.classpath.patch
trunk/ant/debian/rules
Log:
Preliminary work for Ant 1.9
Modified: trunk/ant/debian/ant.properties
===================================================================
--- trunk/ant/debian/ant.properties 2013-03-27 09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/ant.properties 2013-03-27 13:05:41 UTC (rev 16443)
@@ -1,5 +1,5 @@
base64.present=true
sunuue.present=true
offline=true
-javac.target=1.3
-javac.source=1.3
+javac.target=1.5
+javac.source=1.5
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2013-03-27 09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/changelog 2013-03-27 13:05:41 UTC (rev 16443)
@@ -1,15 +1,20 @@
-ant (1.8.2-5) UNRELEASED; urgency=low
+ant (1.9.0-1) UNRELEASED; urgency=low
- [Ludovic Claude]
+ [ Ludovic Claude ]
* Add version constraint on libxml-commons-resolver1.1-java to
secure backport of Ant on Squeeze.
- [Tony Mancill]
+ [ Tony Mancill ]
* Team upload.
* Remove Michael Koch Uploaders (Closes: #653982)
- -- Ludovic Claude <ludovic.cla...@laposte.net> Tue, 14 Feb 2012 00:06:57
+0100
+ [ Emmanuel Bourg ]
+ * New upstream release.
+ - Refreshed the patches
+ - Upgrade source and target version to 1.5
+ -- Emmanuel Bourg <ebo...@apache.org> Wed, 27 Mar 2013 13:36:35 +0100
+
ant (1.8.2-4) unstable; urgency=low
* Team upload.
Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control 2013-03-27 09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/control 2013-03-27 13:05:41 UTC (rev 16443)
@@ -5,7 +5,8 @@
Uploaders: Matthias Klose <d...@debian.org>,
Ludovic Claude <ludovic.cla...@laposte.net>,
Torsten Werner <twer...@debian.org>,
- James Page <james.p...@canonical.com>
+ James Page <james.p...@canonical.com>,
+ Emmanuel Bourg <ebo...@apache.org>
Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), default-jdk,
maven-repo-helper (>> 1.0),
libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>=
2.4.0), junit, junit4, antlr,
liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0),
libcommons-logging-java, libjdepend-java,
Modified: trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
===================================================================
--- trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
2013-03-27 09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
2013-03-27 13:05:41 UTC (rev 16443)
@@ -8,77 +8,72 @@
.../org/apache/tools/ant/util/JavaEnvUtils.java | 14 ++++++++++++++
3 files changed, 17 insertions(+), 2 deletions(-)
-Index:
apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
-===================================================================
----
apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
2010-12-20 18:48:16.000000000 +0000
-+++
apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
2011-05-04 15:19:49.235567112 +0100
-@@ -32,6 +32,7 @@
-
- // sorted by newest Kaffe version first
- private static final String[] N2A_CLASSNAMES = new String[] {
+---
a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
++++
b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
+@@ -32,7 +32,7 @@
+
+ // sorted by newest Kaffe version first
+ private static final String[] N2A_CLASSNAMES = new String[] {
+- "gnu.classpath.tools.native2ascii.Native2Ascii",
+ "gnu.classpath.tools.native2ascii.Native2ASCII",
- "gnu.classpath.tools.native2ascii.Native2Ascii",
- // pre Kaffe 1.1.5
- "kaffe.tools.native2ascii.Native2Ascii",
-Index:
apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
-===================================================================
----
apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
2010-12-20 18:48:16.000000000 +0000
-+++
apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
2011-05-04 15:19:49.235567112 +0100
+ // pre Kaffe 1.1.5
+ "kaffe.tools.native2ascii.Native2Ascii",
+ };
+---
a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
++++
b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
@@ -40,7 +40,7 @@
- * vendor
- */
- public static String getDefault() {
-- if (JavaEnvUtils.isKaffe()) {
+ * vendor
+ */
+ public static String getDefault() {
+- if (JavaEnvUtils.isKaffe()) {
+ if (JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased()) {
- return KaffeNative2Ascii.IMPLEMENTATION_NAME;
- }
- return SunNative2Ascii.IMPLEMENTATION_NAME;
+ return KaffeNative2Ascii.IMPLEMENTATION_NAME;
+ }
+ return SunNative2Ascii.IMPLEMENTATION_NAME;
@@ -79,7 +79,7 @@
- ProjectComponent log,
- Path classpath)
- throws BuildException {
-- if ((JavaEnvUtils.isKaffe() && choice == null)
+ ProjectComponent log,
+ Path classpath)
+ throws BuildException {
+- if ((JavaEnvUtils.isKaffe() && choice == null)
+ if (((JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased()) &&
choice == null)
- || KaffeNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
- return new KaffeNative2Ascii();
- } else if (SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
-Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
-===================================================================
---- apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
2010-12-20 18:48:17.000000000 +0000
-+++ apache-ant-1.8.2/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
2011-05-04 15:20:36.905590251 +0100
-@@ -96,6 +96,10 @@
-
- /** Whether this is the Kaffe VM */
- private static boolean kaffeDetected;
+ || KaffeNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
+ return new KaffeNative2Ascii();
+ } else if (SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
+--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
++++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+@@ -101,6 +101,10 @@
+
+ /** Whether this is the Kaffe VM */
+ private static boolean kaffeDetected;
+
+ /** Wheter this is a GNU Classpath based VM */
+ private static boolean classpathDetected;
+
- /** Whether this is the GNU VM (gcj/gij) */
- private static boolean gijDetected;
-
-@@ -165,6 +169,13 @@
- } catch (Throwable t) {
- // swallow as this simply doesn't seem to be Apache Harmony
- }
-+ classpathDetected = false;
-+ try {
-+ Class.forName("gnu.classpath.Configuration");
-+ classpathDetected = true;
-+ } catch (Throwable t) {
-+ // swallow as this simply doesn't seem to be GNU classpath
based.
-+ }
- }
-
- /**
-@@ -224,6 +235,10 @@
- public static boolean isKaffe() {
- return kaffeDetected;
- }
-+
+ /** Whether this is the GNU VM (gcj/gij) */
+ private static boolean gijDetected;
+
+@@ -159,6 +163,13 @@
+ } catch (Throwable t) {
+ // swallow as this simply doesn't seem to be Kaffe
+ }
++ classpathDetected = false;
++ try {
++ Class.forName("gnu.classpath.Configuration");
++ classpathDetected = true;
++ } catch (Throwable t) {
++ // swallow as this simply doesn't seem to be GNU classpath based.
++ }
+ gijDetected = false;
+ try {
+ Class.forName("gnu.gcj.Core");
+@@ -233,6 +244,10 @@
+ return kaffeDetected;
+ }
+
+ public static boolean isClasspathBased() {
+ return classpathDetected;
+ }
-
- /**
- * Checks whether the current Java VM is the GNU interpreter gij
++
+ /**
+ * Checks whether the current Java VM is the GNU interpreter gij
+ * or we are running in a gcj precompiled binary.
Modified: trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
===================================================================
--- trunk/ant/debian/patches/0002-do-not-build-test-jars.patch 2013-03-27
09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/patches/0002-do-not-build-test-jars.patch 2013-03-27
13:05:41 UTC (rev 16443)
@@ -6,16 +6,14 @@
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-Index: apache-ant-1.8.2/build.xml
-===================================================================
---- apache-ant-1.8.2.orig/build.xml 2011-05-04 15:32:03.355912171 +0100
-+++ apache-ant-1.8.2/build.xml 2011-05-04 15:32:09.565914993 +0100
-@@ -791,7 +791,7 @@
- ===================================================================
- -->
- <target name="dist-lite"
-- depends="jars,test-jar"
-+ depends="jars"
- description="--> creates a minimum distribution to run Apache Ant">
-
- <mkdir dir="${dist.dir}"/>
+--- a/build.xml
++++ b/build.xml
+@@ -867,7 +867,7 @@
+ ===================================================================
+ -->
+ <target name="dist-lite"
+- depends="jars,test-jar"
++ depends="jars"
+ description="--> creates a minimum distribution to run Apache Ant">
+
+ <mkdir dir="${dist.dir}"/>
Modified: trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch
===================================================================
--- trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch
2013-03-27 09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/patches/0003-add-Xerces-from-Debian-s-path.patch
2013-03-27 13:05:41 UTC (rev 16443)
@@ -6,11 +6,9 @@
src/script/ant | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
-diff --git a/src/script/ant b/src/script/ant
-index 0dc84e0..7415eeb 100644
--- a/src/script/ant
+++ b/src/script/ant
-@@ -155,6 +155,13 @@ if [ ! -x "$JAVACMD" ] ; then
+@@ -159,6 +159,13 @@
exit 1
fi
@@ -24,4 +22,3 @@
# Build local classpath using just the launcher in non-rpm mode or
# use the Jpackage helper in rpm mode with basic and default jars
# specified in the ant.conf configuration. Because the launcher is
---
Modified: trunk/ant/debian/patches/0005-add-gjdoc-task.patch
===================================================================
--- trunk/ant/debian/patches/0005-add-gjdoc-task.patch 2013-03-27 09:15:09 UTC
(rev 16442)
+++ trunk/ant/debian/patches/0005-add-gjdoc-task.patch 2013-03-27 13:05:41 UTC
(rev 16443)
@@ -8,10 +8,8 @@
2 files changed, 2147 insertions(+), 0 deletions(-)
create mode 100644 main/org/apache/tools/ant/taskdefs/Gjdoc.java
-Index: apache-ant-1.8.2/main/org/apache/tools/ant/taskdefs/Gjdoc.java
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ apache-ant-1.8.2/main/org/apache/tools/ant/taskdefs/Gjdoc.java
2011-05-04 15:31:43.065902942 +0100
+--- /dev/null
++++ b/main/org/apache/tools/ant/taskdefs/Gjdoc.java
@@ -0,0 +1,2146 @@
+/*
+ * Copyright 2000-2005 The Apache Software Foundation
@@ -2159,15 +2157,13 @@
+ }
+
+}
-Index:
apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/defaults.properties
-===================================================================
----
apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/taskdefs/defaults.properties
2011-05-04 15:31:38.195900724 +0100
-+++
apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/defaults.properties
2011-05-04 15:31:43.065902942 +0100
-@@ -65,6 +65,7 @@
- java=org.apache.tools.ant.taskdefs.Java
- javac=org.apache.tools.ant.taskdefs.Javac
- javadoc=org.apache.tools.ant.taskdefs.Javadoc
+--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
++++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+@@ -66,6 +66,7 @@
+ java=org.apache.tools.ant.taskdefs.Java
+ javac=org.apache.tools.ant.taskdefs.Javac
+ javadoc=org.apache.tools.ant.taskdefs.Javadoc
+gjdoc=org.apache.tools.ant.taskdefs.Gjdoc
- length=org.apache.tools.ant.taskdefs.Length
- loadfile=org.apache.tools.ant.taskdefs.LoadFile
- loadproperties=org.apache.tools.ant.taskdefs.LoadProperties
+ length=org.apache.tools.ant.taskdefs.Length
+ loadfile=org.apache.tools.ant.taskdefs.LoadFile
+ loadproperties=org.apache.tools.ant.taskdefs.LoadProperties
Modified: trunk/ant/debian/patches/0007-use-build.classpath.patch
===================================================================
--- trunk/ant/debian/patches/0007-use-build.classpath.patch 2013-03-27
09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/patches/0007-use-build.classpath.patch 2013-03-27
13:05:41 UTC (rev 16443)
@@ -6,16 +6,14 @@
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-Index: apache-ant-1.8.2/build.xml
-===================================================================
---- apache-ant-1.8.2.orig/build.xml 2011-05-04 15:31:54.275908042 +0100
-+++ apache-ant-1.8.2/build.xml 2011-05-04 15:31:54.325908066 +0100
-@@ -119,7 +119,7 @@
- ===================================================================
- -->
- <path id="classpath">
-- <fileset dir="lib/optional" includes="*.jar"/>
-+ <pathelement path="${build.classpath}"/>
- </path>
-
- <path id="tests-classpath">
+--- a/build.xml
++++ b/build.xml
+@@ -122,7 +122,7 @@
+ ===================================================================
+ -->
+ <path id="classpath">
+- <fileset dir="lib/optional" includes="*.jar"/>
++ <pathelement path="${build.classpath}"/>
+ </path>
+
+ <path id="tests-classpath">
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2013-03-27 09:15:09 UTC (rev 16442)
+++ trunk/ant/debian/rules 2013-03-27 13:05:41 UTC (rev 16443)
@@ -15,7 +15,7 @@
# needed for bootstrap.sh
export JAVAC=$(JAVA_HOME)/bin/javac
# needed for bootstrap
-export BOOTJAVAC_OPTS=-source 1.3 -target 1.3 -nowarn
+export BOOTJAVAC_OPTS=-source 1.5 -target 1.5 -nowarn
# needed for building with bootstrap ant
export ANT_HOME := bootstrap
@@ -40,14 +40,14 @@
# remove -SNAPSHOT from the versions in the Maven poms
perl -p -i -e 's/-SNAPSHOT//g' `find src/etc/poms/ -name pom.xml`
# the rest
- /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4
-Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile
debian/ant.properties jars test-jar
+ /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5
-Dant.build.javac.target=1.5 -Dbuild.classpath=${CLASSPATH} -propertyfile
debian/ant.properties jars test-jar
ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/lib/xml-apis.jar
ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/lib/xercesImpl.jar
touch stamp-build-ant
build-ant-doc: stamp-build-ant-doc
stamp-build-ant-doc:
- /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4
-Dant.build.javac.target=1.4 -Dbuild.classpath=${CLASSPATH} -propertyfile
debian/ant.properties javadocs
+ /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5
-Dant.build.javac.target=1.5 -Dbuild.classpath=${CLASSPATH} -propertyfile
debian/ant.properties javadocs
touch $@
install/ant-doc:: build-ant-doc
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
