[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-160-g1e571bd
Benjamin Drung
bdrung-guest at alioth.debian.org
Tue Aug 3 16:01:29 UTC 2010
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-3.6 has been updated
via 1e571bd03f6a324a729dd066ecf98a0f623be8d4 (commit)
via 05536433516f7cd82ff3dab90e1cb4c0e768e69a (commit)
via 6d163cc19ccb2692c42d1732023d5ed19250cf51 (commit)
via 2a310b5331c28711d08f3f478ebf6d3b8049d48a (commit)
via 13b0ec042a2419e041a87a20672dad994fcf1bb8 (commit)
via 4fa8277a7eefe73e556cd70c61a24eb93622ec0f (commit)
from cc886b71ad448269f4a1f016f756425d6714d260 (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 1e571bd03f6a324a729dd066ecf98a0f623be8d4
Merge: 6d163cc 0553643
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Aug 3 17:24:47 2010 +0200
Merge branch 'upstream-3.6' into master-3.6
commit 6d163cc19ccb2692c42d1732023d5ed19250cf51
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Jul 29 23:22:19 2010 +0200
Refresh patches.
commit 2a310b5331c28711d08f3f478ebf6d3b8049d48a
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Jul 29 23:19:06 2010 +0200
Drop swt-compile-xpt.patch (accepted upstream).
commit 13b0ec042a2419e041a87a20672dad994fcf1bb8
Merge: cc886b7 4fa8277
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Jul 29 23:17:57 2010 +0200
Merge branch 'upstream-3.6' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 66 +++++++++++
build.properties | 1 +
build.xml | 124 ++++++++++---------
debian/patches/compile-IPluginDescriptor.patch | 2 +-
debian/patches/compile-jarinjarloader.patch | 2 +-
debian/patches/eclipse-manpage.patch | 6 +-
...nerate-metadata-and-extract-swt-libraries.patch | 4 +-
debian/patches/remove-unnecessary-files.patch | 6 +-
debian/patches/series | 1 -
debian/patches/strip-destDir.patch | 4 +-
debian/patches/swt-compile-xpt.patch | 48 --------
junitHelper.xml | 8 +-
patches/eclipse-swt-compile-xpt.patch | 31 +++++
patches/tests-nop2discoverytests.patch | 25 ++++
...e.pde.ui.tests-LocalTargetDefinitionTests.patch | 21 ++++
runtests.sh | 43 +++++--
16 files changed, 261 insertions(+), 131 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 49a4875..c8a49f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,75 @@
+2010-08-03 Andrew Overholt <overholt at redhat.com>
+
+ Bug #321284
+
+ * build.xml: Set installation directory after resolving libdir.
+
+2010-07-29 Andrew Overholt <overholt at redhat.com>
+
+ Bug #319479
+
+ * patches/eclipse-swt-compile-xpt.patch: New file. Patch from Benjamin
+ Drung to build .xpt file for SWT.
+ * build.xml: Apply above patch.
+
+2010-07-28 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Use bootstrap JARs to build Equinox Initializer.
+
+2010-07-28 Andrew Overholt <overholt at redhat.com>
+
+ * runtests.sh: Properly canonicalize test build and installation
+ directories.
+
+2010-07-28 Andrew Overholt <overholt at redhat.com>
+
+ * build.properties: Property-ify test framework.
+ * build.xml: Use variables for provision and installation directories.
+ Build Equinox Initializer application in build target and not in
+ provision.sdk target. Pass tests build directory and provisioned SDK
+ directory to runtests.sh.
+ * runtests.sh: Take passed-in tests build directory and provisioned SDK
+ directory. Pass testframework variable to runtests.sh.
+ * junitHelper.xml: Use property of testframework.
+
+2010-07-28 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Fix version of org.eclipse.test (3.2.0 -> 3.3.0).
+ * junitHelper.xml: Likewise.
+ * runtests.sh: Likewise.
+ * sdk-tests.properties: Add to svn:ignore.
+ * tests_*: Add to svn:ignore.
+
+2010-07-23 Andrew Overholt <overholt at redhat.com>
+
+ * dependencies.properties:
+ * junitHelper.xml:
+ * runtests.sh:
+ * patches/tests-nop2discoverytests.patch: New file. Don't build the p2
+ discovery tests since that feature isn't part of the SDK.
+ * patches/org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch: Removed.
+ * patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch:
+ Renamed to clarify that it's a patch for the tests.
+ * build.xml: Correct typo with LocationTargetDefinitionTests patch name.
+
+2010-07-27 Andrew Overholt <overholt at redhat.com>
+
+ Bug #295098
+
+ * patches/org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch: New
+ file. Patch out checking for source bundles not likely to be present in
+ distros.
+ * build.xml: Apply above patch to tests.
+ * symlinks-stamp: Add to svn:ignore.
+ * task-bin: Likewise.
+
2010-07-27 Andrew Overholt <overholt at redhat.com>
Bug #320328
* pdebuild.xml: Use ${label} instead of hard-coding "3.5.0".
* build.xml: Use PDE Build of built SDK to build SDK tests.
+
2010-07-19 Andrew Overholt <overholt at redhat.com>
diff --git a/build.properties b/build.properties
index ec76547..b8dc287 100644
--- a/build.properties
+++ b/build.properties
@@ -4,6 +4,7 @@ buildId=I20100608-0911
buildTag=vI20100603-1500
label=3.6.0
testsBuildLabel=3.6.0
+testframework=org.eclipse.test_3.3.0
p2.director.version=${testsBuildLabel}
testsBuildId=v20100211
featureToBuild=eclipse-build-feature
diff --git a/build.xml b/build.xml
index 72c775c..2118530 100644
--- a/build.xml
+++ b/build.xml
@@ -56,6 +56,7 @@
<property name="buildConfig" value="${buildConfigs}/eclipse-build-config" />
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
+ <property name="provisionDir" value="${buildDirectory}/installation" />
<!-- Determine host architecture -->
<exec executable="uname" outputproperty="uname-m">
@@ -105,6 +106,7 @@
<target name="setLibDir" depends="setLib64Dir">
<property name="libDir" value="lib" />
+ <property name="installationDir" value="${destDir}${prefix}/${libDir}/eclipse" />
</target>
<target name="getInstallationDir" depends="setLibDir">
@@ -290,6 +292,7 @@
<patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<!-- end eclipse-build-only patches -->
@@ -304,8 +307,9 @@
<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" />
<patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" />
+ <patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
<echo file="testspatch-stamp" />
</target>
@@ -369,6 +373,19 @@
<arg line="-consolelog " />
<jvmarg value="-Xmx512M" />
</java>
+ <!-- build equinox initializer -->
+ <mkdir dir="${buildDirectory}/home" />
+ <java classname="org.eclipse.core.launcher.Main" dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer" fork="true">
+ <classpath>
+ <pathelement path="bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
+ </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" />
+ <jvmarg value="-Xmx512M" />
+ </java>
<!--
<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
<property name="arch" value="${buildArch}"/>
@@ -395,10 +412,9 @@
-->
<target name="buildTests" depends="provision.sdk,applyTestPatches" unless="testsbuild.complete">
- <property name="eclipse.pdebuild.scripts" value="${basedir}/bootstrap/plugins/org.eclipse.pde.build/scripts" />
-
+
<path id="pdebuilddir.id">
- <dirset dir="${buildDirectory}/installation/plugins">
+ <dirset dir="${provisionDir}/plugins">
<include name="org.eclipse.pde.build_*"/>
</dirset>
</path>
@@ -406,7 +422,7 @@
<property name="pdebuilddir" refid="pdebuilddir.id"/>
<!-- Test framework -->
- <exec executable="${buildDirectory}/installation/eclipse">
+ <exec executable="${provisionDir}/eclipse">
<arg line="-nosplash " />
<arg line="-consolelog " />
<arg line="-application org.eclipse.ant.core.antRunner " />
@@ -414,12 +430,12 @@
<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="-DbaseLocation=${provisionDir} " />
<arg line="-DbuildLabel=${testsBuildLabel} " />
<arg line="-data ${buildworkspace} " />
</exec>
<!-- SDK tests -->
- <exec executable="${buildDirectory}/installation/eclipse">
+ <exec executable="${provisionDir}/eclipse">
<arg line="-nosplash " />
<arg line="-consolelog " />
<arg line="-application org.eclipse.ant.core.antRunner " />
@@ -427,7 +443,7 @@
<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="-DbaseLocation=${provisionDir} " />
<arg line="-DbuildLabel=${testsBuildLabel} " />
<arg line="-data ${buildworkspace} " />
</exec>
@@ -612,34 +628,20 @@
</target>
<target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
- <echo message="Installing into: ${buildDirectory}/installation" />
+ <echo message="Installing into: ${provisionDir}" />
<antcall target="run.director">
<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
<param name="p2.director.version" value="${p2.director.version}" />
<param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${buildDirectory}/installation" />
+ <param name="p2.director.install.path" value="${provisionDir}" />
<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="${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" />
- <jvmarg value="-Xmx512M" />
- </java>
- <copy todir="${buildDirectory}/installation/plugins">
+
+ <copy todir="${provisionDir}/plugins">
<fileset dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
<include name="org.eclipse.equinox.initializer*.jar" />
</fileset>
@@ -647,21 +649,21 @@
<!-- Re-symlink system JARs -->
<symlinkInstalledOSGiJars dependencies="${basedir}/dependencies.properties"
- topLevelDir="${buildDirectory}/installation/plugins"/>
+ topLevelDir="${provisionDir}/plugins"/>
<symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
- topLevelDir="${buildDirectory}/installation/plugins"/>
+ topLevelDir="${provisionDir}/plugins"/>
- <fileset id="junit4.jar" dir="${buildDirectory}/installation/plugins">
+ <fileset id="junit4.jar" dir="${provisionDir}/plugins">
<include name="**/org.junit4_**/junit.jar"/>
- </fileset>
- <property name="junit4jar.path" refid="junit4.jar"/>
-
- <delete file="${buildDirectory}/installation/plugins/${junit4jar.path}" />
-
+ </fileset>
+ <property name="junit4jar.path" refid="junit4.jar"/>
+
+ <delete file="${provisionDir}/plugins/${junit4jar.path}" />
<!-- FIXME: Watch out for other distros with different
- locations of junit4's system JAR. -->
- <symlink link="${buildDirectory}/installation/plugins/${junit4jar.path}"
- resource="/usr/share/java/junit4.jar" />
+ locations of junit4's system JAR. -->
+ <symlink link="${provisionDir}/plugins/${junit4jar.path}"
+ resource="/usr/share/java/junit4.jar" />
+
<echo file="provision.sdk-stamp" />
</target>
@@ -679,6 +681,8 @@
<chmod perm="ugo+rx" file="${basedir}/runtests.sh" />
<exec executable="${basedir}/runtests.sh" dir="${basedir}">
<arg value="-t${timestamp}" />
+ <arg value="-b ${testsBuildDirectory}" />
+ <arg value="-p ${provisionDir}" />
</exec>
<property name="testResultDir" value="${basedir}/tests_${timestamp}/results" />
<!-- Copy over the XML to generate a top-level report for all of the tests -->
@@ -702,7 +706,7 @@
<fileset dir="${testResultDir}/origXml" includes="*.xml" />
</junitreport>
<!-- Generate top-level HTML report -->
- <xslt style="${basedir}/tests_${timestamp}/installation/plugins/org.eclipse.test_3.2.0/JUNIT.XSL" basedir="${testResultDir}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${testResultDir}/html" />
+ <xslt style="${basedir}/tests_${timestamp}/installation/plugins/${testframework}/JUNIT.XSL" basedir="${testResultDir}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${testResultDir}/html" />
</target>
<target name="run.director">
@@ -775,13 +779,14 @@
</target>
<target name="install" depends="provision.sdk">
- <mkdir dir="${destDir}${prefix}/${libDir}/eclipse" />
+ <mkdir dir="${installationDir}" />
<exec executable="cp" failonerror="true">
<arg value="-rd" />
<arg value="--no-target-directory" />
- <arg value="${buildDirectory}/installation" />
- <arg value="${destDir}${prefix}/${libDir}/eclipse" />
+ <arg value="${provisionDir}" />
+ <arg value="${installationDir}" />
</exec>
+
<!-- install desktop file -->
<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
<!-- install icons -->
@@ -790,28 +795,29 @@
<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
<mkdir dir="${destDir}${prefix}/share/pixmaps" />
<symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" />
- <!--shared dropins folder-->
+ <!--shared dropins folder for architecture-independent plugins-->
<mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
+ <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
<!-- Create the "startup.jar" symlink -->
- <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
+ <fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
<property name="startupjarpath" refid="startupjar" />
- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
+ <symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" />
<!-- Create the "swt.jar" and friends symlinks -->
- <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
+ <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
<property name="swtjarpath" refid="swtjar" />
- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" />
- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk.jar" resource="plugins/${swtjarpath}" />
- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt.jar" resource="plugins/${swtjarpath}" />
+ <symlink link="${installationDir}/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" />
+ <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
+ <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" />
- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+ <echo append="true" file="${installationDir}/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">
+ <fileset dir="${installationDir}/plugins">
<include name="org.eclipse.equinox.launcher_*.jar" />
</fileset>
</classpath>
@@ -820,28 +826,28 @@
<arg value="-debug" />
<arg value="-consolelog" />
<arg value="-metadataRepository" />
- <arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
+ <arg value="file:${installationDir}/metadata/" />
<arg value="-artifactRepository" />
- <arg value="file:${destDir}/${prefix}/${libDir}/eclipse/metadata/" />
+ <arg value="file:${installationDir}/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"/>
+ <jvmarg value="-Dosgi.sharedConfiguration.area=${installationDir}/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 dir="${installationDir}/configuration/org.eclipse.core.runtime" />
+ <delete dir="${installationDir}/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/**" />
+ <fileset dir="${installationDir}/configuration" includes="*.log" />
+ <fileset dir="${installationDir}/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" />
- <symlink link="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" resource="/etc/eclipse.ini" />
+ <move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
+ <symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" />
</target>
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index 9532272..cf9bf4a 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
--- a/build.xml
+++ b/build.xml
-@@ -369,6 +369,32 @@
+@@ -372,6 +372,32 @@
<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
basedir="${basedir}/temp/"/>
<delete dir="${basedir}/temp/"/>
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
index 79fe43a..50db2bc 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -12,7 +12,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319476
<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" />
-@@ -355,7 +356,24 @@
+@@ -358,7 +359,24 @@
<echo file="symlinks-stamp" />
</target>
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index b749563..0dd6d43 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,7 +624,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+</refentry>
--- a/build.xml
+++ b/build.xml
-@@ -786,6 +786,12 @@
+@@ -800,6 +800,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
@@ -634,6 +634,6 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+ <arg value="eclipse.1.xml" />
+ </exec>
+ <move file="eclipse.1" tofile="${destDir}${prefix}/share/man/man1/eclipse.1" />
+ <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
<!-- Create the "startup.jar" symlink -->
- <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
- <property name="startupjarpath" refid="startupjar" />
+ <fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index 1a53d25..a8b106f 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -4,9 +4,9 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -849,6 +849,55 @@
+@@ -864,6 +864,55 @@
- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+ <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+ <!-- Generate metadata -->
+ <delete dir="${destDir}/${prefix}/${libDir}/eclipse/p2" />
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index 33c4fde..2291bc3 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -3,8 +3,8 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -928,6 +928,10 @@
- <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/configuration" includes="**/data/**" />
+@@ -943,6 +943,10 @@
+ <fileset dir="${installationDir}/configuration" includes="**/data/**" />
</delete>
+ <!-- Remove unnecessary metadata -->
@@ -13,4 +13,4 @@ From: Benjamin Drung <bdrung at ubuntu.com>
+ <delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
<!-- Move config file to /etc -->
<mkdir dir="${destDir}/etc" />
- <move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
+ <move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
diff --git a/debian/patches/series b/debian/patches/series
index 18c9125..3bbbd51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-swt-compile-xpt.patch
eclipse-manpage.patch
compile-jarinjarloader.patch
compile-IPluginDescriptor.patch
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index ee5b85b..f34f090 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
--- a/build.xml
+++ b/build.xml
-@@ -932,6 +932,21 @@
+@@ -947,6 +947,21 @@
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
@@ -25,4 +25,4 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
+ </apply>
<!-- Move config file to /etc -->
<mkdir dir="${destDir}/etc" />
- <move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
+ <move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
diff --git a/debian/patches/swt-compile-xpt.patch b/debian/patches/swt-compile-xpt.patch
deleted file mode 100644
index e14747e..0000000
--- a/debian/patches/swt-compile-xpt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Build .xpt file if it does not exit
-From: Benjamin Drung <bdrung at ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319479
-
---- a/build.xml
-+++ b/build.xml
-@@ -290,6 +290,7 @@
- <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
-+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
- <replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
- <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
- <!-- end eclipse-build-only patches -->
---- /dev/null
-+++ b/patches/eclipse-swt-compile-xpt.patch
-@@ -0,0 +1,31 @@
-+Description: Build .xpt file if it does not exit
-+Author: Benjamin Drung
-+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305569
-+
-+--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
-++++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
-+@@ -24,6 +24,24 @@ if [ "${CC}" = "" ]; then
-+ export CC
-+ fi
-+
-++COMPONENTS_DIR=$(pwd)/../../org.eclipse.swt/components
-++# Check if we have to compile external.xpt from external.idl
-++if test ! -f ${COMPONENTS_DIR}/external.xpt; then
-++ if test ! -f ${COMPONENTS_DIR}/external.idl; then
-++ echo "Can't find ${COMPONENTS_DIR}/external.idl"
-++ exit 1
-++ fi
-++
-++ IDLDIR=$(pkg-config --variable=idldir libxul | sed 's@/stable$@@')/unstable
-++ if test ! -d ${IDLDIR}; then
-++ IDLDIR=$(pkg-config --variable=idldir libxul)
-++ fi
-++ XPIDL=$(pkg-config --variable=sdkdir libxul)/bin/xpidl
-++
-++ echo "${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl"
-++ ${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl
-++fi
-++
-+ # Determine which OS we are on
-+ if [ "${OS}" = "" ]; then
-+ OS=`uname -s`
diff --git a/junitHelper.xml b/junitHelper.xml
index cd3b92f..28c4815 100644
--- a/junitHelper.xml
+++ b/junitHelper.xml
@@ -7,6 +7,10 @@
<condition property="eclipseHomeSet">
<isset property="eclipse-home"/>
</condition>
+
+ <condition property="testframeworkSet">
+ <isset property="testframework"/>
+ </condition>
<property name="htmlDir" value="${results}/html"/>
<property name="xmlDir" value="${results}/xml"/>
@@ -16,8 +20,10 @@
unless="resultsDefined"/>
<fail message="Eclipse installation directory not set"
unless="eclipseHomeSet"/>
+ <fail message="Test framework directory not set"
+ unless="testframeworkSet"/>
<echo message="Generating results in ${htmlDir}"/>
- <xslt style="${eclipse-home}/plugins/org.eclipse.test_3.2.0/JUNIT.XSL" basedir="${xmlDir}" destdir="${htmlDir}" />
+ <xslt style="${eclipse-home}/plugins/${testframework}/JUNIT.XSL" basedir="${xmlDir}" destdir="${htmlDir}" />
</target>
</project>
diff --git a/patches/eclipse-swt-compile-xpt.patch b/patches/eclipse-swt-compile-xpt.patch
new file mode 100644
index 0000000..3e0d348
--- /dev/null
+++ b/patches/eclipse-swt-compile-xpt.patch
@@ -0,0 +1,31 @@
+Description: Build .xpt file if it does not exit
+Author: Benjamin Drung
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305569
+
+--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
++++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+@@ -24,6 +24,24 @@ if [ "${CC}" = "" ]; then
+ export CC
+ fi
+
++COMPONENTS_DIR=$(pwd)/../../org.eclipse.swt/components
++# Check if we have to compile external.xpt from external.idl
++if test ! -f ${COMPONENTS_DIR}/external.xpt; then
++ if test ! -f ${COMPONENTS_DIR}/external.idl; then
++ echo "Can't find ${COMPONENTS_DIR}/external.idl"
++ exit 1
++ fi
++
++ IDLDIR=$(pkg-config --variable=idldir libxul | sed 's@/stable$@@')/unstable
++ if test ! -d ${IDLDIR}; then
++ IDLDIR=$(pkg-config --variable=idldir libxul)
++ fi
++ XPIDL=$(pkg-config --variable=sdkdir libxul)/bin/xpidl
++
++ echo "${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl"
++ ${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl
++fi
++
+ # Determine which OS we are on
+ if [ "${OS}" = "" ]; then
+ OS=`uname -s`
diff --git a/patches/tests-nop2discoverytests.patch b/patches/tests-nop2discoverytests.patch
new file mode 100644
index 0000000..4df2658
--- /dev/null
+++ b/patches/tests-nop2discoverytests.patch
@@ -0,0 +1,25 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.sdk.tests-feature
+Index: feature.xml
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests/feature.xml,v
+retrieving revision 1.67
+diff -u -r1.67 feature.xml
+--- feature.xml 22 Apr 2010 21:18:14 -0000 1.67
++++ feature.xml 28 Jul 2010 13:22:07 -0000
+@@ -375,12 +375,14 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+-
++
++<!--
+ <plugin
+ id="org.eclipse.equinox.p2.tests.discovery"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
++-->
+
+ <plugin
+ id="org.eclipse.equinox.p2.tests.ui"
diff --git a/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch b/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch
new file mode 100644
index 0000000..2abe319
--- /dev/null
+++ b/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch
@@ -0,0 +1,21 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.pde.ui.tests
+Index: src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java
+===================================================================
+RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java,v
+retrieving revision 1.24
+diff -u -r1.24 LocalTargetDefinitionTests.java
+--- src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java 12 May 2010 21:14:39 -0000 1.24
++++ src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java 28 Jul 2010 14:13:04 -0000
+@@ -679,8 +679,9 @@
+ expected.add("org.eclipse.jdt.source");
+ expected.add("org.eclipse.jdt.launching.source");
+ // There are two versions of junit available, each with source
+- expected.add("org.junit.source");
+- expected.add("org.junit.source");
++ // Most distros don't have .source bundles for 3rd party components
++ //expected.add("org.junit.source");
++ //expected.add("org.junit.source");
+ if (Platform.getOS().equals(Platform.OS_MACOSX)) {
+ expected.add("org.eclipse.jdt.launching.macosx.source");
+ }
diff --git a/runtests.sh b/runtests.sh
index 0bdcc9e..b124d05 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -13,6 +13,8 @@ Optional arguments:
-h Show this help message
-g Don't run the tests headless
-d Allow remote connection to test runs' JVM
+ -b Tests build directory
+ -p Clean installation directory to copy for running test suites
-t Timestamp string with which to tag the results
_EOF_
}
@@ -72,16 +74,19 @@ function init() {
# Defaults
debugTests=0
headless=1
- testFramework=org.eclipse.test_3.2.0
- if [ -z ${timestamp} ]; then
- timestamp=$(date "+%Y%m%d%H%M%S")
- fi
+
label=$(grep label build.properties | sed s/label=//)
- testsRepo=$(pwd)/testsBuild/eclipse-sdktests-${label}-src/buildRepo/
+ testframework=$(grep ^testframework build.properties | sed s/testframework=//)
+
+ # Make directories absolute
+ testsBuildDirectory=$(readlink -f ${testsBuildDirectory})
+ provisionDir=$(readlink -f ${provisionDir})
+
+ testsRepo=${testsBuildDirectory}/buildRepo/
testsParent=$(pwd)/tests_${timestamp}
- mkdir -p ${testsParent}
- cp -rp $(pwd)/build/eclipse-${label}-src/installation ${testsParent}/testsinstallation.clean
+ mkdir -p ${testsParent}
+ cp -rp ${provisionDir} ${testsParent}/testsinstallation.clean
cleanInstall=${testsParent}/testsinstallation.clean
workspace=${testsParent}/workspace
@@ -184,7 +189,7 @@ function setArch() {
}
function runTestSuite() {
- libraryXml=${eclipseHome}/plugins/${testFramework}/library.xml
+ libraryXml=${eclipseHome}/plugins/${testframework}/library.xml
${eclipseHome}/eclipse \
-application org.eclipse.ant.core.antRunner \
@@ -308,11 +313,11 @@ function runTestPlugin() {
}
function genHtml() {
- ant -Declipse-home=${eclipseHome} -Dresults=${results} -DxmlDir=${xmlDir} -f junitHelper.xml
+ ant -Declipse-home=${eclipseHome} -Dresults=${results} -DxmlDir=${xmlDir} -Dtestframework=${testframework} -f junitHelper.xml
}
# Command-line arguments
-while getopts "de:gt:h" OPTION
+while getopts "de:gb:p:t:h" OPTION
do
case $OPTION in
d)
@@ -324,6 +329,12 @@ do
t)
timestamp=$OPTARG
;;
+ b)
+ testsBuildDirectory=$OPTARG
+ ;;
+ p)
+ provisionDir=$OPTARG
+ ;;
h)
usage
exit 1
@@ -331,6 +342,18 @@ do
esac
done
+if [ -z ${timestamp} ]; then
+ timestamp=$(date "+%Y%m%d%H%M%S")
+fi
+if [ -z ${testsBuildDirectory} ]; then
+ echo "Tests build directory must be specified (-b)";
+ exit 1;
+fi
+if [ -z ${provisionDir} ]; then
+ echo "Directory containing clean provisioned SDK must be specified (-p)";
+ exit 1;
+fi
+
init
findXvncAndSetDisplay
setArch
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list