[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-166-g952b828
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Aug 11 23:31:30 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 952b828402c054f67f9c5b942e85be07599e8fa8 (commit)
via 256614afaef8835cf9741cae6317a10b80cfa410 (commit)
via 1676b59c23e8593a3f17a5da19af2d73bb29d53a (commit)
from cea61d6b0ce2e600e1d04017b8ba9dadc188809e (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 952b828402c054f67f9c5b942e85be07599e8fa8
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Aug 12 01:07:16 2010 +0200
Refresh patches.
commit 256614afaef8835cf9741cae6317a10b80cfa410
Merge: cea61d6 1676b59
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Aug 12 00:29:49 2010 +0200
Merge branch 'upstream-3.6' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 35 +++
build.xml | 226 ++++++++++++-------
debian/patches/eclipse-manpage.patch | 2 +-
...nerate-metadata-and-extract-swt-libraries.patch | 2 +-
debian/patches/remove-unnecessary-files.patch | 2 +-
debian/patches/strip-destDir.patch | 2 +-
debian/patches/symlink-system-files.patch | 8 +-
dependencies.properties | 2 -
nonosgidependencies.properties | 3 -
publishProduct.xml | 3 +-
sdkdependencies.properties | 2 +
sdknonosgidependencies.properties | 3 +
12 files changed, 192 insertions(+), 98 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3aaddb6..a7840f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2010-08-11 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Make symlink to eclipse.ini absolute again to
+ please our Debian friends.
+
+2010-08-11 Andrew Overholt <overholt at redhat.com>
+
+ Bug #293731
+
+ * build.xml: Add ability to provision just the platform or just the
+ platform and the CVS feature (default is still entire SDK). Parametrize
+ JUnit4 JAR location. Replace @qualifier@ also in platform.product since
+ we're using it now. No longer copy content.{xml,jar} over for debugging
+ during publishing. Extract publishing of SDK into a common target that
+ can be used by other publishing tasks. Extract provisioning of SDK into
+ common target. Add installPlatform/installPlatformAndCVS targets for
+ installing just the platform/platform+CVS.
+ * publishProduct.xml: Parametrize the product file to use.
+ * sdknonosgidependencies.properties: New file. Non-OSGi dependencies
+ present in the SDK but not the platform.
+ * sdkdependencies.properties: New file. OSGi dependencies present in the
+ SDK but not the platform.
+ * nonosgidependencies.properties: Strip SDK-only dependencies.
+ * dependencies.properties: Likewise.
+
+2010-08-11 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Make symlink to eclipse.ini relative.
+ * Xvnc.cfg: Add to svn:ignore.
+
+2010-08-09 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Apply ant core and UI test patch to not be so strict with
+ ant -version output.
+
2010-08-06 Andrew Overholt <overholt at redhat.com>
Bug #286825
diff --git a/build.xml b/build.xml
index ce157a0..74ade9e 100644
--- a/build.xml
+++ b/build.xml
@@ -1,8 +1,8 @@
<project name="Eclipse SDK build" default="provision.sdk" basedir=".">
<tstamp>
- <format property="timestamp" pattern="yyyyMMddHHmmss"/>
+ <format property="timestamp" pattern="yyyyMMddHHmmss" />
</tstamp>
- <record name="build_${timestamp}.log"/>
+ <record name="build_${timestamp}.log" />
<echo message="Build log is available in build_${timestamp}.log" />
<property name="baseBuilder" value="${basedir}/bootstrap" />
<property name="launcher" value="${basedir}/bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
@@ -41,6 +41,8 @@
<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.platform.complete" srcfile="build-stamp" targetfile="provision.platform-stamp" />
+ <uptodate property="provision.cvs.complete" srcfile="build-stamp" targetfile="provision.cvs-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" />
@@ -58,21 +60,25 @@
<property name="reposource" value="${buildDirectory}/reposource" />
<property name="provisionDir" value="${buildDirectory}/installation" />
+ <!-- Distros with alternative JUnit 4 JAR locations should pass this
+ parameter in to ant -->
+ <property name="junit4JarLocation" value="/usr/share/java/junit4.jar" />
+
<!-- Determine host architecture -->
<exec executable="uname" outputproperty="uname-m">
<arg line="-m" />
</exec>
<condition property="hostArch" value="arm">
- <matches pattern="^arm.*" string="${uname-m}"/>
+ <matches pattern="^arm.*" string="${uname-m}" />
</condition>
<condition property="hostArch" value="x86">
- <matches pattern="i[0-9]*86" string="${uname-m}"/>
+ <matches pattern="i[0-9]*86" string="${uname-m}" />
</condition>
<condition property="hostArch" value="PA_RISC">
- <matches pattern="^parisc.*" string="${uname-m}"/>
+ <matches pattern="^parisc.*" string="${uname-m}" />
</condition>
<condition property="hostArch" value="sparc">
- <matches pattern="sparcv9" string="${uname-m}"/>
+ <matches pattern="sparcv9" string="${uname-m}" />
</condition>
<condition property="hostArch" value="${uname-m}">
<not>
@@ -84,7 +90,7 @@
<isset property="buildArch" />
</not>
</condition>
- <echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
+ <echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}." />
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
@@ -296,11 +302,11 @@
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
- <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/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
+ <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" />
+ <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 -->
@@ -318,48 +324,42 @@
<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" />
+ <patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.core.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.core" strip="0" />
+ <patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.ui.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.ui" strip="0" />
<echo file="testspatch-stamp" />
</target>
<target name="buildHelperTask">
- <mkdir dir="task-bin"/>
- <javac compiler="modern" target="1.5" source="1.5" debug="true"
- srcdir="${basedir}/task-src" destdir="${basedir}/task-bin"/>
+ <mkdir dir="task-bin" />
+ <javac compiler="modern" target="1.5" source="1.5" debug="true" srcdir="${basedir}/task-src" destdir="${basedir}/task-bin" />
</target>
<target name="defineTasks" depends="buildHelperTask">
- <taskdef name="symlinkOSGiJars"
- classname="org.eclipse.linuxtools.eclipsebuild.SymlinkOSGiJars"
- classpath="${basedir}/task-bin" />
- <taskdef name="symlinkInstalledOSGiJars"
- classname="org.eclipse.linuxtools.eclipsebuild.SymlinkInstalledOSGiJars"
- classpath="${basedir}/task-bin" />
- <taskdef name="symlinkNonOSGiJars"
- classname="org.eclipse.linuxtools.eclipsebuild.SymlinkNonOSGiJars"
- classpath="${basedir}/task-bin" />
+ <taskdef name="symlinkOSGiJars" classname="org.eclipse.linuxtools.eclipsebuild.SymlinkOSGiJars" classpath="${basedir}/task-bin" />
+ <taskdef name="symlinkInstalledOSGiJars" classname="org.eclipse.linuxtools.eclipsebuild.SymlinkInstalledOSGiJars" classpath="${basedir}/task-bin" />
+ <taskdef name="symlinkNonOSGiJars" classname="org.eclipse.linuxtools.eclipsebuild.SymlinkNonOSGiJars" classpath="${basedir}/task-bin" />
</target>
<target name="symlinkDeps" depends="applyPatches,defineTasks" unless="symlinks.complete">
- <symlinkOSGiJars dependencies="${basedir}/dependencies.properties"
- topLevelDir="${buildDirectory}/plugins"
- manifests="${basedir}/dependencyManifests"/>
- <symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
- topLevelDir="${buildDirectory}/plugins"/>
+ <symlinkOSGiJars dependencies="${basedir}/dependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" />
+ <symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties" topLevelDir="${buildDirectory}/plugins" />
+ <symlinkOSGiJars dependencies="${basedir}/sdkdependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" />
+ <symlinkNonOSGiJars dependencies="${basedir}/sdknonosgidependencies.properties" topLevelDir="${buildDirectory}/plugins" />
<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
- <regexp pattern="^Name.*"/>
- <substitution expression=""/>
+ <regexp pattern="^Name.*" />
+ <substitution expression="" />
</replaceregexp>
<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
- <regexp pattern="^SHA1-Digest.*"/>
- <substitution expression=""/>
+ <regexp pattern="^SHA1-Digest.*" />
+ <substitution expression="" />
</replaceregexp>
<replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
- <regexp pattern="^Name.*"/>
- <substitution expression=""/>
+ <regexp pattern="^Name.*" />
+ <substitution expression="" />
</replaceregexp>
<replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
- <regexp pattern="^SHA1-Digest.*"/>
- <substitution expression=""/>
+ <regexp pattern="^SHA1-Digest.*" />
+ <substitution expression="" />
</replaceregexp>
<!-- Create a stamp file -->
@@ -423,11 +423,11 @@
<path id="pdebuilddir.id">
<dirset dir="${provisionDir}/plugins">
- <include name="org.eclipse.pde.build_*"/>
+ <include name="org.eclipse.pde.build_*" />
</dirset>
</path>
- <property name="pdebuilddir" refid="pdebuilddir.id"/>
+ <property name="pdebuilddir" refid="pdebuilddir.id" />
<!-- Test framework -->
<exec executable="${provisionDir}/eclipse">
@@ -509,24 +509,15 @@
<property name="builtZip" value="${buildDirectory}/I.${buildId}/eclipse-SDK-${buildId}.zip" />
<!--<property name="builtZip" value="${basedir}/eclipse-SDK-${buildId}.zip"/>-->
<replace token="@qualifier@" file="${productFiles}/sdk/sdk.product" value="${buildId}" />
+ <replace token="@qualifier@" file="${productFiles}/platform/platform.product" value="${buildId}" />
<property name="tempexec" value="${buildDirectory}/tempexec" />
<antcall target="createRepo" />
-
- <copy file="${reposource}/content.xml" tofile="${reposource}/content.xml.orig" failonerror="false" />
-
<antcall target="extractLauncher" />
<antcall target="publishLauncher" />
-
- <copy file="${reposource}/content.xml" tofile="${reposource}/content.xml.afterlauncher" failonerror="false" />
- <copy file="${reposource}/content.jar" tofile="${reposource}/content.jar.afterlauncher" failonerror="false" />
-
<antcall target="createAndPublishLauncherFeature" />
-
- <copy file="${reposource}/content.xml" tofile="${reposource}/content.xml.afterrcpConfig" failonerror="false" />
- <copy file="${reposource}/content.jar" tofile="${reposource}/content.jar.afterrcpConfig" failonerror="false" />
-
<antcall target="publishSDK" />
+ <antcall target="publishPlatform" />
<echo file="p2prep-stamp" />
</target>
@@ -615,11 +606,23 @@
-->
</target>
+ <target name="publishPlatform">
+ <antcall target="publishProduct">
+ <param name="productFile" value="${productFiles}/platform/platform.product" />
+ </antcall>
+ </target>
+
<target name="publishSDK">
- <!-- This next part publishes the entire SDK -->
+ <antcall target="publishProduct">
+ <param name="productFile" value="${productFiles}/sdk/sdk.product" />
+ </antcall>
+ </target>
+
+ <target name="publishProduct">
+ <!-- http://wiki.eclipse.org/Equinox/p2/Publisher -->
<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
<classpath>
- <pathelement path="bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
+ <pathelement path="${launcher}" />
</classpath>
<arg line="-configuration configuration " />
<arg line="-application org.eclipse.ant.core.antRunner " />
@@ -628,19 +631,83 @@
<arg line="-DbuildArch=${buildArch} " />
<arg line="-Dreposource=${reposource} " />
<arg line="-DbuildConfig=${buildConfig} " />
- <arg line="-DproductFiles=${productFiles} " />
+ <arg line="-DproductFile=${productFile} " />
<arg line="-DbuildDirectory=${buildDirectory} " />
<arg line="-consolelog " />
<jvmarg value="-Xmx512M" />
</java>
+ <!-- The following (using the app. instead of the ant task) doesn't work
+ as of 2010-08-11 -->
+ <!--
+ <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
+ <classpath>
+ <pathelement path="bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
+ </classpath>
+ <arg line="-configuration configuration " />
+ <arg line="-consoleLog" />
+ <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher " />
+ <arg line="-flavor tooling" />
+ <arg line="-configs gtk.linux.${buildArch}" />
+ <arg line="-productFile ${productFile}" />
+ <arg line="-metadataRepository file:${reposource}" />
+ <arg line="-artifactRepository file:${reposource}" />
+ <arg line="-compress" />
+ <arg line="-featureVersions ${buildDirectory}/finalFeaturesVersions.properties" />
+ <arg line="-pluginVersions ${buildDirectory}/finalPluginsVersions.properties" />
+ </java>
+ -->
+ </target>
+
+ <target name="provision.platform" depends="p2prep" unless="provision.platform.complete">
+ <echo message="Installing into: ${provisionDir}" />
+ <antcall target="provision">
+ <param name="p2.director.installIU" value="org.eclipse.platform.ide" />
+ <param name="profileName" value="PlatformProfile" />
+ </antcall>
+
+ <echo file="provision.platform-stamp" />
+ </target>
+
+ <!-- This is here as a convenience task for distributions which want
+ CVS functionality to be present in "platform" installations. -->
+ <target name="provision.cvs" depends="p2prep" unless="provision.cvs.complete">
+ <echo message="Installing into: ${provisionDir}" />
+ <antcall target="provision">
+ <param name="p2.director.installIU" value="org.eclipse.platform.ide,org.eclipse.cvs.feature.group" />
+ <param name="profileName" value="PlatformProfile" />
+ </antcall>
+
+ <echo file="provision.cvs-stamp" />
</target>
<target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
<echo message="Installing into: ${provisionDir}" />
- <antcall target="run.director">
+ <antcall target="provision">
<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
+ <param name="profileName" value="SDKProfile" />
+ </antcall>
+
+ <fileset id="junit4.jar" dir="${provisionDir}/plugins">
+ <include name="**/org.junit4_**/junit.jar" />
+ </fileset>
+ <property name="junit4jar.path" refid="junit4.jar" />
+
+ <delete file="${provisionDir}/plugins/${junit4jar.path}" />
+ <symlink link="${provisionDir}/plugins/${junit4jar.path}" resource="${junit4JarLocation}" />
+
+ <!-- Re-symlink system JARs -->
+ <symlinkInstalledOSGiJars dependencies="${basedir}/sdkdependencies.properties" topLevelDir="${provisionDir}/plugins" />
+ <symlinkNonOSGiJars dependencies="${basedir}/sdknonosgidependencies.properties" topLevelDir="${provisionDir}/plugins" />
+
+ <echo file="provision.sdk-stamp" />
+ </target>
+
+ <target name="provision" depends="p2prep">
+ <echo message="Installing into: ${provisionDir}" />
+ <antcall target="run.director">
+ <param name="p2.director.installIU" value="${p2.director.installIU}" />
<param name="p2.director.version" value="${p2.director.version}" />
- <param name="p2.director.profile" value="SDKProfile" />
+ <param name="p2.director.profile" value="${profileName}" />
<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" />
@@ -656,48 +723,33 @@
</copy>
<!-- Re-symlink system JARs -->
- <symlinkInstalledOSGiJars dependencies="${basedir}/dependencies.properties"
- topLevelDir="${provisionDir}/plugins"/>
- <symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
- topLevelDir="${provisionDir}/plugins"/>
-
- <fileset id="junit4.jar" dir="${provisionDir}/plugins">
- <include name="**/org.junit4_**/junit.jar"/>
- </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="${provisionDir}/plugins/${junit4jar.path}"
- resource="/usr/share/java/junit4.jar" />
-
- <echo file="provision.sdk-stamp" />
+ <symlinkInstalledOSGiJars dependencies="${basedir}/dependencies.properties" topLevelDir="${provisionDir}/plugins" />
+ <symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties" topLevelDir="${provisionDir}/plugins" />
</target>
-
+
<target name="checkDebugAndVerbose">
<condition property="bothDebugAndVerbose.set">
<and>
- <isset property="debugTests"/>
- <isset property="verboseTests"/>
+ <isset property="debugTests" />
+ <isset property="verboseTests" />
</and>
</condition>
</target>
-
+
<target name="setDebugAndVerbose" depends="checkDebugAndVerbose" if="bothDebugAndVerbose.set">
- <property name="testSwitches" value="-dv"/>
+ <property name="testSwitches" value="-dv" />
</target>
-
+
<target name="setDebugTests" if="debugTests">
- <property name="testSwitches" value="-d"/>
+ <property name="testSwitches" value="-d" />
</target>
<target name="setVerboseTests" if="verboseTests">
- <property name="testSwitches" value="-v"/>
+ <property name="testSwitches" value="-v" />
</target>
-
- <target name="setDebugAndVerboseArgs" depends="setDebugAndVerbose,setDebugTests,setVerboseTests"/>
-
+
+ <target name="setDebugAndVerboseArgs" depends="setDebugAndVerbose,setDebugTests,setVerboseTests" />
+
<target name="runTests" depends="buildTests,setDebugAndVerboseArgs">
<!-- These two next calls just set the properties to an empty string if they are not previously set -->
<property name="debugTestsSwitch" value="" />
@@ -872,7 +924,7 @@
<arg value="${buildworkspace}" />
<arg value="-fileInitializer" />
<arg value="${basedir}/extract_patterns.txt" />
- <jvmarg value="-Dosgi.sharedConfiguration.area=${installationDir}/configuration"/>
+ <jvmarg value="-Dosgi.sharedConfiguration.area=${installationDir}/configuration" />
</java>
<!-- Remove unnecessary configuration data -->
@@ -890,6 +942,14 @@
</target>
+ <target name="installPlatform" depends="provision.platform,install">
+ <echo message="Installing Eclipse Platform" />
+ </target>
+
+ <target name="installPlatformAndCVS" depends="provision.cvs,install">
+ <echo message="Installing Eclipse Platform and CVS feature" />
+ </target>
+
<target name="package.extract.swt">
<exec executable="./swt_bundle.sh" failOnError="true">
<arg value="${eclipse.rcp.package.root}" />
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index eeb7a35..49de9fd 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
-@@ -839,6 +839,12 @@
+@@ -891,6 +891,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index ff03471..389c627 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -4,7 +4,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -903,6 +903,55 @@
+@@ -955,6 +955,55 @@
<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index b6dcf9f..cde2bec 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -3,7 +3,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -982,6 +982,10 @@
+@@ -1034,6 +1034,10 @@
<fileset dir="${installationDir}/configuration" includes="**/data/**" />
</delete>
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index 022ea35..74cb687 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
-@@ -986,6 +986,21 @@
+@@ -1038,6 +1038,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" />
diff --git a/debian/patches/symlink-system-files.patch b/debian/patches/symlink-system-files.patch
index 9542f8e..18eb14a 100644
--- a/debian/patches/symlink-system-files.patch
+++ b/debian/patches/symlink-system-files.patch
@@ -3,12 +3,12 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/nonosgidependencies.properties
+++ b/nonosgidependencies.properties
-@@ -19,3 +19,8 @@
- org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar=/usr/share/java/junit.jar
- org.junit4/junit.jar=/usr/share/java/junit4.jar
- org.junit_4.8.1.v4_8_1_v20100427-1100/junit.jar=/usr/share/java/junit4.jar
+@@ -1,3 +1,8 @@
+org.apache.ant_1.7.1.v20100518-1145/bin/ant=/usr/share/ant/bin/ant
+org.apache.ant_1.7.1.v20100518-1145/bin/antRun=/usr/share/ant/bin/antRun
+org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl=/usr/share/ant/bin/antRun.pl
+org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl
+org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl=/usr/share/ant/bin/runant.pl
+ org.apache.ant_1.7.1.v20100518-1145/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
+ org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
+ org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
diff --git a/dependencies.properties b/dependencies.properties
index 06ce276..7b91808 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -9,9 +9,7 @@ org.apache.commons.logging_1.0.4.v201005080501.jar=/usr/share/java/commons-loggi
org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
org.apache.lucene.analysis_1.9.1.v20100518-1140.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
-org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
-org.objectweb.asm_3.2.0.v200909071300.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
org.sat4j.core_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
org.sat4j.pb_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
diff --git a/nonosgidependencies.properties b/nonosgidependencies.properties
index f038604..5aab7b2 100644
--- a/nonosgidependencies.properties
+++ b/nonosgidependencies.properties
@@ -16,6 +16,3 @@ org.apache.ant_1.7.1.v20100518-1145/lib/ant-launcher.jar=/usr/share/java/ant-lau
org.apache.ant_1.7.1.v20100518-1145/lib/ant-nodeps.jar=/usr/share/java/ant/ant-nodeps.jar:/usr/share/java/ant-nodeps.jar
org.apache.ant_1.7.1.v20100518-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar
-org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar=/usr/share/java/junit.jar
-org.junit4/junit.jar=/usr/share/java/junit4.jar
-org.junit_4.8.1.v4_8_1_v20100427-1100/junit.jar=/usr/share/java/junit4.jar
diff --git a/publishProduct.xml b/publishProduct.xml
index fb036d2..9acb6b4 100644
--- a/publishProduct.xml
+++ b/publishProduct.xml
@@ -1,7 +1,6 @@
<project name="Eclipse SDK build" default="publish" basedir=".">
<target name="publish">
- <echo message="Calling p2.publish.product with repository=${reposource} and productFile=${productFiles}/sdk/sdk.product"/>
- <p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFiles}/sdk/sdk.product" compress="true">
+ <p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFile}" compress="true">
<config os="linux" ws="gtk" arch="${buildArch}" />
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" />
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" />
diff --git a/sdkdependencies.properties b/sdkdependencies.properties
new file mode 100644
index 0000000..05f528b
--- /dev/null
+++ b/sdkdependencies.properties
@@ -0,0 +1,2 @@
+org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
+org.objectweb.asm_3.2.0.v200909071300.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
diff --git a/sdknonosgidependencies.properties b/sdknonosgidependencies.properties
new file mode 100644
index 0000000..1c99651
--- /dev/null
+++ b/sdknonosgidependencies.properties
@@ -0,0 +1,3 @@
+org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar=/usr/share/java/junit.jar
+org.junit4/junit.jar=/usr/share/java/junit4.jar
+org.junit_4.8.1.v4_8_1_v20100427-1100/junit.jar=/usr/share/java/junit4.jar
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list