[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream-3.6, updated. 2695d071a39ba0c6801b723e0e3e69b0cad6a1b6

[Benjamin Drung]

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, upstream-3.6 has been updated
       via  2695d071a39ba0c6801b723e0e3e69b0cad6a1b6 (commit)
      from  ffd4c7fade62cadfa92968d1cdd783694b5273f6 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |   15 +++++++++++++++
 build.xml            |   40 ++++++++++++++++++++++++++++++++++++++--
 extract_patterns.txt |    1 +
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd34aba..0381055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-19  Andrew Overholt  <overholt at 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  <overholt at 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  <overholt at 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/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.