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 53d2849094b89b925c3ce585c01a6091c93914ac (commit)
via b88e2c7432783dd00b95096ce92209756698e550 (commit)
via f8e6177d9d2b741732cf353bb817102a12f66b20 (commit)
via 2695d071a39ba0c6801b723e0e3e69b0cad6a1b6 (commit)
from 444d6304a71c94d22b3ac6c64de48384bf7e07e5 (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 53d2849094b89b925c3ce585c01a6091c93914ac
Author: Benjamin Drung <bdr...@ubuntu.com>
Date: Tue Jul 20 21:53:58 2010 +0200
Refresh patches.
commit b88e2c7432783dd00b95096ce92209756698e550
Author: Benjamin Drung <bdr...@ubuntu.com>
Date: Tue Jul 20 20:50:40 2010 +0200
Drop distclean-logfiles.patch (accepted upstream).
commit f8e6177d9d2b741732cf353bb817102a12f66b20
Merge: 444d630 2695d07
Author: Benjamin Drung <bdr...@ubuntu.com>
Date: Tue Jul 20 20:49:52 2010 +0200
Merge branch 'upstream-3.6' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 15 +++++++
build.xml | 40 +++++++++++++++++++-
debian/patches/compile-IPluginDescriptor.patch | 2 +-
debian/patches/compile-jarinjarloader.patch | 2 +-
debian/patches/distclean-logfiles.patch | 37 ------------------
debian/patches/eclipse-manpage.patch | 2 +-
...nerate-metadata-and-extract-swt-libraries.patch | 34 +++-------------
debian/patches/remove-unnecessary-files.patch | 17 ++------
debian/patches/series | 1 -
debian/patches/strip-destDir.patch | 2 +-
debian/patches/swt-compile-xpt.patch | 2 +-
extract_patterns.txt | 1 +
12 files changed, 71 insertions(+), 84 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cd34aba..0381055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-19 Andrew Overholt <overh...@redhat.com>
+
+ Bug #319110
+
+ * build.xml: Apply patch from Benjamin Drung to rename some ant targets
+ (distclean -> clean, clean -> clean-sdk). "distclean" now removes
*.log.
+
+2010-07-19 Andrew Overholt <overh...@redhat.com>
+
+ Bug #319473
+
+ * build.xml: Apply patch from Benjamin Drung to extract SWT .so files.
+ * extract_patterns.txt: New file. Filename patterns to extract
+ ("initialize") from bundle JARs.
+
2010-07-14 Andrew Overholt <overh...@redhat.com>
* additionalArchs/rename.sh: Add svn:executable property.
diff --git a/build.xml b/build.xml
index 18657e6..0c44879 100644
--- a/build.xml
+++ b/build.xml
@@ -231,7 +231,7 @@
<echo file="testsunpack-stamp" />
</target>
- <target name="clean">
+ <target name="clean-sdk">
<delete dir="${homeDir}" />
<delete dir="${baseworkspace}" />
<delete dir="${buildworkspace}" />
@@ -246,7 +246,7 @@
</delete>
</target>
- <target name="distclean" depends="clean">
+ <target name="clean" depends="clean-sdk">
<delete dir="bootstrap/configuration/org.eclipse.core.runtime"
/>
<delete dir="bootstrap/configuration/org.eclipse.equinox.app" />
<delete dir="bootstrap/configuration/org.eclipse.osgi" />
@@ -255,6 +255,12 @@
<delete dir="bootstrap/workspace" />
</target>
+ <target name="distclean" depends="clean">
+ <delete>
+ <fileset dir="." includes="*.log" />
+ </delete>
+ </target>
+
<target name="insertBuildId" depends="unpack" unless="buildId.complete">
<replace dir="${buildDirectory}/plugins" value="${buildId}"
token="@build@">
<include name="**/about.mappings" />
@@ -792,6 +798,36 @@
<echo append="true"
file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini"
message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins"
/>
+ <!-- Extract SWT JNI .so files -->
+ <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>
+
+ <!-- Remove unnecessary configuration data -->
+ <delete
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration/org.eclipse.core.runtime"
/>
+ <delete
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration/org.eclipse.equinox.app"
/>
+ <delete includeemptydirs="true" verbose="true">
+ <fileset
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration" includes="*.log" />
+ <fileset
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration"
includes="**/data/**" />
+ </delete>
+
<!-- Move config file to /etc -->
<mkdir dir="${destDir}/etc" />
<move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini"
tofile="${destDir}/etc/eclipse.ini" />
diff --git a/debian/patches/compile-IPluginDescriptor.patch
b/debian/patches/compile-IPluginDescriptor.patch
index 35ba66c..9532272 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
--- a/build.xml
+++ b/build.xml
-@@ -363,6 +363,32 @@
+@@ -369,6 +369,32 @@
<zip
destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
basedir="${basedir}/temp/"/>
<delete dir="${basedir}/temp/"/>
diff --git a/debian/patches/compile-jarinjarloader.patch
b/debian/patches/compile-jarinjarloader.patch
index 303999b..79fe43a 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -12,7 +12,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319476
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp"
targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp"
targetfile="compilelibs-stamp" />
<uptodate property="build.complete" srcfile="patch-stamp"
targetfile="build-stamp" />
-@@ -349,7 +350,24 @@
+@@ -355,7 +356,24 @@
<echo file="symlinks-stamp" />
</target>
diff --git a/debian/patches/distclean-logfiles.patch
b/debian/patches/distclean-logfiles.patch
deleted file mode 100644
index 97145ac..0000000
--- a/debian/patches/distclean-logfiles.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Remove log files on distclean
-From: Benjamin Drung <bdr...@ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319110
-
---- a/build.xml
-+++ b/build.xml
-@@ -232,7 +232,7 @@
- <echo file="testsunpack-stamp" />
- </target>
-
-- <target name="clean">
-+ <target name="clean-sdk">
- <delete dir="${homeDir}" />
- <delete dir="${baseworkspace}" />
- <delete dir="${buildworkspace}" />
-@@ -247,7 +247,7 @@
- </delete>
- </target>
-
-- <target name="distclean" depends="clean">
-+ <target name="clean" depends="clean-sdk">
- <delete dir="bootstrap/configuration/org.eclipse.core.runtime"
/>
- <delete dir="bootstrap/configuration/org.eclipse.equinox.app" />
- <delete dir="bootstrap/configuration/org.eclipse.osgi" />
-@@ -256,6 +256,12 @@
- <delete dir="bootstrap/workspace" />
- </target>
-
-+ <target name="distclean" depends="clean">
-+ <delete>
-+ <fileset dir="." includes="*.log" />
-+ </delete>
-+ </target>
-+
- <target name="insertBuildId" depends="unpack" unless="buildId.complete">
- <replace dir="${buildDirectory}/plugins" value="${buildId}"
token="@build@">
- <include name="**/about.mappings" />
diff --git a/debian/patches/eclipse-manpage.patch
b/debian/patches/eclipse-manpage.patch
index 5f03b4f..b749563 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,7 +624,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+</refentry>
--- a/build.xml
+++ b/build.xml
-@@ -780,6 +780,12 @@
+@@ -786,6 +786,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse"
resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index 465073d..1a53d25 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -1,16 +1,14 @@
Description: Generate metadata and extract the swt libraries
This patch moved the calls from debian/rules into the build.xml file.
From: Benjamin Drung <bdr...@ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
--- a/build.xml
+++ b/build.xml
-@@ -842,7 +842,69 @@
- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt.jar"
resource="plugins/${swtjarpath}" />
+@@ -849,6 +849,55 @@
<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 -->
+
++ <!-- Generate metadata -->
+ <delete dir="${destDir}/${prefix}/${libDir}/eclipse/p2" />
+ <java classname="org.eclipse.core.launcher.Main" fork="true"
failonerror="true" dir="${destDir}">
+ <classpath>
@@ -58,25 +56,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
+ <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
++
+ <!-- Extract SWT JNI .so files -->
+ <java classname="org.eclipse.core.launcher.Main" fork="true"
failonerror="true" dir="${destDir}">
+ <classpath>
diff --git a/debian/patches/remove-unnecessary-files.patch
b/debian/patches/remove-unnecessary-files.patch
index 91f1a6c..33c4fde 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -1,20 +1,13 @@
Description: Remove unnecessary configuration data and metadata
From: Benjamin Drung <bdr...@ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
--- a/build.xml
+++ b/build.xml
-@@ -905,6 +905,16 @@
- <arg value="-fileInitializer" /><arg
value="${basedir}/extract_patterns.txt" />
- <jvmarg
value="-Dosgi.sharedConfiguration.area=${destDir}/${prefix}/${libDir}/eclipse/configuration"/>
- </java>
-+ <!-- Remove unnecessary configuration data and metadata -->
-+ <delete
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration/org.eclipse.core.runtime"
/>
-+ <delete
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration/org.eclipse.equinox.app"
/>
-+ <delete includeemptydirs="true" verbose="true">
-+ <fileset
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration" includes="*.log" />
-+ <fileset
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration"
includes="**/data/**" />
-+ </delete>
+@@ -928,6 +928,10 @@
+ <fileset
dir="${destDir}/${prefix}/${libDir}/eclipse/configuration"
includes="**/data/**" />
+ </delete>
+
++ <!-- Remove unnecessary metadata -->
+ <delete
dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
+ <delete
dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
+ <delete
dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
diff --git a/debian/patches/series b/debian/patches/series
index 58775b5..18c9125 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ generate-metadata-and-extract-swt-libraries.patch
remove-unnecessary-files.patch
strip-destDir.patch
clean-source.patch
-distclean-logfiles.patch
diff --git a/debian/patches/strip-destDir.patch
b/debian/patches/strip-destDir.patch
index 5323a57..ee5b85b 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
--- a/build.xml
+++ b/build.xml
-@@ -915,6 +915,21 @@
+@@ -932,6 +932,21 @@
<delete
dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
<delete
dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
<delete
dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
diff --git a/debian/patches/swt-compile-xpt.patch
b/debian/patches/swt-compile-xpt.patch
index 5e6a0f1..e14747e 100644
--- a/debian/patches/swt-compile-xpt.patch
+++ b/debian/patches/swt-compile-xpt.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319479
--- a/build.xml
+++ b/build.xml
-@@ -284,6 +284,7 @@
+@@ -290,6 +290,7 @@
<patch patchfile="${basedir}/patches/junit4-nochecksum.patch"
dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/bz318912.patch"
dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch"
dir="${buildDirectory}" strip="1" />
diff --git a/extract_patterns.txt b/extract_patterns.txt
new file mode 100644
index 0000000..8e0dff8
--- /dev/null
+++ b/extract_patterns.txt
@@ -0,0 +1 @@
+.* = *.so
\ No newline at end of file
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
