Author: doko
Date: 2006-09-30 16:12:38 +0000 (Sat, 30 Sep 2006)
New Revision: 2521
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/rules
Log:
* Don't build ecj again, just use the system one.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-09-30 16:09:00 UTC (rev 2520)
+++ trunk/eclipse/debian/changelog 2006-09-30 16:12:38 UTC (rev 2521)
@@ -47,6 +47,7 @@
[ Matthias Klose ]
* Build-depend on java-gcj-compat-dev (>> 1.0.65-4), remove explicit build
dependency on ecj-bootstrap-gcj.
+ * Don't build ecj again, just use the system one.
-- Michael Koch <[EMAIL PROTECTED]> Mon, 18 Sep 2006 05:22:34 +0000
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-09-30 16:09:00 UTC (rev 2520)
+++ trunk/eclipse/debian/rules 2006-09-30 16:12:38 UTC (rev 2521)
@@ -77,20 +77,11 @@
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 bootstrap compilation.
-ECJ_BOOTSTRAP_CLASSPATH=$(SOURCE_TREE)/jdtcoresrc/ecj.jar
-# use ecj-bootstrap as compiler
-ECJ_BOOTSTRAP_CLASSPATH=$(SOURCE_TREE)/jdtcoresrc/ecj.jar:/usr/share/java/ecj.jar
-ECJ_BOOTSTRAP_COMPILER=org.eclipse.jdt.core.JDTCompilerAdapter
-ECJ_BOOTSTRAP_ANT_RUN=$(JAVA_RUN) -cp
$(ANT_CLASSPATH):$(ECJ_BOOTSTRAP_CLASSPATH) $(ANT_OPTS)
-Dbuild.compiler=$(ECJ_BOOTSTRAP_COMPILER) -Dbuild.compiler.warnings=false
$(ANT_CLASS)
-
# Eclipse Compiler for Java configuration.
-# ECJ_CLASSPATH classpath components required to use the ecj
compiler
# ECJ_COMPILER Ant compilation adapter class
# ECJ_ANT_RUN command line for invoking Ant with ecj
-ECJ_CLASSPATH=$$(for jar in $(SOURCE_TREE)/ecj.jar
$(SOURCE_TREE)/plugins/org.eclipse.tomcat/tomcat-coyote.jar; do echo -n
"$$jar:"; done)
ECJ_COMPILER=org.eclipse.jdt.core.JDTCompilerAdapter
-ECJ_ANT_RUN=LD_PRELOAD=$(BUILD_TREE)/ecj.jar.so $(JAVA_RUN) -cp
$(ANT_CLASSPATH):$(ECJ_CLASSPATH) $(ANT_OPTS) -Dbuild.compiler=$(ECJ_COMPILER)
$(ANT_CLASS)
+ECJ_ANT_RUN=$(JAVA_RUN) -cp $(ANT_CLASSPATH) $(ANT_OPTS)
-Dbuild.compiler=$(ECJ_COMPILER) $(ANT_CLASS)
# Variables for package creation.
ECLIPSE_HOME=usr/share/eclipse
@@ -329,39 +320,11 @@
insertBuildId
touch prepare-stamp
-
-build-ecj: build-ecj-stamp
-build-ecj-stamp: prepare-stamp
- dh_testdir
-
- # Build the included ecj.jar. The compilation expects there to be an
- # existing version of the JDTCompilerAdapter for Ant present on the
- # classpath. To facilitate this, we depend on either ecj-bootstrap or
- # a previous build of eclipse-ecj. This produced Jar file becomes the
- # new eclipse-ecj package.
-
- cd $(SOURCE_TREE)/jdtcoresrc && \
- $(JVM_ANT_RUN) \
- -f compilejdtcorewithjavac.xml
-
- cd $(SOURCE_TREE)/jdtcoresrc && \
- $(ECJ_BOOTSTRAP_ANT_RUN) \
- -f compilejdtcore.xml
-
- mkdir -p $(BUILD_TREE)
-
-ifeq ($(enable_native),yes)
- # Creating a native version of ecj speeds up the compilation of Eclipse.
- $(AOT_COMPILE) $(SOURCE_TREE)/ecj.jar $(BUILD_TREE)/ecj.jar.so
-endif
-
- touch build-ecj-stamp
-
build: build-java
build-java: build-java-stamp
-build-java-stamp: prepare-stamp build-ecj-stamp
+build-java-stamp: prepare-stamp
dh_testdir
# Build the complete Eclipse SDK distribution. This takes a long time.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
