CVS eclipse/debian

[Michael Koch]

Update of /cvsroot/pkg-java/eclipse/debian
In directory haydn:/tmp/cvs-serv21777

Modified Files:
	changelog rules 
Log Message:
* debian/rules: Moved natively compiled jars to /usr/lib/gcj-4.0 and
  reworked it to support updates to newer GCJ versions more easily.


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/12/18 15:52:31	1.49
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/12/19 08:19:35	1.50
@@ -26,6 +26,8 @@
   * debian/extra/eclipse.sh: Implemented setting of MOZILLA_FIVE_HOME for
     Firefox 1.5 correctly.
   * debian/control.in: Build-Depends on gjdoc (>= 0.7.7). Closes: #343089
+  * debian/rules: Moved natively compiled jars to /usr/lib/gcj-4.0 and
+    reworked it to support updates to newer GCJ versions more easily.
 
  -- Michael Koch <konqueror at gmx.de>  Sun, 18 Dec 2005 16:49:44 +0000
 
--- /cvsroot/pkg-java/eclipse/debian/rules	2005/12/18 09:08:32	1.18
+++ /cvsroot/pkg-java/eclipse/debian/rules	2005/12/19 08:19:35	1.19
@@ -46,7 +46,10 @@
 # GCJ configuration
 # GCJ_RUN		command line to launch gcj
 # AOT_COMPILE		command line to AOT compile jars to native
-GCJ_RUN=/usr/bin/gcj-4.0
+GCJ_VERSION=4.0
+GCJ_RUN=/usr/bin/gcj-$(GCJ_VERSION)
+GCJ_DBTOOL=/usr/bin/gcj-dbtool-$(GCJ_VERSION)
+GCJ_JARDIR=/usr/lib/gcj-$(GCJ_VERSION)
 AOT_COMPILE=python $(CURDIR)/debian/aot-compile
 
 # Virtual machine configuration.
@@ -613,12 +616,12 @@
 	# placed into the ECLIPSE_ARCH structure which mirrors that of
 	# ECLIPSE_HOME: by plugin.
 ifeq ($(enable_native),yes)
-	mkdir -p $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/plugins.gcj && \
+	mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR) && \
 	cd $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins && \
 	for jar in $$(find . -name '*.jar' | grep -v ant | sort); do \
 		echo "$$jar" && \
-		mkdir -p $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/plugins.gcj/$$(dirname $$jar) && \
-		$(AOT_COMPILE) $$jar $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/plugins.gcj/$$jar.so || exit $$?; \
+		mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$(dirname $$jar) && \
+		$(AOT_COMPILE) $$jar $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$jar.so || exit $$?; \
 	done
 	
 	# Remove these native plugins for one reason or another.
@@ -626,7 +629,7 @@
 		org.eclipse.jface.text \
 		org.eclipse.ui.workbench \
 		org.eclipse.ui.forms; do \
-		find $(DEBIAN_TMP)/$(ECLIPSE_ARCH) -name "$$so_\*.jar.so" -exec \
+		find $(DEBIAN_TMP)/$(GCJ_JARDIR) -name "$$so_\*.jar.so" -exec \
 			rm '{}' ';'; \
 	done
 endif
@@ -693,21 +696,21 @@
 ifeq ($(enable_native),yes)
 	@for package in $(DEB_GCJ_PACKAGES); do \
 	echo "generating classmaps for $${package} ... " && \
-	mkdir -p debian/$${package}-gcj/usr/share/gcj-4.0/classmap.d && \
+	mkdir -p debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d && \
 	( cd debian/$${package}/$(ECLIPSE_ARCH)/plugins && \
 	for jar in $$(find . -name '*.jar' -type f); do \
-		echo '  ' $${package}/$(ECLIPSE_HOME)/plugins/$${jar} '->' /$(ECLIPSE_ARCH)/plugins.gcj/$${jar}.so; \
-		gcj-dbtool-4.0 \
-			-f $(CURDIR)/debian/$${package}-gcj/usr/share/gcj-4.0/classmap.d/$${package}.db \
-			$${jar} /$(ECLIPSE_ARCH)/plugins.gcj/$${jar}.so || exit 1; \
+		echo '  ' $${package}/$(ECLIPSE_HOME)/plugins/$${jar} '->' $(GCJ_JARDIR)/$${jar}.so; \
+		$(GCJ_DBTOOL) \
+			-f $(CURDIR)/debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d/$${package}.db \
+			$${jar} $(GCJ_JARDIR)/$${jar}.so || exit 1; \
 		echo "done"; \
 	done ) && \
 	( cd debian/$${package}-common/$(ECLIPSE_HOME)/plugins && \
 	for jar in $$(find . -name '*.jar' -type f); do \
-		echo '  ' $${package}-common/$(ECLIPSE_HOME)/plugins/$${jar} '->' /$(ECLIPSE_ARCH)/plugins.gcj/$${jar}.so; \
-		gcj-dbtool-4.0 \
-			-f $(CURDIR)/debian/$${package}-gcj/usr/share/gcj-4.0/classmap.d/$${package}.db \
-			$${jar} /$(ECLIPSE_ARCH)/plugins.gcj/$${jar}.so || exit 1; \
+		echo '  ' $${package}-common/$(ECLIPSE_HOME)/plugins/$${jar} '->' $(GCJ_JARDIR)/$${jar}.so; \
+		$(GCJ_DBTOOL) \
+			-f $(CURDIR)/debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d/$${package}.db \
+			$${jar} $(GCJ_JARDIR)/$${jar}.so || exit 1; \
 	done ); \
 	done
 endif