Author: tgg
Date: 2007-06-13 22:25:24 +0000 (Wed, 13 Jun 2007)
New Revision: 3645

Modified:
   trunk/eclipse-cdt/debian/rules
Log:
compilation seems to complete, packaging does not.

Yet to be done:
 * FC has two packages: eclipse-cdt and eclipse-cdt-sdk
 * FC eclipse-cdt depends on eclipse-platform only (solves #385350 maybe?)
 * FC eclipse-cdt depends on:  g++, make, gdb. Makes sense
 * Check FC prebuild steps:
   o sed
   o platform script from eclipse (can't find it on Debian)

Later:
 * FC ships an autoconf, automake plugin
 * FC ships a cppunit plugin


Modified: trunk/eclipse-cdt/debian/rules
===================================================================
--- trunk/eclipse-cdt/debian/rules      2007-06-13 21:14:55 UTC (rev 3644)
+++ trunk/eclipse-cdt/debian/rules      2007-06-13 22:25:24 UTC (rev 3645)
@@ -9,7 +9,8 @@
 SOURCE=$(shell echo upstream/*.tar.bz2)
 SOURCE_TREE=source-tree
 JAVA_HOME=/usr/lib/jvm/java-gcj
-JAVA_RUN=$(JAVA_HOME)/bin/java 
-Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db
+export JAVA_HOME
+JAVA_RUN=$(JAVA_HOME)/bin/java
 ANT_RUN=ant
 homedir=$(CURDIR)/home
 ECLIPSE_BASE=/usr/lib/eclipse
@@ -101,7 +102,7 @@
        dh_testdir
        
        # Create home.
-       mkdir home
+       mkdir -p home
        
        # build native code.
        cd 
$(SOURCE_TREE)/org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux/library
 && \
@@ -110,19 +111,15 @@
        # Call eclipse headless to process CDT releng build scripts
        cd $(SOURCE_TREE)/$(RELENG_PLUGIN) && \
        $(JAVA_RUN) -cp $(ECLIPSE_BASE)/startup.jar \
+               -Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration
                -Duser.home=$(homedir) \
-               -Dosgi.install.area=$(ECLIPSE_BASE) \
                org.eclipse.core.launcher.Main \
                -application org.eclipse.ant.core.antRunner \
                -DjavacFailOnError=true \
                -DdontUnzip=true \
                -DbaseLocation=$(ECLIPSE_BASE) \
                
-Dpde.build.scripts=$(ECLIPSE_BASE)/plugins/org.eclipse.pde.build_3.2.1.r321_v20060823/scripts
 \
-               -DskipFetch=true \
-               -Dconfigs="linux,gtk,$(ECLIPSE_PLATFORM)" \
-               -Dbaseos=linux \
-               -Dbasews=gtk \
-               -Dbasearch=$(ECLIPSE_PLATFORM) 
+               -DdontFetchAnything=true
 
        touch build-stamp
 


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to