r2047 - trunk/eclipse/debian

Mon Apr 17 16:58:51 UTC 2006

Author: doko
Date: 2006-04-17 16:58:50 +0000 (Mon, 17 Apr 2006)
New Revision: 2047

Added:
   trunk/eclipse/debian/libswt3.1-gtk-gcj.install
   trunk/eclipse/debian/libswt3.1-gtk-gcj.postinst
   trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm
Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
   trunk/eclipse/debian/eclipse-rcp-gcj.install
   trunk/eclipse/debian/eclipse-rcp.install
   trunk/eclipse/debian/libswt3.1-gtk-java.install
   trunk/eclipse/debian/rules
Log:
  * Move swt.jar into the libswt3.1-gtk-java package. Closes: #362991.
  * Add a new package libswt3.1-gtk-gcj.


Modified: trunk/eclipse/debian/changelog
===================================================================

--- trunk/eclipse/debian/changelog	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/changelog	2006-04-17 16:58:50 UTC (rev 2047)
@@ -19,6 +19,8 @@
   * debian/rules: Set a default for MOZILLA_HOME.
   * Set JAVA_HOME for the build (needed for non-matching gcc/gcj versions).
   * debian/eclipse.menu: Set longtitle. Ubuntu #34916.
+  * Move swt.jar into the libswt3.1-gtk-java package. Closes: #362991.
+  * Add a new package libswt3.1-gtk-gcj.
 
  -- Michael Koch <konqueror at gmx.de>  Wed, 15 Mar 2006 17:03:01 +0000
 

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/control	2006-04-17 16:58:50 UTC (rev 2047)
@@ -51,7 +51,7 @@
 
 Package: eclipse-rcp-gcj
 Architecture: any
-Depends: eclipse-rcp (= ${Source-Version}), gij-4.0
+Depends: eclipse-rcp (= ${Source-Version}), libswt3.1-gtk-gcj (= ${Source-Version})
 Description: Eclipse rich client platform (GCJ version)
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -234,8 +234,9 @@
 Package: libswt3.1-gtk-java
 Architecture: any
 Depends: libswt3.1-gtk-jni (= ${Source-Version}), mozilla-browser (>= 2:1.7.0), java-common
-Replaces: libswt2.1-gtk2-java, libswt-gtk3-java
+Replaces: libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
 Conflicts: libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.1-java
+Recommends: libswt3.1-gtk-gcj
 Description: Fast and rich GUI toolkit for Java, gtk2 version
  SWT (Standard Widget Toolkit) provides functionality similar to
  Swing, but is much faster and open source. Mainly, it is used
@@ -243,6 +244,18 @@
  .
  This version of SWT is implemented using gtk2 libraries.
 
+Package: libswt3.1-gtk-gcj
+Architecture: any
+Depends: libswt3.1-gtk-java (= ${Source-Version}), gij-4.0
+Replaces: eclipse-rcp-gcj (<< 3.1.2-2)
+Conflicts: eclipse-rcp-gcj (<< 3.1.2-2)
+Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
+ SWT (Standard Widget Toolkit) provides functionality similar to
+ Swing, but is much faster and open source. Mainly, it is used
+ for the Eclipse platform.
+ .
+ This version of SWT is implemented using gtk2 libraries.
+
 Package: libswt3.1-gtk-jni
 Architecture: any
 Depends: libswt3.1-gtk-java (= ${Source-Version}), ${shlibs:Depends}

Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/control.in	2006-04-17 16:58:50 UTC (rev 2047)
@@ -51,7 +51,7 @@
 
 Package: eclipse-rcp-gcj
 Architecture: any
-Depends: eclipse-rcp (= ${Source-Version}), gij-4.0
+Depends: eclipse-rcp (= ${Source-Version}), libswt3.1-gtk-gcj (= ${Source-Version})
 Description: Eclipse rich client platform (GCJ version)
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -234,8 +234,9 @@
 Package: libswt3.1-gtk-java
 Architecture: any
 Depends: libswt3.1-gtk-jni (= ${Source-Version}), @MOZILLA_DEP@, java-common
-Replaces: libswt2.1-gtk2-java, libswt-gtk3-java
+Replaces: libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
 Conflicts: libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.1-java
+Recommends: libswt3.1-gtk-gcj
 Description: Fast and rich GUI toolkit for Java, gtk2 version
  SWT (Standard Widget Toolkit) provides functionality similar to
  Swing, but is much faster and open source. Mainly, it is used
@@ -243,6 +244,18 @@
  .
  This version of SWT is implemented using gtk2 libraries.
 
+Package: libswt3.1-gtk-gcj
+Architecture: any
+Depends: libswt3.1-gtk-java (= ${Source-Version}), gij-4.0
+Replaces: eclipse-rcp-gcj (<< 3.1.2-2)
+Conflicts: eclipse-rcp-gcj (<< 3.1.2-2)
+Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
+ SWT (Standard Widget Toolkit) provides functionality similar to
+ Swing, but is much faster and open source. Mainly, it is used
+ for the Eclipse platform.
+ .
+ This version of SWT is implemented using gtk2 libraries.
+
 Package: libswt3.1-gtk-jni
 Architecture: any
 Depends: libswt3.1-gtk-java (= ${Source-Version}), ${shlibs:Depends}

Modified: trunk/eclipse/debian/eclipse-rcp-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-gcj.install	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/eclipse-rcp-gcj.install	2006-04-17 16:58:50 UTC (rev 2047)
@@ -1,5 +1,3 @@
-debian/tmp/usr/sbin/update-gcj-classmaps-eclipse
-
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.rcp_*.jar.so
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.commands_*.jar.so
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.expressions_*.jar.so
@@ -8,7 +6,6 @@
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.jface_*.jar.so
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.osgi_*.jar.so
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.swt_*.jar.so
-debian/tmp/usr/lib/gcj-4.0/org.eclipse.swt.gtk.linux.*_*.jar.so
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui_*.jar.so
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.workbench_*.jar.so
 debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.configurator_*.jar.so

Modified: trunk/eclipse/debian/eclipse-rcp.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp.install	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/eclipse-rcp.install	2006-04-17 16:58:50 UTC (rev 2047)
@@ -1 +1 @@
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt_*

Added: trunk/eclipse/debian/libswt3.1-gtk-gcj.install
===================================================================
--- trunk/eclipse/debian/libswt3.1-gtk-gcj.install	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/libswt3.1-gtk-gcj.install	2006-04-17 16:58:50 UTC (rev 2047)
@@ -0,0 +1,2 @@
+debian/tmp/usr/sbin/update-gcj-classmaps-eclipse
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.swt.gtk.linux.*_*.jar.so

Added: trunk/eclipse/debian/libswt3.1-gtk-gcj.postinst
===================================================================
--- trunk/eclipse/debian/libswt3.1-gtk-gcj.postinst	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/libswt3.1-gtk-gcj.postinst	2006-04-17 16:58:50 UTC (rev 2047)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+/usr/sbin/update-gcj-classmaps-eclipse
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm
===================================================================
--- trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/libswt3.1-gtk-gcj.postrm	2006-04-17 16:58:50 UTC (rev 2047)
@@ -0,0 +1,46 @@
+#!/bin/sh -e
+
+db_update()
+{
+    # Merges per-package classmap databases into the system-wide classmap database.
+
+    gccversion=4.0
+
+    gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
+    classmapd=/usr/share/gcj-${gccversion}/classmap.d
+    classmaps=/var/lib/gcj-${gccversion}/classmap.db
+
+    if [ ! -x $gcjdbtool ]; then
+	echo >&2 "skip classmap deregistration, $gcjdbtool not found".
+	return 0
+    fi
+
+    set +x
+
+    # Move into a temporary file to avoid editing the existing file. The existing
+    # file could be mmap()ed by gij processes.
+    find ${classmapd} -name '*.db' -print0 | ${gcjdbtool} -0 -m ${classmaps}.tmp
+    if [ $? -ne 0 ]; then
+        echo "error merging classmaps" >&2
+        set -x
+        return 1
+    fi
+
+    mv ${classmaps}.tmp ${classmaps}
+    if [ $? -ne 0 ]; then
+        echo "could not replace existing classmap database" >&2
+        set -x
+        return 1
+    fi
+    set -x
+}
+
+db_update
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Modified: trunk/eclipse/debian/libswt3.1-gtk-java.install
===================================================================
--- trunk/eclipse/debian/libswt3.1-gtk-java.install	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/libswt3.1-gtk-java.install	2006-04-17 16:58:50 UTC (rev 2047)
@@ -1 +1,2 @@
 debian/tmp/usr/lib/java/*.jar
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt.gtk*

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2006-04-17 12:19:00 UTC (rev 2046)
+++ trunk/eclipse/debian/rules	2006-04-17 16:58:50 UTC (rev 2047)
@@ -7,7 +7,7 @@
 
 BUILD_DEPS :=
 
-DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde
+DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.1-gtk
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 enable_native := no
@@ -452,8 +452,9 @@
 	# Version-less SWT Jar links.
 	mkdir -p $(DEBIAN_TMP)/usr/lib/java && \
 	cd $(DEBIAN_TMP)/usr/lib/java && \
-	ln -s /$(ECLIPSE_ARCH)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_3.1.1.jar swt-3.1.jar && \
-	ln -s /$(ECLIPSE_ARCH)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_3.1.1.jar swt.jar
+	ln -s ../eclipse/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_3.1.1.jar swt3.1-gtk.jar && \
+	ln -s swt3.1-gtk.jar swt-gtk.jar && \
+	ln -s swt3.1-gtk.jar swt.jar
 	
 	# Missing permissions.
 	chmod a+x $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/ant
@@ -531,7 +532,13 @@
 		mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$(dirname $$jar) && \
 		$(AOT_COMPILE) $$jar $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$jar.so || exit $$?; \
 	done
-	
+	cd $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/plugins && \
+	for jar in $$(find . -name '*swt.gtk.*.jar' | grep -v ant | sort); do \
+		echo "$$jar" && \
+		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.
 	for so in \
 		org.eclipse.jface.text \
@@ -541,7 +548,7 @@
 			rm '{}' ';'; \
 	done
 endif
-	
+
 	dh_installdirs
 	dh_install
 	
@@ -626,6 +633,19 @@
 		fi; \
 	done
 	
+	@for package in libswt3.1-gtk; do \
+		echo "generating classmaps for $${package} ... "; \
+		mkdir -p debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d; \
+		if test -d debian/$${package}-java/$(ECLIPSE_ARCH)/plugins; then \
+			( cd debian/$${package}-java/$(ECLIPSE_ARCH)/plugins && \
+			for jar in $$(find . -name '*.jar' -type f); do \
+				echo '  ' $${package}-java/$(ECLIPSE_ARCH)/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 ); \
+		fi; \
+	done
 endif
 
 


