[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-115-gdffec70
Benjamin Drung
bdrung-guest at alioth.debian.org
Sat Jul 10 17:07:24 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master-3.6 has been updated
via dffec708f50cb105a624df98c50447547639e2f8 (commit)
from 6c2bfcf0da43e0876d0a4e95961d1779a0f0c0ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit dffec708f50cb105a624df98c50447547639e2f8
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Sat Jul 10 19:07:03 2010 +0200
Move metadata generation and swt libraries extraction from debian/rules into build.xml.
-----------------------------------------------------------------------
Summary of changes:
debian/extract_patterns.txt | 1 -
...nerate-metadata-and-extract-swt-libraries.patch | 81 +++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 83 +-------------------
4 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/debian/extract_patterns.txt b/debian/extract_patterns.txt
deleted file mode 100644
index 5d0d319..0000000
--- a/debian/extract_patterns.txt
+++ /dev/null
@@ -1 +0,0 @@
-.* = *.so
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
new file mode 100644
index 0000000..0f98646
--- /dev/null
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -0,0 +1,81 @@
+Description: Generate metadata and extract the swt libraries
+ This patch moved the calls from debian/rules into the build.xml file.
+From: Benjamin Drung <bdrung at ubuntu.com>
+
+--- a/build.xml
++++ b/build.xml
+@@ -844,7 +844,69 @@
+ <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt.jar" resource="plugins/${swtjarpath}" />
+
+ <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+-
++ <!-- Generate metadata and extract the swt libraries -->
++ <delete dir="${destDir}/${prefix}/${libDir}/eclipse/p2" />
++ <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
++ <classpath>
++ <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins">
++ <include name="org.eclipse.equinox.launcher_*.jar" />
++ </fileset>
++ </classpath>
++ <arg value="-application" /><arg value="org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
++ <arg value="-debug" />
++ <arg value="-consolelog" />
++ <arg value="-metadataRepository" /><arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
++ <arg value="-artifactRepository" /><arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
++ <arg value="-data" /><arg value="${buildworkspace}" />
++ <arg value="-flavor" /><arg value="tooling" />
++ <arg value="-source" /><arg value="${destDir}/${prefix}/${libDir}/eclipse" />
++ <arg value="-root" /><arg value="Eclipse Platform" />
++ <arg value="-rootVersion" /><arg value="${label}" />
++ <arg value="-publishArtifacts" />
++ <arg value="-append" />
++ <arg value="-artifactRepositoryName" /><arg value="Eclipse Platform" />
++ <arg value="-metadataRepositoryName" /><arg value="Eclipse Platform" />
++ </java>
++ <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
++ <classpath>
++ <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins">
++ <include name="org.eclipse.equinox.launcher_*.jar" />
++ </fileset>
++ </classpath>
++ <arg value="-application" /><arg value="org.eclipse.equinox.p2.director" />
++ <arg value="-debug" />
++ <arg value="-consolelog" />
++ <arg value="-metadataRepository" /><arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
++ <arg value="-artifactRepository" /><arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
++ <arg value="-data" /><arg value="${buildworkspace}" />
++ <arg value="-flavor" /><arg value="tooling" />
++ <arg value="-installIU" /><arg value="Eclipse Platform" />
++ <arg value="-p2.os" /><arg value="linux" />
++ <arg value="-p2.ws" /><arg value="gtk" />
++ <arg value="-p2.arch" /><arg value="${buildArch}" />
++ <arg value="-roaming" />
++ <arg value="-profile" /><arg value="PlatformProfile" />
++ <arg value="-profileProperties" /><arg value="org.eclipse.update.install.features=true" />
++ <arg value="-destination" /><arg value="${destDir}/${prefix}/${libDir}/eclipse" />
++ <arg value="-bundlepool" /><arg value="${destDir}/${prefix}/${libDir}/eclipse" />
++ <jvmarg value="-Declipse.p2.data.area=file:${destDir}/${prefix}/${libDir}/eclipse/p2"/>
++ <jvmarg value="-Declipse.p2.MD5Check=false"/>
++ </java>
++ <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
++ <classpath>
++ <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins">
++ <include name="org.eclipse.equinox.launcher_*.jar" />
++ </fileset>
++ </classpath>
++ <arg value="-application" /><arg value="org.eclipse.equinox.initializer.configInitializer" />
++ <arg value="-debug" />
++ <arg value="-consolelog" />
++ <arg value="-metadataRepository" /><arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
++ <arg value="-artifactRepository" /><arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
++ <arg value="-data" /><arg value="${buildworkspace}" />
++ <arg value="-fileInitializer" /><arg value="${basedir}/extract_patterns.txt" />
++ <jvmarg value="-Dosgi.sharedConfiguration.area=${destDir}/${prefix}/${libDir}/eclipse/configuration"/>
++ </java>
+ <!-- Move config file to /etc -->
+ <mkdir dir="${destDir}/etc" />
+ <move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
+--- /dev/null
++++ b/extract_patterns.txt
+@@ -0,0 +1 @@
++.* = *.so
diff --git a/debian/patches/series b/debian/patches/series
index 1172c73..da6de4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ pdebuild-path-copy-platform.patch
pdebuild-script.patch
symlink-system-files.patch
disable-logging.patch
+generate-metadata-and-extract-swt-libraries.patch
diff --git a/debian/rules b/debian/rules
index 67a49ef..c8c8e55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ override_dh_auto_clean:
override_dh_auto_install:
ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
JNI_SO_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
LAUNCHER_LIB = debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
@@ -57,18 +58,8 @@ COPY_PLATFORM:=/usr/lib/eclipse/buildscripts/copy-platform
COPY_PLATFORM_INSTALL:=debian/tmp$(COPY_PLATFORM)
PDEBUILD_INSTALL:=debian/tmp/usr/lib/eclipse/buildscripts/pde-build
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-BUILD_TAG := $(shell grep ^buildTag= build.properties | sed "s/^buildTag=//")
-SOURCE_DIR := $(CURDIR)/build/eclipse-$(UPSTREAM_VERSION)-src
-RESULT_DIR := $(SOURCE_DIR)/installation/
DEBIAN_PACK_LIBDIR := $(CURDIR)/debian/tmp/usr/lib/eclipse
-PROFILE_ID := PlatformProfile
-
-LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
PDEBUILDVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
-UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/+repack.*$$//")
XULVERSION := $(shell pkg-config --modversion libxul)
XULVERSION_STRIP1 := $(shell echo $(XULVERSION) | sed "s/\.[^\.]*$$//")
@@ -80,29 +71,6 @@ XULRUNNER_PATH := $(shell if test -d /usr/lib/xulrunner-$(shell $(XULRUNNER) --g
then echo '/usr/lib/xulrunner-$$($(XULRUNNER) --gre-version)'; \
else pkg-config --variable=sdkdir libxul | sed "s/-devel//"; fi)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
- ECLIPSE_BUILD_ARCH=x86
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),arm))
- ECLIPSE_BUILD_ARCH=arm
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
- ECLIPSE_BUILD_ARCH=x86_64
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),mips))
- ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH)
-endif
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),parisc parisc64))
- ECLIPSE_BUILD_ARCH=PA_RISC
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
- ECLIPSE_BUILD_ARCH=ppc
-endif
-ifeq ($(ECLIPSE_BUILD_ARCH),)
- ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
-endif
-
POMS := debian/poms/pom-equinox-osgi.xml debian/poms/pom-equinox-osgi.services.xml debian/poms/pom-equinox-osgi.util.xml
override_dh_install:
@@ -115,55 +83,6 @@ override_dh_install:
cp -f debian/tmp/etc/eclipse.ini debian/tmp/usr/lib/eclipse/
# move images from /usr/lib to /usr/share
cd debian/tmp/usr && find lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) | perl ../../../debian/extra/imagemv.pl
- rm -fr $(DEBIAN_PACK_LIBDIR)/p2/
- # Generate metadata and extract the swt libraries.
- cd debian/tmp && java \
- -cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
- org.eclipse.core.launcher.Main \
- -application \
- org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
- -debug -consolelog \
- -metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
- -artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
- -source $(DEBIAN_PACK_LIBDIR) \
- -root "Eclipse Platform" \
- -rootVersion $(UPSTREAM_VERSION) \
- -flavor tooling \
- -publishArtifacts \
- -data $(CURDIR)/workspace \
- -append \
- -artifactRepositoryName "Eclipse Platform" \
- -metadataRepositoryName "Eclipse Platform"
- cd debian/tmp && java \
- -Declipse.p2.data.area=file:$(DEBIAN_PACK_LIBDIR)/p2 \
- -Declipse.p2.MD5Check=false \
- -cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
- org.eclipse.core.launcher.Main \
- -application \
- org.eclipse.equinox.p2.director \
- -debug -consolelog \
- -flavor tooling \
- -installIU "Eclipse Platform" \
- -p2.os linux \
- -p2.ws gtk \
- -p2.arch $(ECLIPSE_BUILD_ARCH) \
- -roaming \
- -data $(CURDIR)/workspace \
- -profile $(PROFILE_ID) \
- -profileProperties org.eclipse.update.install.features=true \
- -metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
- -artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
- -destination $(DEBIAN_PACK_LIBDIR) \
- -bundlepool $(DEBIAN_PACK_LIBDIR)
- cd debian/tmp && java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
- -cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
- org.eclipse.core.launcher.Main \
- -debug -consolelog \
- -data $(CURDIR)/workspace \
- -metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
- -artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
- -application org.eclipse.equinox.initializer.configInitializer \
- -fileInitializer $(CURDIR)/debian/extract_patterns.txt
# Normalize the paths.
grep --exclude-from=debian/exclude_patterns.txt -l -I -r debian/tmp debian/tmp/ | xargs sed -i s@$(CURDIR)/debian/tmp@@g
TO_CORRECT=`echo $(CURDIR)/debian/tmp | sed s@/@_ at g` ; grep --exclude-from=debian/exclude_patterns.txt \
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list