[pkg-java] r3130 - in trunk/eclipse/debian: . patches
Matthias Klose
doko at alioth.debian.org
Thu Mar 29 18:16:07 CET 2007
Author: doko
Date: 2007-03-29 17:16:07 +0000 (Thu, 29 Mar 2007)
New Revision: 3130
Added:
trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/rules
Log:
[ Michael Koch ]
* Added debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch, which
adds support for ppc64, sparc, sparc64, s390 and hppa.
* debian/rules: Added support for unofficial ports.
[ Matthias Klose ]
* Update the platform patch for 3.2.2.
* On ia64, skip some jar files for native compilation to avoid ICEs.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2007-03-29 14:48:39 UTC (rev 3129)
+++ trunk/eclipse/debian/changelog 2007-03-29 17:16:07 UTC (rev 3130)
@@ -1,3 +1,16 @@
+eclipse (3.2.2-0) UNRELEASED; urgency=low
+
+ [ Michael Koch ]
+ * Added debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch, which
+ adds support for ppc64, sparc, sparc64, s390 and hppa.
+ * debian/rules: Added support for unofficial ports.
+
+ [ Matthias Klose ]
+ * Update the platform patch for 3.2.2.
+ * On ia64, skip some jar files for native compilation to avoid ICEs.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 29 Mar 2007 14:17:45 +0200
+
eclipse (3.2.2-0ubuntu1) feisty; urgency=low
* New upstream release
Added: trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch 2007-03-29 14:48:39 UTC (rev 3129)
+++ trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch 2007-03-29 17:16:07 UTC (rev 3130)
@@ -0,0 +1,176 @@
+#! /bin/sh -e
+##
+## DP: Change manifest of the Ant plugin to adapt the available Ant libs
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
+ at DPATCH@
+--- source-tree/features/org.eclipse.rcp.source/feature.xml.old 2007-02-12 19:45:20.000000000 +0100
++++ source-tree/features/org.eclipse.rcp.source/feature.xml 2007-03-29 14:13:43.000000000 +0200
+@@ -28,4 +28,9 @@
+ <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.win32.win32.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="motif" os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="hppa" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.2.2.r322_v20070104-iwP0VLKnfFC923K"/>
+ </feature>
+--- source-tree/features/org.eclipse.platform.source/feature.xml.old 2007-02-12 19:45:20.000000000 +0100
++++ source-tree/features/org.eclipse.platform.source/feature.xml 2007-03-29 14:14:58.000000000 +0200
+@@ -28,4 +28,9 @@
+ <plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
++ <plugin ws="gtk" os="linux" fragment="true" arch="hppa" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
+ </feature>
+--- source-tree/features/org.eclipse.rcp/feature.xml.old 2007-02-12 19:46:52.000000000 +0100
++++ source-tree/features/org.eclipse.rcp/feature.xml 2007-03-29 14:09:50.000000000 +0200
+@@ -308,5 +308,71 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.ppc64"
++ os="linux"
++ ws="gtk"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.s390"
++ os="linux"
++ ws="gtk"
++ arch="s390"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.s390x"
++ os="linux"
++ ws="gtk"
++ arch="s390x"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.sparc"
++ os="linux"
++ ws="gtk"
++ arch="sparc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.sparc64"
++ os="linux"
++ ws="gtk"
++ arch="sparc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.hppa"
++ os="linux"
++ ws="gtk"
++ arch="hppa"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
+
+ </feature>
+--- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.old 2007-03-29 14:08:50.000000000 +0200
++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2007-03-29 14:09:50.000000000 +0200
+@@ -348,6 +348,12 @@
+ * @since 3.1
+ */
+ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
++
++ public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
++ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
++ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
++ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
++ public static final String ARCH_HPPA = "hppa";//$NON-NLS-1$
+
+ /**
+ * Constant string (value "win32") indicating the platform is running on a
+--- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java.old 2007-02-12 19:46:40.000000000 +0100
++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 2007-03-29 14:09:50.000000000 +0200
+@@ -52,6 +52,11 @@
+ Platform.ARCH_X86, //
+ Platform.ARCH_AMD64, //
+ Platform.ARCH_IA64, //
++ Platform.ARCH_PPC64, //
++ Platform.ARCH_SPARC64, //
++ Platform.ARCH_S390, //
++ Platform.ARCH_S390X, //
++ Platform.ARCH_HPPA, //
+ Platform.ARCH_IA64_32};
+ private static final String BOOT = "-boot"; //$NON-NLS-1$
+ private static final String CLASSLOADER_PROPERTIES = "-classloaderProperties"; //$NON-NLS-1$
+--- source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java.old 2007-02-12 19:46:42.000000000 +0100
++++ source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 2007-03-29 14:09:50.000000000 +0200
+@@ -64,7 +64,7 @@
+ private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$
+ private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$
+ private static PluginConverterImpl instance;
+- private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64};
++ private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X, org.eclipse.osgi.service.environment.Constants.ARCH_HPPA};
+ static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
+ static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
+ static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
+--- source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java.old 2007-02-12 19:46:35.000000000 +0100
++++ source-tree/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2007-03-29 14:09:50.000000000 +0200
+@@ -119,6 +119,12 @@
+ */
+ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
+
++ public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$
++ public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$
++ public static final String ARCH_S390 = "s390";//$NON-NLS-1$
++ public static final String ARCH_S390X = "s390x";//$NON-NLS-1$
++ public static final String ARCH_HPPA = "hppa";//$NON-NLS-1$
++
+ /**
+ * Constant string (value "win32") indicating the platform is running on a
+ * machine using the Windows windowing system.
Property changes on: trunk/eclipse/debian/patches/eclipse-add-ppc64-sparc64-s390-s390x.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2007-03-29 14:48:39 UTC (rev 3129)
+++ trunk/eclipse/debian/rules 2007-03-29 17:16:07 UTC (rev 3130)
@@ -13,6 +13,9 @@
DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.2-gtk
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+# The ppc64 port in eclipse 3.2 is incomplete.
+ECLIPSE_UNOFFICIAL_PLATFORMS := _ppc64_ _sparc_ _sparc64_ _s390_ _hppa_
+
enable_native := no
ifeq ($(DEB_HOST_ARCH),i386)
@@ -140,6 +143,7 @@
eclipse-build \
eclipse-disable-motif \
eclipse-ecj-gcj \
+ eclipse-add-ppc64-sparc64-s390-s390x \
# eclipse-icon \
# eclipse-efj \
@@ -169,7 +173,7 @@
# eclipse-libswt-mozilla-profiles
- BUILD_DEPS += , firefox-dev
+ BUILD_DEPS += , libxul-dev
MOZILLA_DEP = $${shlibs:Depends}
MOZILLA_HOME = /usr/lib/mozilla
endif
@@ -325,6 +329,28 @@
prepare-stamp: patch-stamp
dh_testdir
+ifneq (,$(findstring _$(ECLIPSE_PLATFORM)_,$(ECLIPSE_UNOFFICIAL_PLATFORMS)))
+ ## Nasty hack to get support for ppc64, s390{,x}, sparc{,64} and hppa
+ # there is only partial support for ppc64 in 3.2 so we have to remove this
+ # partial support to get the replacemnt hack to work
+ find source-tree -name \*ppc64\* | xargs rm -r
+ # remove ppc64 support from features/org.eclipse.platform.source/feature.xml
+ # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
+ find source-tree -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
+ # remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq
+ sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" source-tree/features/org.eclipse.platform.source/build.xml
+ # replace final occurances with an existing arch
+ sed --in-place "s/ppc64/x86_64/g" source-tree/features/org.eclipse.platform.source/build.xml
+ # Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace
+ # the ia64 strings with ppc64 or s390(x)
+ for f in $$(find source-tree -name \*ia64\* | grep -v motif | grep -v ia64_32); do \
+ mv $$f $$(echo $$f | sed "s/ia64/$(ECLIPSE_PLATFORM)/") ; \
+ done
+ find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \;
+ find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64/$(ECLIPSE_PLATFORM)/g" "{}" \;
+ find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
+endif
+
# A number of the Ant build files have the verbosity increased. This
# simply makes a lot of text. We set it back down here.
find . -type f -name "build.xml" -exec \
@@ -347,7 +373,7 @@
# Build icu4j
cd $(SOURCE_TREE)/baseLocation/plugins; \
- zipfile=$$PWD/com.ibm.icu.base.source_3.4.5.20061213/src/com.ibm.icu.base_3.4.5.20061213/src.zip; \
+ zipfile=$$(pwd)/com.ibm.icu.base.source_3.4.5.20061213/src/com.ibm.icu.base_3.4.5.20061213/src.zip; \
pushd icu4j-build/com.ibm.icu.base/src; \
find -name \*.java | xargs touch --date=1/1/1970; \
zip -X -9 -r $$zipfile . -i \*.java; \
@@ -358,7 +384,7 @@
mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar com.ibm.icu.base_3.4.5.20061213.jar
cd $(SOURCE_TREE)/baseLocation/plugins; \
- zipfile=$$PWD/com.ibm.icu.source_3.4.5.200612113/src/com.ibm.icu_3.4.5.20061213/src.zip; \
+ zipfile=$$(pwd)/com.ibm.icu.source_3.4.5.200612113/src/com.ibm.icu_3.4.5.20061213/src.zip; \
pushd icu4j-build/com.ibm.icu/src; \
find -name \*.java | xargs touch --date=1/1/1970; \
zip -X -9 -r $$zipfile . -i \*.java; \
@@ -543,6 +569,12 @@
*org.eclipse.ui.workbench) continue;; \
*org.eclipse.ui.forms) continue;; \
esac; \
+ if [ $(DEB_HOST_ARCH) = ia64 ]; then \
+ case "$$jar" in \
+ *jsch*) continue;; \
+ *org.eclipse.osgi*) continue;; \
+ esac; \
+ fi; \
djar=$$(echo $$jar | sed 's,$(DEBIAN_TMP),debian/tmp-native,'); \
ddir=$$(dirname $$djar); \
if ! cmp --quiet $$jar $$djar; then \
More information about the pkg-java-commits
mailing list