r1786 - in trunk/libxpp3-java/debian: . patches

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-01-23 14:29:23 +0000 (Mon, 23 Jan 2006)
New Revision: 1786

Added:
   trunk/libxpp3-java/debian/patches/02_Buildxml_target.patch
Modified:
   trunk/libxpp3-java/debian/changelog
   trunk/libxpp3-java/debian/rules
Log:
Update to kaffe transition upload.

Modified: trunk/libxpp3-java/debian/changelog
===================================================================
--- trunk/libxpp3-java/debian/changelog	2006-01-23 14:28:28 UTC (rev 1785)
+++ trunk/libxpp3-java/debian/changelog	2006-01-23 14:29:23 UTC (rev 1786)
@@ -1,3 +1,11 @@
+libxpp3-java (1.1.3.4.O-3) unstable; urgency=low
+
+  * Removed explicit usage of jikes build compiler property
+    for kaffe jikes -> ecj transition
+  * Added patch to raise build target to 1.3 - required for ecj
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Fri,  6 Jan 2006 19:06:52 +0100
+
 libxpp3-java (1.1.3.4.O-2) unstable; urgency=low
 
   * Added ant-optional due to ant reorganization

Added: trunk/libxpp3-java/debian/patches/02_Buildxml_target.patch
===================================================================
--- trunk/libxpp3-java/debian/patches/02_Buildxml_target.patch	2006-01-23 14:28:28 UTC (rev 1785)
+++ trunk/libxpp3-java/debian/patches/02_Buildxml_target.patch	2006-01-23 14:29:23 UTC (rev 1786)
@@ -0,0 +1,47 @@
+--- build.xml.orig	2006-01-06 19:07:27.000000000 +0100
++++ build.xml	2006-01-06 19:10:55.000000000 +0100
+@@ -219,20 +219,20 @@
+ 
+   <target name="api" depends="prepare,update_api">
+     <mkdir dir="${build_api}"/>
+-    <javac debug="${debug}" deprecation="${deprecation}" target="1.1"
++    <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"
+       srcdir="${src_api}" destdir="${build_api}" classpath="${build_api}"/>
+   </target>
+ 
+   <target name="impl_min" depends="prepare,api">
+     <mkdir dir="${build_classes_min}"/>
+     <touch file="${build_classes_min}/${xpp3_tag}_MIN_VERSION"/>
+-    <javac debug="${debug}" deprecation="${deprecation}" target="1.1"
++    <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"
+       srcdir="${src_api}" destdir="${build_classes_min}" classpath="${build_classes_min}">
+        <include name="**/*.java"/>
+        <exclude name="**/*Factory.java"/>
+        <exclude name="**/*Serializer.java"/>
+     </javac>
+-    <javac debug="${debug}" deprecation="${deprecation}" target="1.1"
++    <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"
+        srcdir="${src_impl_min}" destdir="${build_classes_min}" classpath="${build_classes_min}"/>
+     <mkdir dir="${build_classes_min}/META-INF/services"/>
+     <copy todir="${build_classes_min}/META-INF/services">
+@@ -248,7 +248,7 @@
+   </target>
+ 
+   <target name="serializer" depends="prepare,api">
+-    <javac debug="${debug}" deprecation="${deprecation}" target="1.1"
++    <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"
+        srcdir="${src_impl_serializer}" destdir="${build_classes}" classpath="${build_api}"/>
+   </target>
+ 
+@@ -277,9 +277,9 @@
+   </target>
+ 
+   <target name="impl" depends="impl_min,serializer">
+-    <javac debug="${debug}" deprecation="${deprecation}" target="1.1"
++    <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"
+        srcdir="${src_impl_min}" destdir="${build_classes}" classpath="${build_api}"/>
+-    <javac debug="${debug}" deprecation="${deprecation}" target="1.1"
++    <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"
+        srcdir="${src_impl_standard}" destdir="${build_classes}" classpath="${build_api}"/>
+     <mkdir dir="${build_classes}/META-INF/services"/>
+     <copy todir="${build_classes}/META-INF/services">

Modified: trunk/libxpp3-java/debian/rules
===================================================================
--- trunk/libxpp3-java/debian/rules	2006-01-23 14:28:28 UTC (rev 1785)
+++ trunk/libxpp3-java/debian/rules	2006-01-23 14:29:23 UTC (rev 1786)
@@ -10,7 +10,6 @@
 JAVA_HOME := /usr/lib/kaffe
 ANT_HOME := /usr/share/ant
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit
-DEB_ANT_COMPILER := jikes
 DEB_ANT_BUILD_TARGET := xpp3 junit apidoc
 
 clean::