[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 6dbeae36768aaaa102fdd79d681423ee7a98b74d
Benjamin Drung
bdrung-guest at alioth.debian.org
Mon Oct 12 20:02:20 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 6dbeae36768aaaa102fdd79d681423ee7a98b74d (commit)
from 260c693d5898e61daf99dc33f55a214a1683139f (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 6dbeae36768aaaa102fdd79d681423ee7a98b74d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Oct 12 22:01:53 2009 +0200
Sync upstream changes (into eclipse-build.patch) and refresh patches.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/eclipse-build.patch | 561 +++++++++++++++++++++++++++++++-----
debian/patches/fix-perm.patch | 16 +-
debian/patches/libgnomeproxy.patch | 20 +-
debian/patches/series | 3 +-
debian/patches/symlink.patch | 22 --
debian/rules | 2 +-
6 files changed, 518 insertions(+), 106 deletions(-)
diff --git a/debian/patches/eclipse-build.patch b/debian/patches/eclipse-build.patch
index 0a7cc62..e683299 100644
--- a/debian/patches/eclipse-build.patch
+++ b/debian/patches/eclipse-build.patch
@@ -1,8 +1,103 @@
Description: Sync changes from eclipse-build
-diff -pruN eclipse-3.5.1/build.xml eclipse-3.5.1.new/build.xml
---- eclipse-3.5.1/build.xml 2009-10-06 00:36:21.000000000 +0200
-+++ eclipse-3.5.1.new/build.xml 2009-10-08 16:01:19.162887000 +0200
-@@ -191,13 +191,19 @@
+diff -pruN a/build.xml b/build.xml
+--- a/build.xml 2009-10-06 00:36:21.000000000 +0200
++++ b/build.xml 2009-10-12 18:11:01.279223000 +0200
+@@ -24,8 +24,8 @@
+ <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"/>
+- <property name="testsBuildDir" value="${basedir}/testsBuild"/>
++ <property name="topBuildDir" value="${basedir}/build" />
++ <property name="testsBuildDir" value="${basedir}/testsBuild" />
+ <property name="homeDir" value="${basedir}/home" />
+ <property name="baseworkspace" value="${basedir}/baseworkspace" />
+ <property name="buildworkspace" value="${basedir}/buildworkspace" />
+@@ -60,29 +60,29 @@
+ </target>
+
+ <target name="getInstallationDir" depends="setLibDir">
+- <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}"/>
++ <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}" />
+ </target>
+
+ <property name="doTests" value="true" />
+
+ <target name="bootstrap" unless="bootstrapped">
+ <ant inheritall="false" antfile="pdebuild.xml">
+- <property name="buildId" value="${buildId}"/>
+- <property name="buildArch" value="${buildArch}"/>
++ <property name="buildId" value="${buildId}" />
++ <property name="buildArch" value="${buildArch}" />
+ </ant>
+ </target>
+
+ <!-- Run this target with antRunner application -->
+ <target name="generateBuildXmls" depends="unpack">
+- <ant antfile="pdebuild.xml" target="generateScripts"/>
++ <ant antfile="pdebuild.xml" target="generateScripts" />
+ </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://www.eclipse.org/downloads/download.php?file=/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."/>
++ <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">
+@@ -90,8 +90,7 @@
+ </target>
+
+ <target name="extractBuildXmls" if="scriptsPresent">
+- <untar compression="bzip2" dest="${basedir}/build/eclipse-${buildTag}-fetched-src"
+- src="${basedir}/eclipse-build-generatedScripts.tar.bz2"/>
++ <untar compression="bzip2" dest="${basedir}/build/eclipse-${buildTag}-fetched-src" src="${basedir}/eclipse-build-generatedScripts.tar.bz2" />
+ <!--
+ <fail message="Build scripts to bootstrap PDE Build must be generated and present in eclipse-build-generatedScripts.tar.bz2. See pdebuild.xml for details."/>
+ -->
+@@ -113,19 +112,29 @@
+
+ <echo message="Extracting SDK source (tar jxf eclipse-${buildTag}-fetched-src.tar.bz2)" />
+ <untar dest="${topBuildDir}" src="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" compression="bzip2" />
+- <antcall target="extractBuildXmls"/>
++ <antcall target="extractBuildXmls" />
+
+ <delete dir="${buildDirectory}/buildConfigs" />
+ <mkdir dir="${buildDirectory}/buildConfigs" />
+
+ <echo message="Copying eclipse-build main feature source" />
+ <copy todir="${buildConfigs}/eclipse-build-config">
+- <fileset dir="eclipse-build-config"/>
++ <fileset dir="eclipse-build-config" />
+ </copy>
+ <echo message="Copying eclipse-build builder" />
+ <copy todir="${buildDirectory}/features/eclipse-build-feature">
+- <fileset dir="eclipse-build-feature"/>
++ <fileset dir="eclipse-build-feature" />
+ </copy>
++ <!-- prepare ecf build tree -->
++ <mkdir dir="${buildDirectory}/ecf-src/plugins" />
++ <move todir="${buildDirectory}/ecf-src/plugins">
++ <fileset dir="${buildDirectory}/ecf-src">
++ <filename name="org.eclipse*" />
++ </fileset>
++ </move>
++ <mkdir dir="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature" />
++ <copy tofile="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature/feature.xml" file="ecf-filetransfer-feature.xml" />
++ <copy tofile="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature/build.properties" file="ecf-filetransfer-build.properties" />
+ <!-- Create a stamp file -->
+ <echo file="unpack-stamp" />
+ </target>
+@@ -187,17 +196,23 @@
+ <replace dir="${buildDirectory}" value="${buildId}" token="@build@">
+ <include name="**/configuration/config.ini" />
+ </replace>
+- <echo file="buildId-stamp"/>
++ <echo file="buildId-stamp" />
</target>
<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
@@ -15,7 +110,7 @@ diff -pruN eclipse-3.5.1/build.xml eclipse-3.5.1.new/build.xml
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
+ <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
-+ <replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse"/>
++ <replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
+ <!-- end eclipse-build-only patches -->
+ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
+ <patch patchfile="${basedir}/patches/eclipse-help-toolbar.patch" dir="${buildDirectory}" strip="0" />
@@ -24,10 +119,131 @@ diff -pruN eclipse-3.5.1/build.xml eclipse-3.5.1.new/build.xml
<echo file="patch-stamp" />
</target>
-@@ -476,6 +482,21 @@
+@@ -208,11 +223,8 @@
+ </target>
+
+ <target name="build" depends="applyPatches,bootstrap,compilelibs" unless="build.complete">
+- <echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}"/>
+- <java classname="org.eclipse.equinox.launcher.Main"
+- fork="true"
+- dir="${basedir}"
+- failonerror="true">
++ <echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
++ <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
+ <classpath>
+ <pathelement path="bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
+ </classpath>
+@@ -289,9 +301,7 @@
+ <include name="**/*.so" />
+ </fileset>
+ </delete>-->
+- <ant antfile="build.xml"
+- target="build.nativeLibraries"
+- dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
++ <ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
+
+ <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
+ <exec dir="${launcherlibs}/library/gtk/" executable="sh" failonerror="true">
+@@ -328,27 +338,27 @@
+ <!--<property name="builtZip" value="${buildDirectory}/${buildLabel}/${featureToBuild}-${buildTag}-group.group.group.zip" />-->
+ <!-- archiveName is set in the build config's customTargets.xml -->
+ <!-- FIXME buildLabel should be used here but it's not defined so we cheat and use I.${buildId} instead. -->
+- <property name="builtZip" value="${buildDirectory}/I.${buildId}/eclipse-SDK-${buildId}.zip"/>
++ <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}" />
+ <property name="tempexec" value="${buildDirectory}/tempexec" />
+
+- <antcall target="createRepo"/>
++ <antcall target="createRepo" />
+
+- <copy file="${reposource}/content.xml" tofile="${reposource}/content.xml.orig" failonerror="false"/>
++ <copy file="${reposource}/content.xml" tofile="${reposource}/content.xml.orig" failonerror="false" />
+
+- <antcall target="extractLauncher"/>
+- <antcall target="publishLauncher"/>
++ <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"/>
++ <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"/>
++ <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"/>
++ <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="publishSDK" />
+
+ <echo file="p2prep-stamp" />
+ </target>
+@@ -371,8 +381,8 @@
+ </copy>
+ <unzip dest="${tempexec}">
+ <fileset dir="${tempexec}/features">
+- <include name="*.jar"/>
+- </fileset>
++ <include name="*.jar" />
++ </fileset>
+ </unzip>
+ </target>
+
+@@ -386,10 +396,7 @@
+ -->
+
+ <!-- This next part merges metadata for the launcher binary into the rest of the metadata -->
+- <java classname="org.eclipse.equinox.launcher.Main"
+- fork="true"
+- dir="${basedir}"
+- failonerror="true">
++ <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
+ <classpath>
+ <pathelement path="bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
+ </classpath>
+@@ -416,10 +423,7 @@
+ -->
+
+ <!-- This next part creates and publishs a feature including the binary launcher -->
+- <java classname="org.eclipse.equinox.launcher.Main"
+- fork="true"
+- dir="${productFiles}/rcpConfig"
+- failonerror="true">
++ <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${productFiles}/rcpConfig" failonerror="true">
+ <classpath>
+ <pathelement path="bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
+ </classpath>
+@@ -443,10 +447,7 @@
+
+ <target name="publishSDK">
+ <!-- This next part publishes the entire SDK -->
+- <java classname="org.eclipse.equinox.launcher.Main"
+- fork="true"
+- dir="${basedir}"
+- failonerror="true">
++ <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
+ <classpath>
+ <pathelement path="bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
+ </classpath>
+@@ -464,7 +465,7 @@
+ </target>
+
+ <target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
+- <echo message="Installing into: ${buildDirectory}/installation"/>
++ <echo message="Installing into: ${buildDirectory}/installation" />
+ <antcall target="run.director">
+ <param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
+ <param name="p2.director.version" value="${p2.director.version}" />
+@@ -476,17 +477,60 @@
<param name="p2.arch" value="${buildArch}" />
<param name="p2.repo" value="${reposource}" />
</antcall>
++ <!-- build equinox initializer -->
+ <java classname="org.eclipse.core.launcher.Main" dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer" fork="true">
+ <classpath>
+ <fileset dir="${buildDirectory}/installation/plugins">
@@ -40,33 +256,99 @@ diff -pruN eclipse-3.5.1/build.xml eclipse-3.5.1.new/build.xml
+ </java>
+ <copy todir="${buildDirectory}/installation/plugins">
+ <fileset dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
-+ <include name="org.eclipse.equinox.initializer*.jar"/>
++ <include name="org.eclipse.equinox.initializer*.jar" />
++ </fileset>
++ </copy>
++ <!-- build ecf -->
++ <mkdir dir="ecf-src/build" />
++ <mkdir dir="ecf-src/home" />
++ <dirset dir="${buildDirectory}/installation/plugins" includes="org.eclipse.pde.build_*" id="pdebuild" />
++ <property name="pdebuildplugin" refid="pdebuild" />
++ <java classname="org.eclipse.core.launcher.Main" dir="${buildDirectory}/ecf-src" fork="true">
++ <classpath>
++ <fileset dir="${buildDirectory}/installation/plugins">
++ <include name="org.eclipse.equinox.launcher_*.jar" />
++ </fileset>
++ </classpath>
++ <arg line="-Duser.home=${buildDirectory}/ecf-src/home" />
++ <arg line="-application org.eclipse.ant.core.antRunner" />
++ <arg line="-Dtype=feature" />
++ <arg line="-Did=org.eclipse.ecf.filetransfer_feature" />
++ <arg line="-DsourceDirectory=${buildDirectory}/ecf-src" />
++ <arg line="-DbaseLocation=${buildDirectory}/installation" />
++ <arg line="-DforceContextQualifier=v20090831-1906" />
++ <arg line="-Dbuilder=${buildDirectory}/installation/plugins/${pdebuildplugin}/templates/package-build" />
++ <arg line="-f ${buildDirectory}/installation/plugins/${pdebuildplugin}/scripts/build.xml" />
++ </java>
++ <unzip dest="${buildDirectory}/ecf-src/build/rpmBuild" src="${buildDirectory}/ecf-src/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip" />
++ <copy todir="${buildDirectory}/installation/plugins">
++ <fileset dir="${buildDirectory}/ecf-src/build/rpmBuild/eclipse/plugins">
++ <filename name="org.eclipse.*.jar" />
+ </fileset>
+ </copy>
<echo file="provision.sdk-stamp" />
</target>
-@@ -530,17 +551,43 @@
- <echo message="###################################################################"/>
- <echo message=""/>
+ <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"/>
++ <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="-i" />
+ <arg value="/dropins/d" />
+ <arg value="${buildDirectory}/testsInstallation/eclipse/eclipse.ini" />
+ </exec>
+@@ -503,7 +547,7 @@
+ <param name="p2.repo" value="${testsBuildDirectory}/buildRepo" />
+ </antcall>
+ -->
+- <echo message="Installing SDK tests into: ${buildDirectory}/testsInstallation"/>
++ <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" />
+@@ -522,30 +566,53 @@
+ </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=""/>
++ <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"/>
-+ <format property="timestamp" pattern="yyyyMMddHHmmss"/>
++ <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}"/>
-+ <arg value="-t${timestamp}"/>
++ <arg value="-t${timestamp}" />
</exec>
- <copy failonerror="false" todir="${basedir}/testResults-${timestamp}">
-+ <property name="testResultDir" value="${basedir}/testResults-${timestamp}"/>
++ <property name="testResultDir" value="${basedir}/testResults-${timestamp}" />
+ <copy failonerror="false" todir="${testResultDir}">
<fileset dir="${buildDirectory}/testsInstallation/results-${timestamp}">
<include name="**/*" />
</fileset>
</copy>
+ <!-- Copy over the XML to generate a top-level report for all of the tests -->
-+ <mkdir dir="${testResultDir}/origXml"/>
++ <mkdir dir="${testResultDir}/origXml" />
+ <copy failonerror="false" todir="${testResultDir}/origXml">
+ <fileset dir="${testResultDir}/xml">
+ <include name="**/*" />
@@ -74,53 +356,108 @@ diff -pruN eclipse-3.5.1/build.xml eclipse-3.5.1.new/build.xml
+ </copy>
+ <!-- Un-"collect" the results -->
+ <replace dir="${testResultDir}/origXml" value="">
-+ <include name="**/*.xml"/>
-+ <replacetoken><testsuites></replacetoken>
++ <include name="**/*.xml" />
++ <replacetoken><testsuites></replacetoken>
+ </replace>
+ <replace dir="${testResultDir}/origXml" value="">
-+ <include name="**/*.xml"/>
-+ <replacetoken></testsuites></replacetoken>
++ <include name="**/*.xml" />
++ <replacetoken></testsuites></replacetoken>
+ </replace>
+ <!-- Aggregate XML report files -->
+ <junitreport todir="${testResultDir}/xml" tofile="org.eclipse.sdk.tests.xml">
+ <fileset dir="${testResultDir}/origXml" includes="*.xml" />
+ </junitreport>
+ <!-- Generate top-level HTML report -->
-+ <xslt style="${buildDirectory}/testsInstallation/eclipse/plugins/org.eclipse.test_3.2.0/JUNIT.XSL"
-+ basedir="${testResultDir}/xml"
-+ includes="org.eclipse.sdk.tests.xml"
-+ destdir="${testResultDir}/html" />
++ <xslt style="${buildDirectory}/testsInstallation/eclipse/plugins/org.eclipse.test_3.2.0/JUNIT.XSL" basedir="${testResultDir}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${testResultDir}/html" />
</target>
<target name="run.director">
-@@ -629,7 +676,23 @@
- 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" />
-+ <mkdir dir="${destDir}${prefix}/share/pixmaps"/>
+- <property name="baseBuilderConfig" value="${baseBuilder}/p2"/>
+- <echo message="Moving ${baseBuilderConfig} to ${baseBuilderConfig}.bak"/>
++ <property name="baseBuilderConfig" value="${baseBuilder}/p2" />
++ <echo message="Moving ${baseBuilderConfig} to ${baseBuilderConfig}.bak" />
+ <move failonerror="false" file="${baseBuilderConfig}" tofile="${baseBuilderConfig}.bak" />
+ <!-- FIXME: When we move to bootstrap by default, investigate using <exec> on the bootstrapped launcher
+ like in eclipsebuilder's equinox.prov/run.xml -->
+@@ -580,7 +647,7 @@
+ <jvmarg value="-Xmx2048M" />
+ <jvmarg value="-XX:MaxPermSize=512M" />
+ -->
+- <jvmarg value="-Declipse.p2.data.area=${p2.director.install.path}/p2"/>
++ <jvmarg value="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
+ </java>
+ <delete dir="${baseBuilderConfig}" includeemptydirs="true" failonerror="false" />
+ <move file="${baseBuilderConfig}.bak" tofile="${baseBuilderConfig}" />
+@@ -610,26 +677,44 @@
+ <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="-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"/>
++ <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 -->
+- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png"
+- tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
+- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png"
+- tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
+- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png"
+- tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
+- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
++ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
++ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
++ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
++ <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-->
+ <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
+ <!-- eclipse binary -->
+ <mkdir dir="${destDir}${prefix}/bin" />
+ <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
- </target>
-
++ <!-- Create the "startup.jar" symlink -->
++ <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
++ <property name="startupjarpath" refid="startupjar" />
++ <symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
++
++ <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins" />
++ </target>
++
+ <target name="package.extract.swt">
-+ <exec executable="./swt_bundle.sh" failOnError="true" >
++ <exec executable="./swt_bundle.sh" failOnError="true">
+ <arg value="${eclipse.rcp.package.root}" />
+ <arg value="${eclipse.swt.package.root}" />
+ <arg value="${prefix}" />
+ <arg value="${libdir}" />
+ </exec>
-+ </target>
-+
+ </target>
+
</project>
-diff -pruN eclipse-3.5.1/ChangeLog eclipse-3.5.1.new/ChangeLog
---- eclipse-3.5.1/ChangeLog 2009-10-06 00:36:21.000000000 +0200
-+++ eclipse-3.5.1.new/ChangeLog 2009-10-08 16:01:19.162887000 +0200
-@@ -1,7 +1,71 @@
+diff -pruN a/ChangeLog b/ChangeLog
+--- a/ChangeLog 2009-10-06 00:36:21.000000000 +0200
++++ b/ChangeLog 2009-10-12 18:11:01.279223000 +0200
+@@ -1,7 +1,81 @@
++2009-10-12 Alexander Kurtakov <akurtako at redhat.com>
++
++ * build.xml: Create a symlink to o.e.equinox.launcher in the install. (Niels Thykier)
++
++2009-10-12 Alexander Kurtakov <akurtako at redhat.com>
++
++ * ecf-filetransfer-build.properties: New file.
++ * ecf-filetransfer-feature.xml: New file.
++ * build.xml: Compile ecf bundles.
++
+2009-10-08 Andrew Overholt <overholt at redhat.com>
+
+ Bud #291681 - Patch courtesy Benjamin Drung
@@ -192,7 +529,7 @@ diff -pruN eclipse-3.5.1/ChangeLog eclipse-3.5.1.new/ChangeLog
2009-10-02 Alexander Kurtakov <akurtako at redhat.com>
* buildSDKSource.sh: Update ecf tag to the one used for 3.5.1.
-@@ -9,7 +73,7 @@
+@@ -9,7 +83,7 @@
2009-10-01 Alexander Kurtakov <akurtako at redhat.com>
* pdebuild.xml: Use buildTag variable instead of hard-coded value.
@@ -201,7 +538,7 @@ diff -pruN eclipse-3.5.1/ChangeLog eclipse-3.5.1.new/ChangeLog
2009-10-01 Alexander Kurtakov <akurtako at redhat.com>
* pdebuild.properties: Sync buildId and buildTag with build.properties.
-@@ -19,7 +83,7 @@
+@@ -19,7 +93,7 @@
* build.properties: Separate buildId and buildTag.
* build.xml: Likewise.
@@ -210,7 +547,7 @@ diff -pruN eclipse-3.5.1/ChangeLog eclipse-3.5.1.new/ChangeLog
2009-09-30 Alexander Kurtakov <akurtako at redhat.com>
* eclipse-build-generatedScripts.tar.bz2: Regenerate for 3.5.1.
-@@ -52,7 +116,7 @@
+@@ -52,7 +126,7 @@
* patches/tests-nostyletask.patch: New file.
* build.xml: Apply patch to not use deprecated ant task.
* junitHelper.xml: Likewise.
@@ -219,9 +556,103 @@ diff -pruN eclipse-3.5.1/ChangeLog eclipse-3.5.1.new/ChangeLog
2009-09-25 Alexander Kurtakov <akurtako at redhat.com>
* build.xml: Delete testBuild folder in clean.
-diff -pruN eclipse-3.5.1/junitHelper.xml eclipse-3.5.1.new/junitHelper.xml
---- eclipse-3.5.1/junitHelper.xml 2009-10-06 00:36:21.000000000 +0200
-+++ eclipse-3.5.1.new/junitHelper.xml 2009-10-06 14:05:22.226682000 +0200
+diff -pruN a/ecf-filetransfer-build.properties b/ecf-filetransfer-build.properties
+--- a/ecf-filetransfer-build.properties 1970-01-01 01:00:00.000000000 +0100
++++ b/ecf-filetransfer-build.properties 2009-10-12 14:50:41.041852000 +0200
+@@ -0,0 +1 @@
++bin.includes = feature.xml
+diff -pruN a/ecf-filetransfer-feature.xml b/ecf-filetransfer-feature.xml
+--- a/ecf-filetransfer-feature.xml 1970-01-01 01:00:00.000000000 +0100
++++ b/ecf-filetransfer-feature.xml 2009-10-12 14:50:41.041852000 +0200
+@@ -0,0 +1,85 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<feature
++ id="org.eclipse.ecf.filetransfer_feature"
++ label="ECF filetransfer"
++ version="2.0.0">
++
++ <description url="http://www.example.com/description">
++ [Enter Feature Description here.]
++ </description>
++
++ <copyright url="http://www.example.com/copyright">
++ [Enter Copyright Description here.]
++ </copyright>
++
++ <license url="http://www.example.com/license">
++ [Enter License Description here.]
++ </license>
++
++
++ <plugin
++ id="org.eclipse.equinox.concurrent"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf.filetransfer"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf.identity"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf.provider.filetransfer"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf.provider.filetransfer.httpclient"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf.provider.filetransfer.ssl"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.ecf.ssl"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++</feature>
+diff -pruN a/junitHelper.xml b/junitHelper.xml
+--- a/junitHelper.xml 2009-10-06 00:36:21.000000000 +0200
++++ b/junitHelper.xml 2009-10-06 14:05:22.226682000 +0200
@@ -20,4 +20,4 @@
<xslt style="${eclipse-home}/plugins/org.eclipse.test_3.2.0/JUNIT.XSL" basedir="${xmlDir}" destdir="${htmlDir}" />
</target>
@@ -229,9 +660,9 @@ diff -pruN eclipse-3.5.1/junitHelper.xml eclipse-3.5.1.new/junitHelper.xml
-</project>
\ Kein Zeilenumbruch am Dateiende.
+</project>
-diff -pruN eclipse-3.5.1/patches/eclipse-pde.build-add-package-build.patch eclipse-3.5.1.new/patches/eclipse-pde.build-add-package-build.patch
---- eclipse-3.5.1/patches/eclipse-pde.build-add-package-build.patch 1970-01-01 01:00:00.000000000 +0100
-+++ eclipse-3.5.1.new/patches/eclipse-pde.build-add-package-build.patch 2009-10-08 10:43:20.983704000 +0200
+diff -pruN a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
+--- a/patches/eclipse-pde.build-add-package-build.patch 1970-01-01 01:00:00.000000000 +0100
++++ b/patches/eclipse-pde.build-add-package-build.patch 2009-10-08 10:43:20.983704000 +0200
@@ -0,0 +1,339 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.pde.build
@@ -572,9 +1003,9 @@ diff -pruN eclipse-3.5.1/patches/eclipse-pde.build-add-package-build.patch eclip
++ ln -s $DEPENDENCIESDIR/$dep
++ done
++popd
-diff -pruN eclipse-3.5.1/patches/gtk2.18zorder.patch eclipse-3.5.1.new/patches/gtk2.18zorder.patch
---- eclipse-3.5.1/patches/gtk2.18zorder.patch 1970-01-01 01:00:00.000000000 +0100
-+++ eclipse-3.5.1.new/patches/gtk2.18zorder.patch 2009-10-06 17:06:09.903152000 +0200
+diff -pruN a/patches/gtk2.18zorder.patch b/patches/gtk2.18zorder.patch
+--- a/patches/gtk2.18zorder.patch 1970-01-01 01:00:00.000000000 +0100
++++ b/patches/gtk2.18zorder.patch 2009-10-06 17:06:09.903152000 +0200
@@ -0,0 +1,218 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.swt
@@ -794,9 +1225,9 @@ diff -pruN eclipse-3.5.1/patches/gtk2.18zorder.patch eclipse-3.5.1.new/patches/g
+ /** @param window cast=(GdkWindow *) */
+ public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);
+ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {
-diff -pruN eclipse-3.5.1/pdebuild/eclipse-copy-platform.sh eclipse-3.5.1.new/pdebuild/eclipse-copy-platform.sh
---- eclipse-3.5.1/pdebuild/eclipse-copy-platform.sh 1970-01-01 01:00:00.000000000 +0100
-+++ eclipse-3.5.1.new/pdebuild/eclipse-copy-platform.sh 2009-10-08 11:04:18.677711000 +0200
+diff -pruN a/pdebuild/eclipse-copy-platform.sh b/pdebuild/eclipse-copy-platform.sh
+--- a/pdebuild/eclipse-copy-platform.sh 1970-01-01 01:00:00.000000000 +0100
++++ b/pdebuild/eclipse-copy-platform.sh 2009-10-08 11:04:18.677711000 +0200
@@ -0,0 +1,77 @@
+#! /bin/sh
+
@@ -875,9 +1306,9 @@ diff -pruN eclipse-3.5.1/pdebuild/eclipse-copy-platform.sh eclipse-3.5.1.new/pde
+fi
+
+# Code after this point is automatically created by eclipse.spec.
-diff -pruN eclipse-3.5.1/pdebuild/eclipse-pdebuild.sh eclipse-3.5.1.new/pdebuild/eclipse-pdebuild.sh
---- eclipse-3.5.1/pdebuild/eclipse-pdebuild.sh 1970-01-01 01:00:00.000000000 +0100
-+++ eclipse-3.5.1.new/pdebuild/eclipse-pdebuild.sh 2009-10-08 11:04:18.677711000 +0200
+diff -pruN a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
+--- a/pdebuild/eclipse-pdebuild.sh 1970-01-01 01:00:00.000000000 +0100
++++ b/pdebuild/eclipse-pdebuild.sh 2009-10-08 11:04:18.677711000 +0200
@@ -0,0 +1,303 @@
+#!/bin/bash
+
@@ -1182,9 +1613,9 @@ diff -pruN eclipse-3.5.1/pdebuild/eclipse-pdebuild.sh eclipse-3.5.1.new/pdebuild
+ -Duser.home=$homeDir \
+ $vmArgs
+fi
-diff -pruN eclipse-3.5.1/README.mediawiki eclipse-3.5.1.new/README.mediawiki
---- eclipse-3.5.1/README.mediawiki 2009-10-06 00:36:21.000000000 +0200
-+++ eclipse-3.5.1.new/README.mediawiki 2009-10-06 18:19:12.204806000 +0200
+diff -pruN a/README.mediawiki b/README.mediawiki
+--- a/README.mediawiki 2009-10-06 00:36:21.000000000 +0200
++++ b/README.mediawiki 2009-10-06 18:19:12.204806000 +0200
@@ -10,7 +10,7 @@ Tasks completed so far:
To test it do the following:
@@ -1202,9 +1633,9 @@ diff -pruN eclipse-3.5.1/README.mediawiki eclipse-3.5.1.new/README.mediawiki
\ Kein Zeilenumbruch am Dateiende.
+* working Eclipse SDK 3.5.1 build in build/(build Id)/installation directory
\ Kein Zeilenumbruch am Dateiende.
-diff -pruN eclipse-3.5.1/runtests.sh eclipse-3.5.1.new/runtests.sh
---- eclipse-3.5.1/runtests.sh 2009-10-06 00:36:21.000000000 +0200
-+++ eclipse-3.5.1.new/runtests.sh 2009-10-07 21:52:38.667578000 +0200
+diff -pruN a/runtests.sh b/runtests.sh
+--- a/runtests.sh 2009-10-06 00:36:21.000000000 +0200
++++ b/runtests.sh 2009-10-07 21:52:38.667578000 +0200
@@ -102,35 +102,6 @@ function init() {
fi
}
@@ -1285,9 +1716,9 @@ diff -pruN eclipse-3.5.1/runtests.sh eclipse-3.5.1.new/runtests.sh
-cleanupXvnc
\ Kein Zeilenumbruch am Dateiende.
+cleanupXvnc
-diff -pruN eclipse-3.5.1/swt_bundle.sh eclipse-3.5.1.new/swt_bundle.sh
---- eclipse-3.5.1/swt_bundle.sh 1970-01-01 01:00:00.000000000 +0100
-+++ eclipse-3.5.1.new/swt_bundle.sh 2009-10-07 21:42:51.829624000 +0200
+diff -pruN a/swt_bundle.sh b/swt_bundle.sh
+--- a/swt_bundle.sh 1970-01-01 01:00:00.000000000 +0100
++++ b/swt_bundle.sh 2009-10-07 21:42:51.829624000 +0200
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
diff --git a/debian/patches/fix-perm.patch b/debian/patches/fix-perm.patch
index 998243b..508522a 100644
--- a/debian/patches/fix-perm.patch
+++ b/debian/patches/fix-perm.patch
@@ -1,17 +1,17 @@
Description: fix permission for ant executable files
Author: Benjamin Drung <bdrung at ubuntu.com>
-diff -pruN eclipse-3.5.1.new/build.xml eclipse-3.5.1.new2/build.xml
---- eclipse-3.5.1.new/build.xml 2009-10-07 12:58:41.618257000 +0200
-+++ eclipse-3.5.1.new2/build.xml 2009-10-07 13:49:10.077765545 +0200
-@@ -682,6 +682,10 @@
- <mkdir dir="${destDir}${prefix}/bin" />
- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
+diff -pruN a/build.xml b/build.xml
+--- a/build.xml 2009-10-12 21:46:39.598436279 +0200
++++ b/build.xml 2009-10-12 21:59:14.677936277 +0200
+@@ -708,6 +708,10 @@
+ <symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
+
+ <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins" />
+ <!-- fix permissions -->
+ <chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/ant" />
+ <chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/antRun" />
+ <chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/*.pl" />
</target>
- </project>
+ <target name="package.extract.swt">
diff --git a/debian/patches/libgnomeproxy.patch b/debian/patches/libgnomeproxy.patch
index 09080a3..c8da9d3 100644
--- a/debian/patches/libgnomeproxy.patch
+++ b/debian/patches/libgnomeproxy.patch
@@ -1,5 +1,9 @@
---- a/build.xml 2009-10-12 17:24:57.233753051 +0200
-+++ b/build.xml 2009-10-12 17:27:50.017755737 +0200
+Description: Patch to only rebuild libgnomeproxy on supported archs (to be send upstream).
+Author: Niels Thykier <niels at thykier.net>
+
+diff -pruN a/build.xml b/build.xml
+--- a/build.xml 2009-10-12 18:11:01.279223000 +0200
++++ b/build.xml 2009-10-12 21:46:39.598436279 +0200
@@ -50,6 +50,9 @@
</or>
</and>
@@ -10,7 +14,7 @@
<target name="setLib64Dir" if="setLib64">
<property name="libDir" value="lib64" />
-@@ -285,8 +288,14 @@
+@@ -291,8 +294,14 @@
<echo file="testsbuild-stamp" />
</target>
@@ -26,16 +30,16 @@
<delete verbose="true">
<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
<include name="eclipse" />
-@@ -294,7 +303,7 @@
+@@ -300,7 +309,7 @@
<fileset dir="${buildDirectory}">
<include name="**/*.so" />
</fileset>
- </delete>-->
+ </delete>
- <ant antfile="build.xml"
- target="build.nativeLibraries"
- dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
-@@ -317,14 +326,7 @@
+ <ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
+
+ <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
+@@ -321,14 +330,7 @@
<exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
</move>
diff --git a/debian/patches/series b/debian/patches/series
index a985a27..83c007e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
eclipse-build.patch
-fix-perm.patch
-symlink.patch
libgnomeproxy.patch
+fix-perm.patch
diff --git a/debian/patches/symlink.patch b/debian/patches/symlink.patch
deleted file mode 100644
index f09bde2..0000000
--- a/debian/patches/symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Patch to generate the "startup.jar" symlink using the upstream code. Sent upstream!
-Author: Niels Thykier <niels at thykier.net>
-
-Index: build.xml
-===================================================================
---- a/build.xml (revision 23414)
-+++ b/build.xml (working copy)
-@@ -683,6 +683,14 @@
- <!-- eclipse binary -->
- <mkdir dir="${destDir}${prefix}/bin" />
- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
-+ <!-- Create the "startup.jar" symlink -->
-+ <exec executable="/bin/sh" dir="${destDir}${prefix}/${libDir}/eclipse" outputproperty="eclipse.launcher.jar.path"
-+ failonerror="true" >
-+ <arg value="-c" />
-+ <arg value="echo plugins/org.eclipse.equinox.launcher_*" />
-+ </exec>
-+ <symlink link="${destDir}${prefix}/${libDir}/eclipse/startup.jar" resource="${eclipse.launcher.jar.path}" />
-+
- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
- </target>
-
diff --git a/debian/rules b/debian/rules
index 9a05164..d1849d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,4 +150,4 @@ debian-install-stamp:
fi ;\
done
# Correct the profile in config.ini - else eclipse will refuse to open the update/install menus.
- sed -i 's/SDKProfile/PlatformProfile/' "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
\ No newline at end of file
+ sed -i 's/SDKProfile/PlatformProfile/' "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list