[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. f564eac4a690f1c05b896f90af86352ac20b94fc
Benjamin Drung
bdrung-guest at alioth.debian.org
Mon Nov 2 21:40:13 UTC 2009
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 f564eac4a690f1c05b896f90af86352ac20b94fc (commit)
via 4cb29931c95acdd6c5fec62bfb4d3fa37acdedd7 (commit)
via 31d83135ce25d7cba7209bf3e05a1af06a81462b (commit)
from 58f85888e324ea3fa69a4760fea600c643eacda7 (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 f564eac4a690f1c05b896f90af86352ac20b94fc
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Nov 2 22:39:51 2009 +0100
Remove patches, that are accepted by upstream.
commit 4cb29931c95acdd6c5fec62bfb4d3fa37acdedd7
Merge: 58f85888e324ea3fa69a4760fea600c643eacda7 31d83135ce25d7cba7209bf3e05a1af06a81462b
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Nov 2 22:38:48 2009 +0100
Merge branch 'upstream'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 ++++
additionalArchs/rename.sh | 2 +-
build.xml | 38 +++++++++-
debian/patches/series | 1 -
debian/patches/support-extracted-source.patch | 79 --------------------
eclipse-build-config/ChangeLog | 5 +
eclipse-build-config/build.properties | 3 +-
.../productFiles/rcpConfig/build.properties | 2 +
8 files changed, 58 insertions(+), 86 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8eb26bc..36fb116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-26 Matthias Klose <doko at ubuntu.com>
+
+ * additionalArchs/rename.sh: Remove bashism.
+
+2009-11-02 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Re-name variable for clarity.
+
+2009-11-02 Andrew Overholt <overholt at redhat.com>
+
+ Bug #292475 (Benjamin Drung)
+
+ * build.xml: Support build with extracted source (not just with tarball).
+
2009-10-30 Andrew Overholt <overholt at redhat.com>
Bug #292610 (Benjamin Drung)
diff --git a/additionalArchs/rename.sh b/additionalArchs/rename.sh
index 5ca0915..2f8b177 100644
--- a/additionalArchs/rename.sh
+++ b/additionalArchs/rename.sh
@@ -2,7 +2,7 @@
newArch=$1
-function moves(){
+moves(){
for f in $(find -type d); do
tofile=$(echo $f | sed "s/ppc/$newArch/")
if [ $tofile != $f ]; then
diff --git a/build.xml b/build.xml
index 3802a65..bd3fdff 100644
--- a/build.xml
+++ b/build.xml
@@ -6,12 +6,27 @@
<property file="build.properties" />
<available file="eclipse-${buildTag}-fetched-src.tar.bz2" property="sdkSourcePresent" value="true" />
+ <available file="eclipse-${testsBuildLabel}/plugins/org.eclipse.equinox.launcher/build.properties" property="extractedSdkSourcePresent" value="true" />
+
+ <condition property="onlyExtractedSdkSourcePresent">
+ <and>
+ <isfalse value="${sdkSourcePresent}" />
+ <istrue value="${extractedSdkSourcePresent}" />
+ </and>
+ </condition>
+ <condition property="sdkSourceTarballPresent">
+ <or>
+ <isset property="sdkSourcePresent"/>
+ <isset property="extractedSdkSourcePresent"/>
+ </or>
+ </condition>
+
<available file="eclipse-build-generatedScripts.tar.bz2" property="scriptsPresent" value="true" />
<available file="eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" property="testsSourcePresent" value="true" />
<available file="eclipse-sdktests-${buildTag}-fetched-scripts.tar.bz2" property="testsScriptsPresent" value="true" />
<!-- Check what has already been done -->
- <uptodate property="unpack.complete" srcfile="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" targetfile="unpack-stamp" />
+ <available property="unpack.complete" file="unpack-stamp" value="true" />
<uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
@@ -80,7 +95,7 @@
<ant antfile="pdebuild.xml" target="generateScripts" />
</target>
- <target name="fetch" unless="sdkSourcePresent">
+ <target name="fetch" unless="sdkSourceTarballPresent">
<fail message="SDK source tarball is not present. Please either download a file such as eclipse-I20090611-1540-fetched-src.tar.bz2 from http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build or generate one by running ./buildSDKSource.sh." />
</target>
@@ -99,6 +114,21 @@
-->
</target>
+ <target name="extractSource" unless="onlyExtractedSdkSourcePresent">
+ <echo message="Extracting SDK source (tar jxf eclipse-${buildTag}-fetched-src.tar.bz2)" />
+ <untar dest="${topBuildDir}" src="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" compression="bzip2" />
+ </target>
+
+ <target name="copySource" unless="sdkSourcePresent">
+ <echo message="Copy SDK source (cp -rd --not-target-directory eclipse-${testsBuildLabel} ${buildDirectory})" />
+ <exec executable="cp" failonerror="true">
+ <arg value="-rd" />
+ <arg value="--no-target-directory" />
+ <arg value="eclipse-${testsBuildLabel}" />
+ <arg value="${buildDirectory}" />
+ </exec>
+ </target>
+
<target name="unpack" depends="fetch,setLibDir" unless="unpack.complete">
<delete dir="${topBuildDir}" />
<mkdir dir="${topBuildDir}" />
@@ -113,8 +143,8 @@
<delete dir="${buildworkspace}" />
<mkdir dir="${buildworkspace}" />
- <echo message="Extracting SDK source (tar jxf eclipse-${buildTag}-fetched-src.tar.bz2)" />
- <untar dest="${topBuildDir}" src="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" compression="bzip2" />
+ <antcall target="extractSource" />
+ <antcall target="copySource" />
<antcall target="extractBuildXmls" />
<delete dir="${buildDirectory}/buildConfigs" />
diff --git a/debian/patches/series b/debian/patches/series
index 74c8f06..2937227 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
fix-shell-script-perm.patch
-support-extracted-source.patch
fix-perm.patch
diff --git a/debian/patches/support-extracted-source.patch b/debian/patches/support-extracted-source.patch
deleted file mode 100644
index a3bbc8c..0000000
--- a/debian/patches/support-extracted-source.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: support extracted source instead of requiring a tarball
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=292475
-Author: Benjamin Drung <bdrung at ubuntu.com>
-
-diff --git a/build.xml b/build.xml
-index 9fe198e..126c7b4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -6,12 +6,27 @@
- <property file="build.properties" />
-
- <available file="eclipse-${buildTag}-fetched-src.tar.bz2" property="sdkSourcePresent" value="true" />
-+ <available file="eclipse-${testsBuildLabel}/plugins/org.eclipse.equinox.launcher/build.properties" property="extractedSdkSourcePresent" value="true" />
-+
-+ <condition property="onlyExtractedSdkSourcePresent">
-+ <and>
-+ <isfalse value="${sdkSourcePresent}" />
-+ <istrue value="${extractedSdkSourcePresent}" />
-+ </and>
-+ </condition>
-+ <condition property="oneSdkSourcePresent">
-+ <or>
-+ <isset property="sdkSourcePresent"/>
-+ <isset property="extractedSdkSourcePresent"/>
-+ </or>
-+ </condition>
-+
- <available file="eclipse-build-generatedScripts.tar.bz2" property="scriptsPresent" value="true" />
- <available file="eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" property="testsSourcePresent" value="true" />
- <available file="eclipse-sdktests-${buildTag}-fetched-scripts.tar.bz2" property="testsScriptsPresent" value="true" />
-
- <!-- Check what has already been done -->
-- <uptodate property="unpack.complete" srcfile="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" targetfile="unpack-stamp" />
-+ <available property="unpack.complete" file="unpack-stamp" value="true" />
- <uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
- <uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
- <uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
-@@ -77,7 +92,7 @@
- <ant antfile="pdebuild.xml" target="generateScripts" />
- </target>
-
-- <target name="fetch" unless="sdkSourcePresent">
-+ <target name="fetch" unless="oneSdkSourcePresent">
- <fail message="SDK source tarball is not present. Please either download a file such as eclipse-I20090611-1540-fetched-src.tar.bz2 from http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build or generate one by running ./buildSDKSource.sh." />
- </target>
-
-@@ -96,6 +111,21 @@
- -->
- </target>
-
-+ <target name="extractSource" unless="onlyExtractedSdkSourcePresent">
-+ <echo message="Extracting SDK source (tar jxf eclipse-${buildTag}-fetched-src.tar.bz2)" />
-+ <untar dest="${topBuildDir}" src="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" compression="bzip2" />
-+ </target>
-+
-+ <target name="copySource" unless="sdkSourcePresent">
-+ <echo message="Copy SDK source (cp -rd --not-target-directory eclipse-${testsBuildLabel} ${buildDirectory})" />
-+ <exec executable="cp" failonerror="true">
-+ <arg value="-rd" />
-+ <arg value="--no-target-directory" />
-+ <arg value="eclipse-${testsBuildLabel}" />
-+ <arg value="${buildDirectory}" />
-+ </exec>
-+ </target>
-+
- <target name="unpack" depends="fetch,setLibDir" unless="unpack.complete">
- <delete dir="${topBuildDir}" />
- <mkdir dir="${topBuildDir}" />
-@@ -110,8 +140,8 @@
- <delete dir="${buildworkspace}" />
- <mkdir dir="${buildworkspace}" />
-
-- <echo message="Extracting SDK source (tar jxf eclipse-${buildTag}-fetched-src.tar.bz2)" />
-- <untar dest="${topBuildDir}" src="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" compression="bzip2" />
-+ <antcall target="extractSource" />
-+ <antcall target="copySource" />
- <antcall target="extractBuildXmls" />
-
- <delete dir="${buildDirectory}/buildConfigs" />
diff --git a/eclipse-build-config/ChangeLog b/eclipse-build-config/ChangeLog
index 2c87e79..befa467 100644
--- a/eclipse-build-config/ChangeLog
+++ b/eclipse-build-config/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-02 Matthias Klose <doko at ubuntu.com>
+
+ * productFiles/rcpConfig/build.properties: Add arm support.
+ * build.properties: Likewise.
+
2009-10-22 Alexander Kurtakov <akurtako at redhat.com>
* productFiles/rcpConfig/build.properties: Add rootfiles for sparc[64].
diff --git a/eclipse-build-config/build.properties b/eclipse-build-config/build.properties
index e7f8009..421d8fb 100755
--- a/eclipse-build-config/build.properties
+++ b/eclipse-build-config/build.properties
@@ -38,6 +38,8 @@ configs=\
win32, wpf, x86 &\
win32, win32, x86_64 &\
wce_ppc, win32, arm &\
+ linux, gtk, alpha &\
+ linux, gtk, arm &\
linux, gtk, x86 & \
linux, gtk, ppc & \
linux, gtk, ppc64 & \
@@ -47,7 +49,6 @@ configs=\
linux, gtk, sparc &\
linux, gtk, sparcv9 &\
linux, gtk, sparc64 &\
- linux, gtk, alpha &\
linux, motif, x86 & \
solaris, gtk, sparc & \
solaris, gtk, x86 & \
diff --git a/eclipse-build-config/productFiles/rcpConfig/build.properties b/eclipse-build-config/productFiles/rcpConfig/build.properties
index 77fdd9f..da6a805 100644
--- a/eclipse-build-config/productFiles/rcpConfig/build.properties
+++ b/eclipse-build-config/productFiles/rcpConfig/build.properties
@@ -19,6 +19,8 @@ root.hpux.motif.ia64_32=absolute:${buildDirectory}/features/org.eclipse.equinox.
root.solaris.gtk.sparc=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc
root.solaris.gtk.x86=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/solaris/x86
+root.linux.gtk.arm=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.arm,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/arm
+root.linux.gtk.arm.permissions.755=*.so*
root.linux.gtk.x86=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/x86
root.linux.gtk.x86.permissions.755=*.so*
root.linux.gtk.ppc=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list