[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 09480bc5f13118aa5f5034a566240ceb627d1bc5
Benjamin Drung
bdrung-guest at alioth.debian.org
Fri Sep 25 15:19:06 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 09480bc5f13118aa5f5034a566240ceb627d1bc5 (commit)
via a608f9fd648e69790bdefc0f816ad8c7d12098f0 (commit)
from 4e95fa3621c5512b458a3b773c29ff0b7640a212 (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 09480bc5f13118aa5f5034a566240ceb627d1bc5
Merge: 4e95fa3621c5512b458a3b773c29ff0b7640a212 a608f9fd648e69790bdefc0f816ad8c7d12098f0
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Sep 25 17:18:32 2009 +0200
Merge branch 'upstream'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 90 +++++++
build.properties | 1 +
build.xml | 173 ++++++++++++--
buildEclipseBuildSource.sh | 4 +-
eclipse-build-config/ChangeLog | 13 +-
eclipse-build-config/productFiles/sdk/sdk.product | 5 +-
eclipse-tests-vncpwd | 1 +
eclipse.desktop | 5 +-
junitHelper.xml | 23 ++
patches/eclipse-help-toolbar.patch | 71 ++++++
patches/eclipse-jdt_launch-customBuild.patch | 68 +++++
patches/tests-nostyletask.patch | 11 +
runtests.sh | 278 +++++++++++++++++++++
13 files changed, 716 insertions(+), 27 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c998d90..7fbb6fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,93 @@
+2009-09-25 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/tests-nostyletask.patch: New file.
+ * build.xml: Apply patch to not use deprecated ant task.
+ * junitHelper.xml: Likewise.
+
+2009-09-25 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Delete testBuild folder in clean.
+
+2009-09-24 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Add message requesting posting of results.
+ Update URL for downloading (use mirrors).
+ * runtests.sh: Add wiki page for posting results.
+
+2009-09-24 Andrew Overholt <overholt at redhat.com>
+
+ * runtests.sh: Define "plugin-path" for SWT tests.
+
+2009-09-24 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Use ant tasks instead of execs.
+
+2009-09-23 Andrew Overholt <overholt at redhat.com>
+
+ * runtests.sh: Add some information about failing tests. Run with
+ os/ws/arch specified (at least os is needed for SWT tests).
+
+2009-09-23 Andrew Overholt <overholt at redhat.com>
+
+ * runtests.sh: Try to clean up between runs of each suite.
+
+2009-09-23 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/eclipse-jdt_launch-customBuild.patch: New file.
+ * build.xml: Fix o.e.jdt.launching custombuild.
+
+2009-09-23 Andrew Overholt <overholt at redhat.com>
+
+ * runtests.sh: Enable all test suites.
+ * build.xml: Copy re-named junitHelper.xml instead of genReport.xml
+
+2009-09-23 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Make building of tests depend upon building of SDK.
+
+2009-09-23 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Pass in a timestamp when running the tests. Copy final test
+ results to ${basedir}/testResults-${timestamp}. Copy vncpwd file for use.
+ * runtests.sh: Rename genReport function to genHtml. Handle test suites
+ with multiple XML output files. Add ability to pass in timestamp.
+ Document VNC password.
+ * junitHelper.xml: Rename from genReport.xml.
+ * eclipse-tests-vncpwd: Initial checkin. Default VNC password of
+ VNCpassword1.
+
+2009-09-22 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Copy the test installation into a sub-directory. Copy
+ genReport.xml and runtests.sh into test installation parent directory.
+ Add runTests target.
+ * runtests.sh: Add all test suites back (don't know if they all work,
+ but ...). Add FIXME to remember to deal with plugins that have multiple
+ suites.
+
+2009-09-22 Andrew Overholt <overholt at redhat.com>
+
+ * genReport.xml: Initial checkin. Generate HTML from the JUnit XML output.
+ * runtests.sh: Initial checkin. Run the SDK tests after a build (will be
+ in build.xml in the near future).
+ * build.properties: Add testsBuildID.
+ * build.xml: Add multilib property to allow use of /usr/lib64. Add
+ getInstallationDir target to test for multilib and 64-bit architecture.
+ Add provisioning of tests into test installation directory.
+
+2009-09-22 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/eclipse-help-toolbar.patch: New file.
+ * build.xml: Appy the help toolbar patch.
+
+2009-09-21 Andrew Overholt <overholt at redhat.com>
+
+ * buildEclipseBuildSource.sh: Make default tag 0.3.1.
+
+2009-09-21 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Add stamp for inserting the build ID.
+
2009-09-21 Andrew Overholt <overholt at redhat.com>
Bug #289938
diff --git a/build.properties b/build.properties
index a0796e3..8965ae4 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,7 @@
#baseLocation=${basedir}/bootstrap
# Note: this is also in pdebuild.properties
buildId=I20090611-1540
+testsBuildId=v20090227
featureToBuild=eclipse-build-feature
skipBase=true
skipFetch=true
diff --git a/build.xml b/build.xml
index 8d106bb..2ccdc8c 100644
--- a/build.xml
+++ b/build.xml
@@ -7,10 +7,13 @@
<available file="eclipse-${buildId}-fetched-src.tar.bz2" property="sdkSourcePresent" value="true" />
<available file="eclipse-build-generatedScripts.tar.bz2" property="scriptsPresent" value="true" />
+ <available file="eclipse-sdktests-${buildId}-fetched-src.tar.bz2" property="testsSourcePresent" value="true" />
+ <available file="eclipse-sdktests-${buildId}-fetched-scripts.tar.bz2" property="testsScriptsPresent" 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="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
@@ -18,6 +21,7 @@
<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" />
+ <uptodate property="provision.tests.complete" srcfile="testsbuild-stamp" targetfile="provision.tests-stamp" />
<available file="bootstrap/plugins" property="bootstrapped" value="true" />
<property name="topBuildDir" value="${basedir}/build"/>
@@ -35,6 +39,30 @@
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
+ <!-- Do we want /usr/lib64 if it's a 64-bit architecture? -->
+ <property name="multilib" value="false" />
+ <condition property="setLib64">
+ <and>
+ <istrue value="${multilib}" />
+ <or>
+ <!-- Is it a 64-bit architecture? -->
+ <equals arg1="${buildArch}" arg2="x86_64" />
+ <equals arg1="${buildArch}" arg2="ppc64" />
+ </or>
+ </and>
+ </condition>
+
+ <target name="setLib64Dir" if="setLib64">
+ <property name="libDir" value="lib64" />
+ </target>
+
+ <target name="setLibDir" depends="setLib64Dir">
+ <property name="libDir" value="lib" />
+ </target>
+
+ <target name="getInstallationDir" depends="setLibDir">
+ <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}"/>
+ </target>
<property name="doTests" value="true" />
@@ -51,7 +79,15 @@
</target>
<target name="fetch" unless="sdkSourcePresent">
- <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."/>
+ <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>
+
+ <target name="fetchTestSources" unless="testsSourcePresent">
+ <fail message="SDK tests source tarball is not present. Please either download a file such as eclipse-sdktests-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>
+
+ <target name="fetchTestScripts" unless="testsScriptsPresent">
+ <fail message="Scripts for the SDK tests tarball is not present. Please either download a file such as eclipse-sdktests-I20090611-1540-fetched-scripts.tar.bz2 from http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build or generate one by running ./buildSDKSource.sh." />
</target>
<target name="extractBuildXmls" if="scriptsPresent">
@@ -62,7 +98,7 @@
-->
</target>
- <target name="unpack" depends="fetch" unless="unpack.complete">
+ <target name="unpack" depends="fetch,setLibDir" unless="unpack.complete">
<delete dir="${topBuildDir}" />
<mkdir dir="${topBuildDir}" />
@@ -95,7 +131,7 @@
<echo file="unpack-stamp" />
</target>
- <target name="unpackTests" unless="testsunpack.complete">
+ <target name="unpackTests" depends="fetchTestSources,fetchTestScripts" unless="testsunpack.complete">
<delete dir="${testsBuildDir}" />
<mkdir dir="${testsBuildDir}" />
@@ -127,6 +163,7 @@
<delete dir="${baseworkspace}" />
<delete dir="${buildworkspace}" />
<delete dir="${topBuildDir}" />
+ <delete dir="${testsBuildDir}" />
<delete dir="configuration" />
<delete dir="p2" />
<delete dir="workspace" />
@@ -144,17 +181,21 @@
<delete dir="bootstrap/workspace" />
</target>
- <target name="insertBuildId" depends="unpack">
+ <target name="insertBuildId" depends="unpack" unless="buildId.complete">
<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
<include name="**/about.mappings" />
</replace>
<replace dir="${buildDirectory}" value="${buildId}" token="@build@">
<include name="**/configuration/config.ini" />
</replace>
+ <echo file="buildId-stamp"/>
</target>
<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="0" />
+ <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
+ <patch patchfile="${basedir}/patches/eclipse-help-toolbar.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-jdt_launch-customBuild.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="3" />
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
@@ -163,6 +204,7 @@
<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
+ <patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />
<echo file="testspatch-stamp" />
</target>
@@ -192,6 +234,7 @@
<echo file="build-stamp" />
</target>
+ <!--
<target name="checkBuildTests" depends="buildTests.check" if="buildTests.run">
</target>
@@ -205,8 +248,9 @@
</and>
</condition>
</target>
+ -->
- <target name="buildTests" depends="applyTestPatches,provision.sdk" unless="checkBuildTests">
+ <target name="buildTests" depends="provision.sdk,applyTestPatches" unless="testsbuild.complete">
<!-- Test framework -->
<exec executable="${buildDirectory}/installation/eclipse">
<arg line="-nosplash " />
@@ -314,9 +358,7 @@
<delete dir="${reposource}" />
<mkdir dir="${reposource}" />
<echo message="Unzipping ${builtZip} into ${reposource}" />
- <exec executable="unzip" dir=".">
- <arg line="-q ${builtZip} -d ${reposource}" />
- </exec>
+ <unzip dest="${reposource}" src="${builtZip}" />
</target>
<target name="extractLauncher">
@@ -328,10 +370,11 @@
<include name="features/org.eclipse.equinox.executable_*.jar" />
</fileset>
</copy>
-
- <exec executable="unzip" dir="${tempexec}">
- <arg line="-q features/*.jar -d ${tempexec}" />
- </exec>
+ <unzip dest="${tempexec}">
+ <fileset dir="${tempexec}/features">
+ <include name="*.jar"/>
+ </fileset>
+ </unzip>
</target>
<target name="publishLauncher">
@@ -437,6 +480,70 @@
<echo file="provision.sdk-stamp" />
</target>
+ <target name="provision.tests" depends="buildTests" unless="provision.tests.complete">
+ <mkdir dir="${buildDirectory}/testsInstallation"/>
+ <copy todir="${buildDirectory}/testsInstallation/eclipse" overwrite="true" >
+ <fileset dir="${buildDirectory}/installation"/>
+ </copy>
+ <!-- To prevent contamination for those with test framework installed on their system -->
+ <exec executable="/bin/sed">
+ <arg value="-i"/>
+ <arg value="/dropins/d" />
+ <arg value="${buildDirectory}/testsInstallation/eclipse/eclipse.ini" />
+ </exec>
+ <!--
+ <echo message="Installing test framework into: ${buildDirectory}/testsInstallation"/>
+ <antcall target="run.director">
+ <param name="p2.director.installIU" value="org.eclipse.test.feature.group" />
+ <param name="p2.director.profile" value="SDKProfile" />
+ <param name="p2.director.install.path" value="${buildDirectory}/testsInstallation" />
+ <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
+ <param name="p2.os" value="linux" />
+ <param name="p2.ws" value="gtk" />
+ <param name="p2.arch" value="${buildArch}" />
+ <param name="p2.repo" value="${testsBuildDirectory}/buildRepo" />
+ </antcall>
+-->
+ <echo message="Installing SDK tests into: ${buildDirectory}/testsInstallation"/>
+ <antcall target="run.installed.director">
+ <param name="directorToRun" value="${buildDirectory}/testsInstallation/eclipse/eclipse" />
+ <param name="p2.director.installIU" value="org.eclipse.sdk.tests.feature.group" />
+ <param name="p2.director.profile" value="SDKProfile" />
+ <param name="p2.director.install.path" value="${buildDirectory}/testsInstallation/eclipse" />
+ <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
+ <param name="p2.os" value="linux" />
+ <param name="p2.ws" value="gtk" />
+ <param name="p2.arch" value="${buildArch}" />
+ <param name="p2.repo" value="${testsBuildDirectory}/buildRepo" />
+ </antcall>
+ <copy preservelastmodified="true" file="${basedir}/junitHelper.xml" todir="${buildDirectory}/testsInstallation" />
+ <copy preservelastmodified="true" file="${basedir}/runtests.sh" todir="${buildDirectory}/testsInstallation" />
+ <copy preservelastmodified="true" file="${basedir}/eclipse-tests-vncpwd" todir="${buildDirectory}/testsInstallation" />
+ <echo file="provision.tests-stamp" />
+ </target>
+
+ <target name="runTests" depends="provision.tests">
+ <echo message="###################################################################"/>
+ <echo message="# #"/>
+ <echo message="# Please post and discuss results here: #"/>
+ <echo message="# http://wiki.eclipse.org/Linux_Tools_Project/Eclipse_Build/Tests #"/>
+ <echo message="# #"/>
+ <echo message="###################################################################"/>
+ <echo message=""/>
+ <tstamp>
+ <format property="timestamp" pattern="yyyyMMddhhmmss"/>
+ </tstamp>
+ <chmod perm="ugo+rx" file="${buildDirectory}/testsInstallation/runtests.sh" />
+ <exec executable="${buildDirectory}/testsInstallation/runtests.sh" dir="${buildDirectory}/testsInstallation">
+ <arg line="-t ${timestamp}"/>
+ </exec>
+ <copy failonerror="false" todir="${basedir}/testResults-${timestamp}">
+ <fileset dir="${buildDirectory}/testsInstallation/results-${timestamp}">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
+
<target name="run.director">
<property name="baseBuilderConfig" value="${baseBuilder}/p2"/>
<echo message="Moving ${baseBuilderConfig} to ${baseBuilderConfig}.bak"/>
@@ -467,6 +574,7 @@
<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
<arg line="-Declipse.p2.MD5Check=false" />
<arg line="-Declipse.p2.profile=@none" />
+ <arg line="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=" />
<arg line="-propertyfile ${basedir}/build.properties " />
<!--
<jvmarg value="-Xms512M" />
@@ -479,14 +587,40 @@
<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" />
+ <target name="run.installed.director">
+ <chmod perm="ugo+rx" file="${directorToRun}" />
+ <exec executable="${directorToRun}">
+ <arg line="-nosplash " />
+ <arg line="-application org.eclipse.equinox.p2.director " />
+ <arg line="-data ${buildworkspace} " />
+ <arg line="-consoleLog" />
+ <arg line="-flavor ${p2.flavor}" />
+ <arg line="-installIU ${p2.director.installIU}" />
+ <arg line="-p2.os ${p2.os}" />
+ <arg line="-p2.ws ${p2.ws}" />
+ <arg line="-p2.arch ${p2.arch}" />
+ <arg line="-roaming" />
+ <arg line="-profile ${p2.director.profile}" />
+ <arg line="${p2.director.extraArgs}" />
+ <arg line="-metadatarepository file:${p2.repo}" />
+ <arg line="-artifactrepository file:${p2.repo}" />
+ <arg line="-destination ${p2.director.install.path}" />
+ <arg line="-bundlepool ${p2.director.install.path}" />
+ <arg line="-vmargs" />
+ <arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
+ <arg line="-Declipse.p2.MD5Check=false" />
+ <arg line="-Declipse.p2.profile=@none" />
+ <arg line="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=" />
+ <arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2"/>
+ <arg line="-propertyfile ${basedir}/build.properties " />
</exec>
+ </target>
+
+ <target name="install" depends="provision.sdk">
+ <mkdir dir="${destDir}${prefix}/${libDir}/eclipse"/>
+ <copy todir="${destDir}${prefix}/${libDir}/eclipse" overwrite="true" >
+ <fileset dir="${buildDirectory}/installation"/>
+ </copy>
<!-- install desktop file -->
<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
<!-- install icons -->
@@ -496,6 +630,7 @@
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" />
+ <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
</target>
</project>
diff --git a/buildEclipseBuildSource.sh b/buildEclipseBuildSource.sh
index f381faa..0794d20 100755
--- a/buildEclipseBuildSource.sh
+++ b/buildEclipseBuildSource.sh
@@ -2,9 +2,9 @@
baseDir=$(pwd)
workDirectory=
-eclipsebuildTag="R0_3_0"
+eclipsebuildTag="R0_3_1"
-usage="usage: <eclipse-build tag (ex. R0_0_2)> [-workdir <working directory>] [-eclipseBuildTag <eclipse-build tag to check out>]"
+usage="usage: <eclipse-build tag (ex. R0_3_1)> [-workdir <working directory>] [-eclipseBuildTag <eclipse-build tag to check out>]"
while [ $# -gt 0 ]
do
diff --git a/eclipse-build-config/ChangeLog b/eclipse-build-config/ChangeLog
index 3826aec..793b677 100644
--- a/eclipse-build-config/ChangeLog
+++ b/eclipse-build-config/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-22 Andrew Overholt <overholt at redhat.com>
+
+ * productFiles/sdk/sdk.product: Remote dropins from default eclipse.ini as
+ it causes the tests to pick up system-installed stuff. We'll add it to
+ eclipse.ini later.
+
+2009-09-14 Andrew Overholt <overholt at redhat.com>
+
+ * productFiles/sdk/sdk.product: Add /usr/share/eclipse/dropins to list of
+ dropins locations.
+
2009-08-06 Alexander Kurtakov <akurtako at redhat.com>
* customTargets.xml: Add ppc64 rootfiles.
@@ -45,7 +56,7 @@
* productFiles/platform/p2.inf: Initial checkin.
* productFiles/platform/platform.product: Likewise.
* productFiles/platform.sdk/p2.inf: Likewise.
- * productFiles/platform.sdk/platform.product:Likewise.
+ * productFiles/platform.sdk/platform.product:Likewise.
* productFiles/rcp/rcp.product: Likewise.
* productFiles/rcp.sdk/rcp.product: Likewise.
* productFiles/sdk/p2.inf: Likewise.
diff --git a/eclipse-build-config/productFiles/sdk/sdk.product b/eclipse-build-config/productFiles/sdk/sdk.product
index 45dd9b9..cb95c66 100644
--- a/eclipse-build-config/productFiles/sdk/sdk.product
+++ b/eclipse-build-config/productFiles/sdk/sdk.product
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="3.5.0. at qualifier@" useFeatures="true">
+<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="3.5.0. at qualifier@" useFeatures="true" includeLaunchers="true">
- <configIni use="default">
+ <configIni use="default">
</configIni>
-
<launcherArgs>
<programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
<vmArgs>-Xms40m -Xmx256m</vmArgs>
diff --git a/eclipse-tests-vncpwd b/eclipse-tests-vncpwd
new file mode 100644
index 0000000..52be8b6
--- /dev/null
+++ b/eclipse-tests-vncpwd
@@ -0,0 +1 @@
+·Ìè®w¹d»
\ No newline at end of file
diff --git a/eclipse.desktop b/eclipse.desktop
index b4ee160..e28e1e9 100644
--- a/eclipse.desktop
+++ b/eclipse.desktop
@@ -1,8 +1,9 @@
[Desktop Entry]
+Encoding=UTF-8
Type=Application
Name=Eclipse
-Comment=Develop applications in a variety of different programming languages
+Comment=Eclipse Integrated Development Environment
Icon=eclipse
Exec=eclipse
Terminal=false
-Categories=Development;IDE;Java;
\ No newline at end of file
+Categories=Development;IDE;Java;
diff --git a/junitHelper.xml b/junitHelper.xml
new file mode 100644
index 0000000..9a2c6e7
--- /dev/null
+++ b/junitHelper.xml
@@ -0,0 +1,23 @@
+<project name="Generate SDK Test Results HTML" default="genResults">
+
+ <condition property="resultsDefined">
+ <isset property="results"/>
+ </condition>
+
+ <condition property="eclipseHomeSet">
+ <isset property="eclipse-home"/>
+ </condition>
+
+ <property name="htmlDir" value="${results}/html"/>
+ <property name="xmlDir" value="${results}/xml"/>
+
+ <target name="genResults">
+ <fail message="results directory not set"
+ unless="resultsDefined"/>
+ <fail message="Eclipse installation directory not set"
+ unless="eclipseHomeSet"/>
+ <echo message="Generating results in ${htmlDir}"/>
+ <xslt style="${eclipse-home}/plugins/org.eclipse.test_3.2.0/JUNIT.XSL" basedir="${xmlDir}" destdir="${htmlDir}" />
+ </target>
+
+</project>
\ No newline at end of file
diff --git a/patches/eclipse-help-toolbar.patch b/patches/eclipse-help-toolbar.patch
new file mode 100644
index 0000000..9cd3604
--- /dev/null
+++ b/patches/eclipse-help-toolbar.patch
@@ -0,0 +1,71 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.help.webapp
+Index: advanced/tocToolbar.jsp
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/tocToolbar.jsp,v
+retrieving revision 1.14
+diff -u -r1.14 tocToolbar.jsp
+--- plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 22 Jan 2009 22:19:55 -0000 1.14
++++ plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 21 Sep 2009 20:55:27 -0000
+@@ -16,6 +16,9 @@
+ String printError = UrlUtil.JavaScriptEncode(ServletResources.getString("PrintError", request));
+ String menuData = printTopicLabel + "=printTopic(\\'" + printError + "\\')," + printTocLabel + "=printToc(\\'" + printError + "\\')";
+ String quickSearchError = UrlUtil.JavaScriptEncode(ServletResources.getString("QuickSearchError", request));
++ // See Bug 290064 for an explanation of why these constants are used
++ final String ON = "on";
++ final String OFF = "off";
+ %>
+
+ <jsp:include page="toolbar.jsp">
+@@ -62,6 +65,6 @@
+ <jsp:param name="image" value="auto_synch_toc.gif"/>
+ <jsp:param name="action" value="toggleAutosynch"/>
+ <jsp:param name="param" value=""/>
+- <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? "on" : "off")%>"/>
++ <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? ON : OFF)%>"/>
+
+ </jsp:include>
+\ No newline at end of file
+Index: advanced/searchToolbar.jsp
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchToolbar.jsp,v
+retrieving revision 1.12
+diff -u -r1.12 searchToolbar.jsp
+--- plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 29 Aug 2007 22:45:40 -0000 1.12
++++ plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 21 Sep 2009 20:55:27 -0000
+@@ -1,5 +1,5 @@
+ <%--
+- Copyright (c) 2000, 2007 IBM Corporation and others.
++ Copyright (c) 2000, 2009 IBM Corporation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+@@ -9,6 +9,11 @@
+ IBM Corporation - initial API and implementation
+ --%>
+ <%@ include file="header.jsp"%>
++<%
++ // See Bug 290064 for an explanation of why these constants are used
++ final String ON = "on";
++ final String OFF = "off";
++%>
+
+
+ <jsp:include page="toolbar.jsp">
+@@ -27,13 +32,13 @@
+ <jsp:param name="image" value="show_categories.gif"/>
+ <jsp:param name="action" value="toggleShowCategories"/>
+ <jsp:param name="param" value=""/>
+- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? "on" : "off")%>"/>
++ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? ON : OFF)%>"/>
+
+ <jsp:param name="name" value="show_descriptions"/>
+ <jsp:param name="tooltip" value='show_descriptions'/>
+ <jsp:param name="image" value="show_descriptions.gif"/>
+ <jsp:param name="action" value="toggleShowDescriptions"/>
+ <jsp:param name="param" value=""/>
+- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? "on" : "off")%>"/>
++ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? ON : OFF)%>"/>
+
+ </jsp:include>
+\ No newline at end of file
diff --git a/patches/eclipse-jdt_launch-customBuild.patch b/patches/eclipse-jdt_launch-customBuild.patch
new file mode 100644
index 0000000..03eef30
--- /dev/null
+++ b/patches/eclipse-jdt_launch-customBuild.patch
@@ -0,0 +1,68 @@
+--- plugins/org.eclipse.jdt.launching/scripts/customBuild.xml.orig 2009-03-09 15:06:45.000000000 +0100
++++ plugins/org.eclipse.jdt.launching/scripts/customBuild.xml 2009-03-09 16:57:53.000000000 +0100
+@@ -14,5 +14,64 @@
+ <property name="bundleJavacTarget" value="${tempTarget}"/>
+ </target>
+
++ <target name="noDefault">
++ <echo message="This file must be called with explicit targets" />
++ </target>
++
++ <target name="pre.build.jars">
++ </target>
++
++ <target name="post.build.jars">
++ </target>
++
++ <target name="pre.build.sources">
++ </target>
++
++ <target name="post.build.sources">
++ </target>
++
++ <target name="pre.name">
++ </target>
++
++ <target name="pre. at dot">
++ </target>
++
++ <target name="post.compile.name">
++ </target>
++ <target name="post.compile.lib/launchingsupport.jar">
++ </target>
++
++ <target name="post.compile. at dot">
++ </target>
++
++ <target name="post.name">
++ </target>
++
++ <target name="post. at dot">
++ </target>
++
++ <target name="pre.gather.bin.parts">
++ </target>
++
++ <target name="post.gather.bin.parts">
++ </target>
++
++ <target name="pre.gather.sources">
++ </target>
++
++ <target name="post.gather.sources">
++ </target>
++
++ <target name="pre.gather.logs">
++ </target>
++
++ <target name="post.gather.logs">
++ </target>
++
++ <target name="pre.clean">
++ </target>
++
++ <target name="post.clean">
++ </target>
+
+ </project>
+\ No newline at end of file
diff --git a/patches/tests-nostyletask.patch b/patches/tests-nostyletask.patch
new file mode 100644
index 0000000..7200a4c
--- /dev/null
+++ b/patches/tests-nostyletask.patch
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.test/library.xml.sav 2009-09-25 11:47:54.867564002 +0300
++++ plugins/org.eclipse.test/library.xml 2009-09-25 11:48:25.279814120 +0300
+@@ -138,7 +138,7 @@
+ </fileset>
+ </junitreport>
+
+- <style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
++ <xslt style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
+ basedir="${junit-report-output}"
+ includes="${classname}.result.xml"
+ destdir="${junit-report-output}" />
diff --git a/runtests.sh b/runtests.sh
new file mode 100644
index 0000000..b325487
--- /dev/null
+++ b/runtests.sh
@@ -0,0 +1,278 @@
+#!/bin/bash
+
+#### Please post any and all results and analysis here:
+#### http://wiki.eclipse.org/Linux_Tools_Project/Eclipse_Build/Tests
+
+function usage() {
+cat << _EOF_
+usage: $0 [<options>]
+
+Run Eclipse SDK tests
+
+Optional arguments:
+ -h Show this help message
+ -e Eclipse SDK location
+ -g Don't run the tests headless
+ -d Allow remote connection to test runs' JVM
+ -t Timestamp string with which to tag the results
+_EOF_
+}
+
+function init() {
+ # Test suites to run
+ testPluginsToRun="\
+ org.eclipse.ant.tests.core \
+ org.eclipse.ant.tests.ui \
+ org.eclipse.compare.tests \
+ org.eclipse.core.expressions.tests \
+ org.eclipse.core.filebuffers.tests \
+ org.eclipse.core.tests.net \
+ org.eclipse.core.tests.resources \
+ org.eclipse.core.tests.runtime \
+ org.eclipse.equinox.security.tests \
+ org.eclipse.jdt.core.tests.builder \
+ org.eclipse.jdt.core.tests.compiler \
+ org.eclipse.jdt.core.tests.model \
+ org.eclipse.jdt.core.tests.performance \
+ org.eclipse.jdt.debug.tests \
+ org.eclipse.jdt.text.tests \
+ org.eclipse.jdt.ui.tests \
+ org.eclipse.jdt.ui.tests.refactoring \
+ org.eclipse.jface.tests.databinding \
+ org.eclipse.jface.text.tests \
+ org.eclipse.ltk.core.refactoring.tests \
+ org.eclipse.ltk.ui.refactoring.tests \
+ org.eclipse.osgi.tests \
+ org.eclipse.pde.api.tools.tests \
+ org.eclipse.pde.build.tests \
+ org.eclipse.pde.ds.tests \
+ org.eclipse.pde.ui.tests \
+ org.eclipse.search.tests \
+ org.eclipse.swt.tests \
+ org.eclipse.team.tests.core \
+ org.eclipse.text.tests \
+ org.eclipse.ua.tests \
+ org.eclipse.ui.editors.tests \
+ org.eclipse.ui.tests \
+ org.eclipse.ui.tests.forms \
+ org.eclipse.ui.tests.navigator \
+ org.eclipse.ui.tests.rcp \
+ org.eclipse.ui.tests.views.properties.tabbed \
+ org.eclipse.ui.workbench.texteditor.tests \
+ "
+
+ # We're not ready to run these yet (setup, etc.)
+ # org.eclipse.equinox.p2.tests \
+ # org.eclipse.equinox.p2.tests.ui \
+ # org.eclipse.update.tests.core \
+ # org.eclipse.ui.tests.performance \
+ # org.eclipse.team.tests.cvs.core \
+ # org.eclipse.releng.tests \
+ # org.eclipse.jdt.compiler.tool.tests \
+
+ # Defaults
+ debugTests=0
+ headless=1
+ eclipseHome=$(pwd)/eclipse
+ cp -rp ${eclipseHome}/configuration{,.knowngood}
+ testFramework=org.eclipse.test_3.2.0
+ libraryXml=${eclipseHome}/plugins/${testFramework}/library.xml
+ if [ -z ${timestamp} ]; then
+ timestamp=$(date "+%Y%m%d%H%M%S")
+ fi
+ results=$(pwd)/results-${timestamp}
+ datadir=$(pwd)/testDataDir
+ homedir=$(pwd)/home
+ testhome=$(pwd)/testhome
+
+ rm -rf $datadir $homedir $testhome
+ mkdir -p $datadir $homedir $testhome $results/{xml,logs,html}
+
+ properties=$(pwd)/sdk-tests.properties
+ rm $properties
+ echo "data-dir=$datadir" >> $properties
+ echo "useEclipseExe=true" >> $properties
+ echo "junit-report-output=$results" >> $properties
+ echo "results=$results" >> $properties
+ echo "tmpresults=$tmpresults" >> $properties
+ echo "testhome=$testhome" >> $properties
+
+ if [ $debugTests -eq 1 ]; then
+ echo "extraVMargs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=40000" >> $properties
+ fi
+}
+
+function processArgs() {
+ # Command-line arguments
+ while getopts “hgdbe:†OPTION
+ do
+ case $OPTION in
+ d)
+ debugTests=1
+ ;;
+ e)
+ eclipseHome=$OPTARG
+ ;;
+ g)
+ headless=0
+ ;;
+ t)
+ timestamp=$OPTARG
+ ;;
+ h)
+ usage
+ exit
+ ;;
+ ?)
+ usage
+ exit
+ ;;
+ esac
+ done
+}
+
+function findXvncAndSetDisplay() {
+ if [ ${headless} == 1 ]; then
+ # Try to find Xvnc
+ xvnc=
+ if [ -a /usr/bin/Xvnc ]
+ then
+ xvnc=/usr/bin/Xvnc
+ setupXvnc
+ else
+ if [ -a /usr/X11/bin/Xvnc ]
+ then
+ xvnc=/usr/X11/bin/Xvnc
+ setupXvnc
+ else
+ echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0"
+ DISPLAY=`$HOST`:0.0
+ fi
+ fi
+ export DISPLAY
+ fi
+}
+
+function setupXvnc() {
+ # Pick a high display number.
+ port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
+ echo localhost > Xvnc.cfg
+ echo "Setting up Xvnc on port ${port} with password VNCpassword1"
+ $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
+ Xvncpid=$!
+ DISPLAY=`$HOST`:$port
+}
+
+function setArch() {
+ if [ "x$buildArch" = "x" ]
+ then
+ if uname -m > /dev/null 2>&1; then
+ arch=`uname -m`
+ else
+ arch=`uname -p`
+ fi
+ # Massage arch for Eclipse-uname differences
+ case $arch in
+ i[0-9]*86)
+ arch=x86 ;;
+ ia64)
+ arch=ia64 ;;
+ ppc)
+ arch=ppc ;;
+ x86_64)
+ arch=x86_64 ;;
+ *)
+ echo "Unrecognized architecture: $arch" 1>&2
+ exit 1 ;;
+ esac
+ echo >&2 "Architecture not specified. Assuming host architecture: $arch"
+ fi
+}
+
+function runTestSuite() {
+ $eclipseHome/eclipse \
+ -application org.eclipse.ant.core.antRunner \
+ -file $testDriver \
+ -Declipse-home=$eclipseHome \
+ -Dos=linux \
+ -Dws=gtk \
+ -Darch=${arch} \
+ -Dlibrary-file=$libraryXml \
+ -propertyfile $properties \
+ -logger org.apache.tools.ant.DefaultLogger \
+ -vmargs \
+ -Duser.home=${homedir}
+ -Dosgi.os=linux \
+ -Dosgi.ws=gtk \
+ -Dosgi.arch=${arch}
+}
+
+function cleanAfterTestSuite() {
+ rm -rf ${datadir} ${homedir} ${testhome} ${eclipseHome}/configuration
+ cp -rp ${eclipseHome}/configuration{.knowngood,}
+ mkdir -p ${datadir} ${homedir} ${testhome}
+}
+
+#function setupForP2Tests() {
+# # Set up for p2 tests
+# platformZip=$(grep platform.archive /usr/lib/eclipse/dropins/eclipse/rpm.properties | sed s/.*=//g)
+# platformZipDir=$(dirname $platformZip)_eclipse
+# if [ ! -f $platformZip ]; then
+# mkdir -p $(dirname $platformZip)
+# mkdir -p $platformZipDir/eclipse
+# sh /usr/lib/eclipse/buildscripts/copy-platform $platformZipDir/eclipse /usr/lib/eclipse
+# pushd $platformZipDir
+# tar hczf $platformZip *
+# popd
+# rm -rf $platformZipDir
+# fi
+#}
+
+function cleanupXvnc() {
+ # Clean up if we used Xvnc
+ if [ -e Xvnc.cfg ]
+ then
+ kill $Xvncpid
+ rm Xvnc.cfg
+ fi
+}
+
+function findAndRunTestPlugins() {
+ for plugin in $(ls ${eclipseHome}/plugins | grep org.eclipse.*tests); do
+ if [ ! $(echo ${plugin} | grep .source_) ]; then
+ pluginName=$(echo ${plugin} | sed "s/_.*//")
+ pluginVersion=$(echo ${plugin} | sed "s/${pluginName}_//")
+ echo ${testPluginsToRun} | grep -q ${pluginName}
+ if [ $? == 0 ]; then
+ echo "Running ${pluginName} (${pluginVersion})"
+ testDriver="${eclipseHome}/plugins/${pluginName}_${pluginVersion}/test.xml"
+ if [ ${pluginName} == "org.eclipse.swt.tests" ]; then
+ echo "plugin-path=${eclipseHome}/plugins/${pluginName}_${pluginVersion}" >> ${properties}
+ fi
+ runTestSuite
+ cleanAfterTestSuite
+ mv ${results}/*.txt ${results}/logs
+ xmlDir=${results}/tmpXml
+ mkdir -p ${xmlDir}
+ mv ${results}/*.xml ${xmlDir}
+ genHtml
+ mv ${xmlDir}/* ${results}/xml
+ rm -rf ${xmlDir}
+ if [ ${pluginName} == "org.eclipse.swt.tests" ]; then
+ sed -i "/plugin-path/d" ${properties}
+ fi
+ fi
+ fi
+ done
+}
+
+function genHtml() {
+ ant -Declipse-home=${eclipseHome} -Dresults=${results} -DxmlDir=${xmlDir} -f junitHelper.xml
+}
+
+init
+processArgs
+findXvncAndSetDisplay
+setArch
+findAndRunTestPlugins
+cleanupXvnc
\ No newline at end of file
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list