[pkg-java] r4485 - trunk/eclipse/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-10-29 07:07:39 +0000 (Mon, 29 Oct 2007)
New Revision: 4485

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/rules
Log:
* Added ant-nodeps.jar to ant classpath. Needed for replaceregexp tag.
* Simplified debian/rules by removing all JVM_* variables.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2007-10-29 06:15:57 UTC (rev 4484)
+++ trunk/eclipse/debian/changelog	2007-10-29 07:07:39 UTC (rev 4485)
@@ -1,8 +1,10 @@
 eclipse (3.2.2-5) UNRELEASED; urgency=low
 
   * Added junit4 support.
+  * Added ant-nodeps.jar to ant classpath. Needed for replaceregexp tag.
+  * Simplified debian/rules by removing all JVM_* variables.
 
- -- Michael Koch <konqueror at gmx.de>  Thu, 11 Oct 2007 08:16:25 +0200
+ -- Michael Koch <konqueror at gmx.de>  Mon, 29 Oct 2007 08:07:19 +0100
 
 eclipse (3.2.2-4) unstable; urgency=low
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2007-10-29 06:15:57 UTC (rev 4484)
+++ trunk/eclipse/debian/rules	2007-10-29 07:07:39 UTC (rev 4485)
@@ -93,19 +93,12 @@
 # ANT_OPTS		properties to be added to the VM when running Ant
 ANT_CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar
 # use ecj-bootstrap as compiler
-ANT_CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/java/ecj.jar
+ANT_CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/ant/lib/ant-nodeps.jar:/usr/share/java/ecj.jar
 ANT_CLASS=org.apache.tools.ant.Main
 ANT_OPTS=-DjavacFailOnError=true -DjavacVerbose=false -DjavacSource=1.5 -DjavacTarget=1.5
 ANT_DEP := ant-optional (>= 1.6.5-3)
 BUILD_DEPS += , ant-optional (>= 1.6.5-3)
 
-# Generic VM compilation.
-JVM_CLASSPATH=
-JVM_COMPILER=gcj
-# use ecj-bootstrap as compiler
-JVM_COMPILER=org.eclipse.jdt.core.JDTCompilerAdapter
-JVM_ANT_RUN=$(JAVA_RUN) -cp $(ANT_CLASSPATH):$(JVM_CLASSPATH) $(ANT_OPTS) -Dbuild.compiler=$(JVM_COMPILER) -Dbuild.compiler.warnings=false $(ANT_CLASS)
-
 # Eclipse Compiler for Java configuration.
 # ECJ_COMPILER		Ant compilation adapter class
 # ECJ_ANT_RUN		command line for invoking Ant with ecj
@@ -418,7 +411,7 @@
 
 	# Update build ids in configuration files
 	cd $(SOURCE_TREE) && \
-	$(JVM_ANT_RUN) \
+	$(ECJ_ANT_RUN) \
 		-Djava5.home=/usr/lib/jvm/java-gcj \
 		-Djava.endorsed.dirs=$(SOURCE_TREE)/plugins/org.eclipse.tomcat \
 		-Dnobootstrap=true \