[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 6939066788386fb0e508e5f08057d6d73c266cfc

[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, master has been updated
       via  6939066788386fb0e508e5f08057d6d73c266cfc (commit)
       via  1bb11f4387754520010656b9c0be81bf05395590 (commit)
      from  d7ad35cfc45eea42dccfeb63819afb30be8583f7 (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 6939066788386fb0e508e5f08057d6d73c266cfc
Merge: d7ad35cfc45eea42dccfeb63819afb30be8583f7 1bb11f4387754520010656b9c0be81bf05395590
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Nov 5 16:03:47 2009 +0100

    Merge branch 'upstream'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   11 +++++++++++
 build.xml         |    9 ++++++---
 buildSDKSource.sh |    9 +++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bdc7fdc..88928ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-05  Alexander Kurtakov  <akurtako at redhat.com>
+	Fix for bug #294264.
+	* build.xml: Use ${buildWorkspace} instead of $HOME/workspace.
+
+2009-11-03  Andrew Overholt  <overholt at redhat.com>
+
+	Bug #292706
+
+	* buildSDKSource.sh: Apply patch from Benjamin Drung to remove binaries
+	and CVS files from source tarball. 
+
 2009-11-03  Andrew Overholt  <overholt at redhat.com>
 
 	* patches/eclipse-jdt_launch-customBuild.patch: Correct offset.
diff --git a/build.xml b/build.xml
index 871961a..3265a96 100644
--- a/build.xml
+++ b/build.xml
@@ -527,12 +527,15 @@
 			<param name="p2.repo" value="${reposource}" />
 		</antcall>
 		<!-- build equinox initializer -->
+		<mkdir dir="${buildDirectory}/home" />
 		<java classname="org.eclipse.core.launcher.Main" dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer" fork="true">
 			<classpath>
 				<fileset dir="${buildDirectory}/installation/plugins">
 					<include name="org.eclipse.equinox.launcher_*.jar" />
 				</fileset>
 			</classpath>
+			<arg line="-data ${buildworkspace} " />
+			<arg line="-Duser.home=${buildDirectory}/home" />
 			<arg line="-application org.eclipse.ant.core.antRunner" />
 			<arg line="-f build.xml" />
 			<arg line="build.update.jar" />
@@ -543,8 +546,7 @@
 			</fileset>
 		</copy>
 		<!-- build ecf -->
-		<mkdir dir="ecf-src/build" />
-		<mkdir dir="ecf-src/home" />
+		<mkdir dir="${buildDirectory}/ecf-src/build" />
 		<dirset dir="${buildDirectory}/installation/plugins" includes="org.eclipse.pde.build_*" id="pdebuild" />
 		<property name="pdebuildplugin" refid="pdebuild" />
 		<java classname="org.eclipse.core.launcher.Main" dir="${buildDirectory}/ecf-src" fork="true">
@@ -553,7 +555,8 @@
 					<include name="org.eclipse.equinox.launcher_*.jar" />
 				</fileset>
 			</classpath>
-			<arg line="-Duser.home=${buildDirectory}/ecf-src/home" />
+			<arg line="-data ${buildworkspace} " />
+			<arg line="-Duser.home=${buildDirectory}/home" />
 			<arg line="-application org.eclipse.ant.core.antRunner" />
 			<arg line="-Dtype=feature" />
 			<arg line="-Did=org.eclipse.ecf.filetransfer_feature" />
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index a16c243..2496f17 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Possible optimizations:
 # - don't check out non-Linux fragments (will need to patch features for this)
@@ -189,6 +190,14 @@ cd "${fetchDirectory}"
 # copied into the right places for the build
 rm -rf ecfBundles orbitRepo
 
+# Remove files from the version control system
+find -depth -name CVS -exec rm -rf {} \;
+
+# Remove prebuilt binaries
+find \( -name '*.exe' -o -name '*.dll' \) -delete
+find \( -name '*.so' -o -name '*.so.2' \) -delete
+find features/org.eclipse.equinox.executable -name eclipse -delete
+
 mkdir eclipse-${buildID}-fetched-src
 mv * eclipse-${buildID}-fetched-src
 tar cjf "${workDirectory}"/eclipse-${buildID}-fetched-src.tar.bz2 \


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.