[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. f5abf1a1a4433e3b407568c50f3df868bd8ac1ae
Benjamin Drung
bdrung-guest at alioth.debian.org
Mon Sep 21 15:33:22 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 f5abf1a1a4433e3b407568c50f3df868bd8ac1ae (commit)
via 7369bcc5061445123bc3e0821975a6a3070e6635 (commit)
via 12523acc651fc0fd674fdd0892d5a38c229d04ef (commit)
from 699923eaf3104223efc24794ddff42e1c4f7d5fc (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 f5abf1a1a4433e3b407568c50f3df868bd8ac1ae
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Sep 21 17:32:56 2009 +0200
remove patches, which are applied upstream
commit 7369bcc5061445123bc3e0821975a6a3070e6635
Merge: 699923eaf3104223efc24794ddff42e1c4f7d5fc 12523acc651fc0fd674fdd0892d5a38c229d04ef
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Sep 21 17:28:04 2009 +0200
Merge branch 'upstream'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 21 +++++
build.sh | 2 +-
build.xml | 133 +++++++++++++++++++++++++++++---
buildSDKSource.sh | 15 ++++
debian/patches/01-install-target.patch | 49 ------------
debian/patches/02-stamp-fix.patch | 61 ---------------
eclipse.desktop | 8 ++
patches/tests-noapttests.patch | 25 ++++++
8 files changed, 193 insertions(+), 121 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a771f35..c998d90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2009-09-21 Andrew Overholt <overholt at redhat.com>
+
+ Bug #289938
+
+ * build.xml: Add install target to install provisioned SDK (courtesy
+ Benjamin Drung).
+ * eclipse.desktop: Initial checking (courtesy Benjamin Drung).
+
+2009-09-21 Andrew Overholt <overholt at redhat.com>
+
+ Bug #289939
+
+ * build.xml: Apply patch from Benjamin Drung to add stamp files for
+ provisioning SDK and other targets.
+
+2009-09-15 Andrew Overholt <overholt at redhat.com>
+
+ * patches/tests-noapttests.patch: New file. Patch for eclipse bug #244178.
+ * build.xml: Fix "scriptsPreset" typo. Build test framework and SDK tests.
+ * buildSDKSource.sh: Add fetching of test scripts not included elsewhere.
+
2009-08-27 Andrew Overholt <overholt at redhat.com>
Bug #286824
diff --git a/build.sh b/build.sh
index 5e66eee..80cf4a8 100755
--- a/build.sh
+++ b/build.sh
@@ -25,4 +25,4 @@ esac
DATE=`date +%Y%m%d%H%M%S`
ant -DbuildArch=${arch} 2>&1 | tee build_${DATE}.log
-echo "Build log is available in build_${DATE}.log
+echo "Build log is available in build_${DATE}.log"
diff --git a/build.xml b/build.xml
index faecc54..8d106bb 100644
--- a/build.xml
+++ b/build.xml
@@ -6,23 +6,37 @@
<property file="build.properties" />
<available file="eclipse-${buildId}-fetched-src.tar.bz2" property="sdkSourcePresent" value="true" />
- <available file="eclipse-build-generatedScripts.tar.bz2" property="scriptsPreset" value="true" />
+ <available file="eclipse-build-generatedScripts.tar.bz2" property="scriptsPresent" value="true" />
<!-- Check what has already been done -->
<uptodate property="unpack.complete" srcfile="${basedir}/eclipse-${buildId}-fetched-src.tar.bz2" targetfile="unpack-stamp" />
+ <uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildId}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
- <uptodate property="build.complete" srcfile="unpack-stamp" targetfile="build-stamp" />
+ <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" />
+ <uptodate property="p2prep.complete" srcfile="build-stamp" targetfile="p2prep-stamp" />
+ <uptodate property="testsbuild.complete" srcfile="testspatch-stamp" targetfile="testsbuild-stamp" />
+ <uptodate property="provision.sdk.complete" srcfile="build-stamp" targetfile="provision.sdk-stamp" />
<available file="bootstrap/plugins" property="bootstrapped" value="true" />
<property name="topBuildDir" value="${basedir}/build"/>
+ <property name="testsBuildDir" value="${basedir}/testsBuild"/>
<property name="homeDir" value="${basedir}/home" />
<property name="baseworkspace" value="${basedir}/baseworkspace" />
<property name="buildworkspace" value="${basedir}/buildworkspace" />
- <property name="buildDirectory" value="${basedir}/build/eclipse-${buildId}-fetched-src" />
+ <property name="buildDirectory" value="${topBuildDir}/eclipse-${buildId}-fetched-src" />
+ <property name="testsBuildDirectory" value="${testsBuildDir}/eclipse-sdktests-${buildId}-fetched-src" />
<property name="buildConfigs" value="${buildDirectory}/buildConfigs" />
<property name="buildConfig" value="${buildConfigs}/eclipse-build-config" />
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
+ <property name="testsBuildLabel" value="3.5"/>
+
+ <property name="destDir" value="" />
+ <property name="prefix" value="/usr/local" />
+
+ <property name="doTests" value="true" />
<target name="bootstrap" unless="bootstrapped">
<ant inheritall="false" antfile="pdebuild.xml">
@@ -40,7 +54,7 @@
<fail message="SDK source tarball is not present. Please either download a file such as eclipse-I20090611-1540-fetched-src.tar.bz2 from http://download.eclipse.org/technology/linuxtools/eclipse-build/ or generate one by running ./buildSDKSource.sh."/>
</target>
- <target name="extractBuildXmls" if="scriptsPreset">
+ <target name="extractBuildXmls" if="scriptsPresent">
<untar compression="bzip2" dest="${basedir}/build/eclipse-${buildId}-fetched-src"
src="${basedir}/eclipse-build-generatedScripts.tar.bz2"/>
<!--
@@ -63,7 +77,7 @@
<mkdir dir="${buildworkspace}" />
<echo message="Extracting SDK source (tar jxf eclipse-${buildId}-fetched-src.tar.bz2)" />
- <untar dest="${basedir}/build" src="${basedir}/eclipse-${buildId}-fetched-src.tar.bz2" compression="bzip2" />
+ <untar dest="${topBuildDir}" src="${basedir}/eclipse-${buildId}-fetched-src.tar.bz2" compression="bzip2" />
<antcall target="extractBuildXmls"/>
<delete dir="${buildDirectory}/buildConfigs" />
@@ -81,6 +95,33 @@
<echo file="unpack-stamp" />
</target>
+ <target name="unpackTests" unless="testsunpack.complete">
+ <delete dir="${testsBuildDir}" />
+ <mkdir dir="${testsBuildDir}" />
+
+ <!-- User home used for build -->
+ <delete dir="${homeDir}" />
+ <mkdir dir="${homeDir}" />
+
+ <!-- Workspaces used for build -->
+ <delete dir="${baseworkspace}" />
+ <mkdir dir="${baseworkspace}" />
+ <delete dir="${buildworkspace}" />
+ <mkdir dir="${buildworkspace}" />
+
+ <echo message="Extracting SDK tests source (tar jxf eclipse-sdktests-${buildId}-fetched-src.tar.bz2)" />
+ <untar dest="${testsBuildDir}" src="${basedir}/eclipse-sdktests-${buildId}-fetched-src.tar.bz2" compression="bzip2" />
+ <untar dest="${testsBuildDir}" src="${basedir}/eclipse-sdktests-${buildId}-fetched-scripts.tar.bz2" compression="bzip2" />
+ <move todir="${testsBuildDir}">
+ <fileset dir="${testsBuildDir}/eclipse-sdktests-${buildId}-fetched-scripts">
+ <include name="**/*" />
+ </fileset>
+ </move>
+
+ <!-- Create a stamp file -->
+ <echo file="testsunpack-stamp" />
+ </target>
+
<target name="clean">
<delete dir="${homeDir}" />
<delete dir="${baseworkspace}" />
@@ -90,7 +131,7 @@
<delete dir="p2" />
<delete dir="workspace" />
<delete>
- <fileset dir="." includes="*-stamp" />
+ <fileset dir="." includes="*-stamp" />
</delete>
</target>
@@ -120,7 +161,12 @@
<echo file="patch-stamp" />
</target>
- <target name="build" depends="applyPatches,bootstrap,compilelibs" unless="build.complete">
+ <target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
+ <patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
+ <echo file="testspatch-stamp" />
+ </target>
+
+ <target name="build" depends="applyPatches,bootstrap,compilelibs" unless="build.complete">
<echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}"/>
<java classname="org.eclipse.equinox.launcher.Main"
fork="true"
@@ -146,7 +192,51 @@
<echo file="build-stamp" />
</target>
- <target name="compilelibs" >
+ <target name="checkBuildTests" depends="buildTests.check" if="buildTests.run">
+ </target>
+
+ <target name="buildTests.check">
+ <condition property="buildTests.run">
+ <and>
+ <istrue value="${doTests}"/>
+ <not>
+ <istrue value="${testsbuild.complete}"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <target name="buildTests" depends="applyTestPatches,provision.sdk" unless="checkBuildTests">
+ <!-- Test framework -->
+ <exec executable="${buildDirectory}/installation/eclipse">
+ <arg line="-nosplash " />
+ <arg line="-consolelog " />
+ <arg line="-application org.eclipse.ant.core.antRunner " />
+ <arg line="-buildfile ${eclipse.pdebuild.scripts}/build.xml" />
+ <arg line="-propertyfile ${basedir}/build.properties " />
+ <arg line="-DbuildDirectory=${testsBuildDirectory} " />
+ <arg line="-Dtype=feature -Did=org.eclipse.test " />
+ <arg line="-DbaseLocation=${buildDirectory}/installation " />
+ <arg line="-DbuildLabel=${testsBuildLabel} " />
+ <arg line="-data ${buildworkspace} " />
+ </exec>
+ <!-- SDK tests -->
+ <exec executable="${buildDirectory}/installation/eclipse">
+ <arg line="-nosplash " />
+ <arg line="-consolelog " />
+ <arg line="-application org.eclipse.ant.core.antRunner " />
+ <arg line="-buildfile ${eclipse.pdebuild.scripts}/build.xml" />
+ <arg line="-propertyfile ${basedir}/build.properties " />
+ <arg line="-DbuildDirectory=${testsBuildDirectory} " />
+ <arg line="-Dtype=feature -Did=org.eclipse.sdk.tests " />
+ <arg line="-DbaseLocation=${buildDirectory}/installation " />
+ <arg line="-DbuildLabel=${testsBuildLabel} " />
+ <arg line="-data ${buildworkspace} " />
+ </exec>
+ <echo file="testsbuild-stamp" />
+ </target>
+
+ <target name="compilelibs" unless="compilelibs.complete">
<!-- TODO: Reenable when libgnomeproxy build is fixed.
<delete verbose="true">
<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
@@ -188,9 +278,10 @@
<!-- build libupdate -->
<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+ <echo file="compilelibs-stamp" />
</target>
- <target name="p2prep" depends="build">
+ <target name="p2prep" depends="build" unless="p2prep.complete">
<!--<property name="builtZip" value="${buildDirectory}/${buildLabel}/${featureToBuild}-${buildId}-group.group.group.zip" />-->
<!-- archiveName is set in the build config's customTargets.xml -->
<!-- FIXME buildLabel should be used here but it's not defined so we cheat and use I.${buildId} instead. -->
@@ -215,6 +306,8 @@
<copy file="${reposource}/content.jar" tofile="${reposource}/content.jar.afterrcpConfig" failonerror="false"/>
<antcall target="publishSDK"/>
+
+ <echo file="p2prep-stamp" />
</target>
<target name="createRepo">
@@ -328,7 +421,7 @@
</java>
</target>
- <target name="provision.sdk" depends="p2prep">
+ <target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
<echo message="Installing into: ${buildDirectory}/installation"/>
<antcall target="run.director">
<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
@@ -341,6 +434,7 @@
<param name="p2.arch" value="${buildArch}" />
<param name="p2.repo" value="${reposource}" />
</antcall>
+ <echo file="provision.sdk-stamp" />
</target>
<target name="run.director">
@@ -385,4 +479,23 @@
<move file="${baseBuilderConfig}.bak" tofile="${baseBuilderConfig}" />
</target>
+ <target name="install" depends="provision.sdk">
+ <mkdir dir="${destDir}${prefix}/lib/eclipse"/>
+ <exec executable="cp">
+ <arg value="-rf"/>
+ <arg value="--no-target-directory" />
+ <arg value="${buildDirectory}/installation" />
+ <arg value="${destDir}${prefix}/lib/eclipse" />
+ </exec>
+ <!-- install desktop file -->
+ <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
+ <!-- install icons -->
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png"
+ tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png"
+ tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png"
+ tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
+ </target>
+
</project>
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index 80c04b8..3c6b2fd 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -152,4 +152,19 @@ tar cjf "${workDirectory}"/eclipse-sdktests-${buildID}-fetched-src.tar.bz2 \
eclipse-sdktests-${buildID}-fetched-src
fi
+
+# Testing runtests and test.xml scripts which are not in org.eclipse.test
+cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co \
+ -r v${buildID} \
+ org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts
+scriptsDir=org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts
+testScripts=eclipse-sdktests-${buildID}-fetched-scripts
+mkdir ${testScripts}
+mv ${scriptsDir}/runtests ${testScripts}
+mv ${scriptsDir}/test.xml ${testScripts}
+rm -rf org.eclipse.releng.eclipsebuilder
+tar cjf \
+ "${workDirectory}"/eclipse-sdktests-${buildID}-fetched-scripts.tar.bz2 \
+ ${testScripts}
+
cd "${baseDir}"
diff --git a/debian/patches/01-install-target.patch b/debian/patches/01-install-target.patch
deleted file mode 100644
index a4a3851..0000000
--- a/debian/patches/01-install-target.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -pruN debian.git/build.xml debian.new/build.xml
---- build.xml 2009-09-19 21:20:26.257565801 +0200
-+++ build.xml 2009-09-19 21:05:49.993565000 +0200
-@@ -24,6 +24,9 @@
- <property name="productFiles" value="${buildConfig}/productFiles" />
- <property name="reposource" value="${buildDirectory}/reposource" />
-
-+ <property name="destDir" value="" />
-+ <property name="prefix" value="/usr/local" />
-+
- <target name="bootstrap" unless="bootstrapped">
- <ant inheritall="false" antfile="pdebuild.xml">
- <property name="buildId" value="${buildId}"/>
-@@ -385,4 +388,23 @@
- <move file="${baseBuilderConfig}.bak" tofile="${baseBuilderConfig}" />
- </target>
-
-+ <target name="install" depends="provision.sdk">
-+ <mkdir dir="${destDir}${prefix}/lib/eclipse"/>
-+ <exec executable="cp">
-+ <arg value="-rf"/>
-+ <arg value="--no-target-directory" />
-+ <arg value="${buildDirectory}/installation" />
-+ <arg value="${destDir}${prefix}/lib/eclipse" />
-+ </exec>
-+ <!-- install desktop file -->
-+ <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
-+ <!-- install icons -->
-+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png"
-+ tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
-+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png"
-+ tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
-+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png"
-+ tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
-+ </target>
-+
- </project>
-diff -pruN debian.git/eclipse.desktop debian.new/eclipse.desktop
---- eclipse.desktop 1970-01-01 01:00:00.000000000 +0100
-+++ eclipse.desktop 2009-09-19 12:32:50.841566000 +0200
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+Type=Application
-+Name=Eclipse
-+Comment=Develop applications in a variety of different programming languages
-+Icon=eclipse
-+Exec=eclipse
-+Terminal=false
-+Categories=Development;IDE;Java;
diff --git a/debian/patches/02-stamp-fix.patch b/debian/patches/02-stamp-fix.patch
deleted file mode 100644
index d27156e..0000000
--- a/debian/patches/02-stamp-fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' debian.git/build.xml debian.git.new/build.xml
---- build.xml 2009-09-20 00:17:55.169565525 +0200
-+++ build.xml 2009-09-20 00:24:40.642066046 +0200
-@@ -11,7 +11,10 @@
- <!-- Check what has already been done -->
- <uptodate property="unpack.complete" srcfile="${basedir}/eclipse-${buildId}-fetched-src.tar.bz2" targetfile="unpack-stamp" />
- <uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
-+ <uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
- <uptodate property="build.complete" srcfile="unpack-stamp" targetfile="build-stamp" />
-+ <uptodate property="p2prep.complete" srcfile="build-stamp" targetfile="p2prep-stamp" />
-+ <uptodate property="provision.sdk.complete" srcfile="build-stamp" targetfile="provision.sdk-stamp" />
- <available file="bootstrap/plugins" property="bootstrapped" value="true" />
-
- <property name="topBuildDir" value="${basedir}/build"/>
-@@ -149,7 +152,7 @@
- <echo file="build-stamp" />
- </target>
-
-- <target name="compilelibs" >
-+ <target name="compilelibs" unless="compilelibs.complete">
- <!-- TODO: Reenable when libgnomeproxy build is fixed.
- <delete verbose="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
-@@ -191,9 +194,10 @@
- <!-- build libupdate -->
- <ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
-
-+ <echo file="compilelibs-stamp" />
- </target>
-
-- <target name="p2prep" depends="build">
-+ <target name="p2prep" depends="build" unless="p2prep.complete">
- <!--<property name="builtZip" value="${buildDirectory}/${buildLabel}/${featureToBuild}-${buildId}-group.group.group.zip" />-->
- <!-- archiveName is set in the build config's customTargets.xml -->
- <!-- FIXME buildLabel should be used here but it's not defined so we cheat and use I.${buildId} instead. -->
-@@ -218,6 +222,8 @@
- <copy file="${reposource}/content.jar" tofile="${reposource}/content.jar.afterrcpConfig" failonerror="false"/>
-
- <antcall target="publishSDK"/>
-+
-+ <echo file="p2prep-stamp" />
- </target>
-
- <target name="createRepo">
-@@ -331,7 +337,7 @@
- </java>
- </target>
-
-- <target name="provision.sdk" depends="p2prep">
-+ <target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
- <echo message="Installing into: ${buildDirectory}/installation"/>
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-@@ -344,6 +350,7 @@
- <param name="p2.arch" value="${buildArch}" />
- <param name="p2.repo" value="${reposource}" />
- </antcall>
-+ <echo file="provision.sdk-stamp" />
- </target>
-
- <target name="run.director">
diff --git a/eclipse.desktop b/eclipse.desktop
new file mode 100644
index 0000000..b4ee160
--- /dev/null
+++ b/eclipse.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Eclipse
+Comment=Develop applications in a variety of different programming languages
+Icon=eclipse
+Exec=eclipse
+Terminal=false
+Categories=Development;IDE;Java;
\ No newline at end of file
diff --git a/patches/tests-noapttests.patch b/patches/tests-noapttests.patch
new file mode 100644
index 0000000..946880f
--- /dev/null
+++ b/patches/tests-noapttests.patch
@@ -0,0 +1,25 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.sdk.tests
+Index: feature.xml
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests/feature.xml,v
+retrieving revision 1.59
+diff -u -r1.59 feature.xml
+--- feature.xml 27 Feb 2009 13:46:35 -0000 1.59
++++ feature.xml 1 May 2009 17:50:01 -0000
+@@ -80,6 +80,7 @@
+ install-size="0"
+ version="0.0.0"/>
+
++<!--
+ <plugin
+ id="org.eclipse.jdt.apt.tests"
+ download-size="0"
+@@ -97,6 +98,7 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
++-->
+
+ <plugin
+ id="org.eclipse.jdt.core.tests.builder"
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list