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, upstream-3.6 has been updated
       via  264e65a60e8df23aa0b76d0664da9608fa048ba0 (commit)
      from  1676b59c23e8593a3f17a5da19af2d73bb29d53a (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 264e65a60e8df23aa0b76d0664da9608fa048ba0
Author: Benjamin Drung <[email protected]>
Date:   Thu Aug 19 02:09:20 2010 +0200

    Import eclipse-build trunk branch (revision 25368).

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   24 ++
 build.xml                                          |  334 ++++++++++++++++++--
 jdtdependencies.properties                         |    1 +
 ...properties => jdtnonosgidependencies.properties |    0
 sdkdependencies.properties                         |    1 -
 5 files changed, 337 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7840f1..c3bd975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2010-08-17  Andrew Overholt  <[email protected]>
+
+       * build.xml: Use ${label} instead of "3.5.2" for SWT JAR
+       symlinks.  Pass in profile to use when installing.  Further
+       clean installation of build path references.  Apply patch from
+       Benjamin Drung to clean up some of these references (bug
+       #322283).
+
+2010-08-17  Andrew Overholt  <[email protected]>
+
+       Bug #294114
+
+       * build.xml: New target 'provisionSDKinDropins' which copies JDT
+       and SDK into the dropins directory of the installation.  New
+       target 'installPlatformAndCVS' which wraps provision.cvs and
+       install.
+       * jdtnonosgidependencies.properties: Re-name from
+       sdknonosgidependencies.properties.
+       * sdknonosgidependencies.properties: Renamed.
+       * jdtdependencies.properties: New file.  OSGi dependencies
+       present in the JDT but not the Platform.
+       * sdkdependencies.properties: Move JDT bits to
+       jdtdependencies.properties.
+
 2010-08-11  Andrew Overholt  <[email protected]>
 
        * build.xml: Make symlink to eclipse.ini absolute again to
diff --git a/build.xml b/build.xml
index 74ade9e..38dc64f 100644
--- a/build.xml
+++ b/build.xml
@@ -45,6 +45,7 @@
        <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" />
+       <uptodate property="provisionSDKinDropins.complete" 
srcfile="build-stamp" targetfile="provisionSDKinDropins-stamp" />
        <available file="bootstrap/plugins" property="bootstrapped" 
value="true" />
 
        <property name="topBuildDir" value="${basedir}/build" />
@@ -343,8 +344,9 @@
        <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}/jdtdependencies.properties" 
topLevelDir="${buildDirectory}/plugins" 
manifests="${basedir}/dependencyManifests" />
+               <symlinkNonOSGiJars 
dependencies="${basedir}/jdtnonosgidependencies.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="" />
@@ -665,6 +667,9 @@
                        <param name="profileName" value="PlatformProfile" />
                </antcall>
 
+               <!-- Re-symlink system JARs -->
+               <symlinkInstalledOSGiJars 
dependencies="${basedir}/dependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+               <symlinkNonOSGiJars 
dependencies="${basedir}/nonosgidependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
                <echo file="provision.platform-stamp" />
        </target>
 
@@ -677,6 +682,9 @@
                        <param name="profileName" value="PlatformProfile" />
                </antcall>
 
+               <!-- Re-symlink system JARs -->
+               <symlinkInstalledOSGiJars 
dependencies="${basedir}/dependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+               <symlinkNonOSGiJars 
dependencies="${basedir}/nonosgidependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
                <echo file="provision.cvs-stamp" />
        </target>
 
@@ -696,8 +704,11 @@
                <symlink link="${provisionDir}/plugins/${junit4jar.path}" 
resource="${junit4JarLocation}" />
 
                <!-- Re-symlink system JARs -->
+               <symlinkInstalledOSGiJars 
dependencies="${basedir}/dependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+               <symlinkNonOSGiJars 
dependencies="${basedir}/nonosgidependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+               <symlinkInstalledOSGiJars 
dependencies="${basedir}/jdtdependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+               <symlinkNonOSGiJars 
dependencies="${basedir}/jdtnonosgidependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
                <symlinkInstalledOSGiJars 
dependencies="${basedir}/sdkdependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
-               <symlinkNonOSGiJars 
dependencies="${basedir}/sdknonosgidependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
 
                <echo file="provision.sdk-stamp" />
        </target>
@@ -721,10 +732,28 @@
                                <include 
name="org.eclipse.equinox.initializer*.jar" />
                        </fileset>
                </copy>
+       </target>
 
-               <!-- Re-symlink system JARs -->
-               <symlinkInstalledOSGiJars 
dependencies="${basedir}/dependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
-               <symlinkNonOSGiJars 
dependencies="${basedir}/nonosgidependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+       <target name="provision.installed" depends="p2prep">
+               <echo message="Installing into:  ${provisionDir}" />
+               <property name="directorToRun" value="${provisionDir}/eclipse" 
/>
+               <antcall target="run.installed.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="${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" />
+                       <param name="p2.ws" value="gtk" />
+                       <param name="p2.arch" value="${buildArch}" />
+                       <param name="p2.repo" value="${reposource}" />
+               </antcall>
+
+               <copy todir="${provisionDir}/plugins">
+                       <fileset 
dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
+                               <include 
name="org.eclipse.equinox.initializer*.jar" />
+                       </fileset>
+               </copy>
        </target>
 
        <target name="checkDebugAndVerbose">
@@ -844,32 +873,30 @@
                <chmod perm="ugo+rx" file="${directorToRun}" />
                <exec executable="${directorToRun}">
                        <arg line="-nosplash " />
-                       <arg line="-application org.eclipse.equinox.p2.director 
" />
-                       <arg line="-data ${buildworkspace} " />
                        <arg line="-consoleLog" />
+                       <arg line="-data ${buildworkspace} " />
+                       <arg line="-application org.eclipse.equinox.p2.director 
" />
                        <arg line="-flavor ${p2.flavor}" />
                        <arg line="-installIU ${p2.director.installIU}" />
-                       <arg line="-p2.os ${p2.os}" />
-                       <arg line="-p2.ws ${p2.ws}" />
-                       <arg line="-p2.arch ${p2.arch}" />
-                       <arg line="-roaming" />
-                       <arg line="-profile ${p2.director.profile}" />
                        <arg line="${p2.director.extraArgs}" />
                        <arg line="-metadatarepository file:${p2.repo}" />
                        <arg line="-artifactrepository file:${p2.repo}" />
-                       <arg line="-destination ${p2.director.install.path}" />
-                       <arg line="-bundlepool ${p2.director.install.path}" />
-                       <arg line="-vmargs" />
-                       <arg 
line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
-                       <arg line="-Declipse.p2.MD5Check=false" />
-                       <arg line="-declipse.p2.profi...@none" />
-                       <arg 
line="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=" />
-                       <arg 
line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
-                       <arg line="-propertyfile ${basedir}/build.properties " 
/>
                </exec>
        </target>
 
        <target name="install" depends="provision.sdk">
+               <antcall target="installIntoDestDir">
+                       <param name="profile" value="SDKProfile" />
+               </antcall>
+       </target>
+
+       <target name="installSDKinDropins" depends="provisionSDKinDropins">
+               <antcall target="installIntoDestDir">
+                       <param name="profile" value="PlatformProfile" />
+               </antcall>
+       </target>
+
+       <target name="installIntoDestDir">
                <mkdir dir="${installationDir}" />
                <exec executable="cp" failonerror="true">
                        <arg value="-rd" />
@@ -899,7 +926,7 @@
                <!-- Create the "swt.jar" and friends symlinks  -->
                <fileset dir="${installationDir}/plugins" 
includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
                <property name="swtjarpath" refid="swtjar" />
-               <symlink link="${installationDir}/swt-gtk-3.5.2.jar" 
resource="plugins/${swtjarpath}" />
+               <symlink link="${installationDir}/swt-gtk-${label}.jar" 
resource="plugins/${swtjarpath}" />
                <symlink link="${installationDir}/swt-gtk.jar" 
resource="plugins/${swtjarpath}" />
                <symlink link="${installationDir}/swt.jar" 
resource="plugins/${swtjarpath}" />
 
@@ -933,8 +960,64 @@
                <delete includeemptydirs="true" verbose="true">
                        <fileset dir="${installationDir}/configuration" 
includes="*.log" />
                        <fileset dir="${installationDir}/configuration" 
includes="**/data/**" />
+                       <fileset dir="${installationDir}/configuration" 
includes="org.eclipse.update/**" />
+               </delete>
+               
+               <!-- Fix paths in p2 data -->
+               <delete includeemptydirs="true" failonerror="false">
+                       <fileset 
dir="${installationDir}/p2/org.eclipse.equinox.p2.core" includes="cache/**" />
                </delete>
 
+               <property name="profileDir" 
value="p2/org.eclipse.equinox.p2.engine/profileRegistry/${profile}.profile" />
+               
+               <!-- Strip some build artifacts from installation -->
+               <exec executable="sed" inputstring="${destDir}" 
outputproperty="destDirWithUnderscores" failonerror="true">
+                       <arg value="s@/@_...@g" />
+               </exec>
+
+               <exec executable="sed" inputstring="${reposource}" 
outputproperty="reposourceWithUnderscores" failonerror="true">
+                       <arg value="s@/@_...@g" />
+               </exec>
+               <exec executable="sed" inputstring="${provisionDir}" 
outputproperty="provisionDirWithUnderscores" failonerror="true">
+                       <arg value="s@/@_...@g" />
+               </exec>
+               <apply executable="sed" failonerror="true" verbose="true">
+                       <arg value="-i" />
+                       <arg 
value="\...@${destdir}@d;\...@${destdirwithunderscores}@d;\...@${reposourcewithunderscores}@d;\...@${provisiondirwithunderscores}@d"
 />
+                       <srcfile />
+                       <fileset dir="${installationDir}">
+                               <include name="metadata/content.xml" />
+                               <include 
name="p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs"
 />
+                               <include 
name="p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs"
 />
+                               <include 
name="${profileDir}/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs"
 />
+                               <include 
name="${profileDir}/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs"
 />
+                               <include name="eclipse.ini" />
+                       </fileset>
+               </apply>
+
+               <!-- Clean up profile files -->
+               <echo message="${provisionDir}"/>
+               <apply executable="gunzip" failonerror="true" verbose="true">
+                       <srcfile />
+                       <fileset dir="${installationDir}/${profileDir}">
+                               <include name="*.gz" />
+                       </fileset>
+               </apply>
+               <apply executable="sed" failonerror="true" verbose="true">
+                       <arg value="-i" />
+                       <arg 
value="s...@${provisiondir}@${installationd...@g;s...@${installationdir}@${prefix}/${libDir}/ecli...@g"
 />
+                       <srcfile />
+                       <fileset dir="${installationDir}/${profileDir}">
+                               <include name="*.profile" />
+                       </fileset>
+               </apply>
+               <apply executable="gzip" failonerror="true" verbose="true">
+                       <srcfile />
+                       <fileset dir="${installationDir}/${profileDir}">
+                               <include name="*.profile" />
+                       </fileset>
+               </apply>
+               
                <!-- Move config file to /etc -->
                <mkdir dir="${destDir}/etc" />
                <move file="${installationDir}/eclipse.ini" 
tofile="${destDir}/etc/eclipse.ini" />
@@ -950,6 +1033,213 @@
                <echo message="Installing Eclipse Platform and CVS feature" />
        </target>
 
+       <target name="provisionSDKinDropins" depends="provision.cvs" 
unless="provisionSDKinDropins.complete">
+               <property name="platformAndCVSInstallation" 
value="${provisionDir}.cvs"/>
+               
+               <property name="jdtDropinsName" value="jdt"/>
+               <property name="sdkDropinsName" value="sdk"/>
+
+               <property name="jdtDropinsDir" 
value="${provisionDir}/dropins/${jdtDropinsName}"/>
+               <property name="sdkDropinsDir" 
value="${provisionDir}/dropins/${sdkDropinsName}"/>
+
+               <!-- make a copy of the clean platform+CVS installation -->
+               <exec executable="cp" failonerror="true">
+                       <arg value="-rd" />
+                       <arg value="--no-target-directory" />
+                       <arg value="${provisionDir}" />
+                       <arg value="${platformAndCVSInstallation}" />
+               </exec>
+               
+               <!-- Install SDK -->
+               <property name="sdkInstallation" value="${provisionDir}.sdk"/>
+               <antcall target="provision.installed">
+                       <param name="p2.director.installIU" 
value="org.eclipse.sdk.feature.group" />
+                       <param name="profileName" value="PlatformProfile" />
+               </antcall>
+               <!-- make a copy of the entire SDK installation -->
+               <move file="${provisionDir}"
+                       tofile="${sdkInstallation}"/>
+               <!-- restore clean platform+CVS installation -->
+               <exec executable="cp" failonerror="true">
+                       <arg value="-rd" />
+                       <arg value="--no-target-directory" />
+                       <arg value="${platformAndCVSInstallation}" />
+                       <arg value="${provisionDir}" />
+               </exec>
+               
+               <!-- Install JDT -->
+               <property name="jdtInstallation" value="${provisionDir}.jdt"/>
+               <antcall target="provision.installed">
+                       <param name="p2.director.installIU" 
value="org.eclipse.jdt.feature.group" />
+                       <param name="profileName" value="PlatformProfile" />
+               </antcall>
+               <!-- rename JDT installation directory -->
+               <move file="${provisionDir}"
+                       tofile="${jdtInstallation}"/>
+               <!-- make a copy of the JDT installation -->
+               <exec executable="cp" failonerror="true">
+                       <arg value="-rd" />
+                       <arg value="--no-target-directory" />
+                       <arg value="${jdtInstallation}" />
+                       <arg value="${jdtInstallation}.orig" />
+               </exec>
+               
+               <!-- restore clean platform+CVS installation -->
+               <exec executable="cp" failonerror="true">
+                       <arg value="-rd" />
+                       <arg value="--no-target-directory" />
+                       <arg value="${platformAndCVSInstallation}" />
+                       <arg value="${provisionDir}" />
+               </exec>
+               
+               <!-- diff of platform+CVS and JDT goes into 
platform+CVS/dropins/jdt -->
+               <antcall target="moveNewStuffToDropins">
+                       <param name="orig" value="${provisionDir}" />
+                       <param name="new" value="${jdtInstallation}" />
+                       <param name="dropinsDir" value="${jdtDropinsName}" />
+               </antcall>
+               
+               <!-- restore clean JDT installation -->
+               <delete dir="${jdtInstallation}" />
+               <move file="${jdtInstallation}.orig"
+                       tofile="${jdtInstallation}"/>
+               
+               <!-- diff of JDT and SDK ... -->
+               <antcall target="moveNewStuffToDropins">
+                       <param name="orig" value="${jdtInstallation}" />
+                       <param name="new" value="${sdkInstallation}" />
+                       <param name="dropinsDir" value="${sdkDropinsName}" />
+               </antcall>
+               <!-- ... goes into platform+CVS/dropins/pde -->
+               <move file="${jdtInstallation}/dropins/${sdkDropinsName}"
+                       todir="${provisionDir}/dropins"/>
+               
+               <!-- Re-symlink system JARs -->
+               <fileset id="junit4.jar" dir="${jdtDropinsDir}/plugins">
+                       <include name="**/org.junit4_**/junit.jar" />
+               </fileset>
+               <property name="junit4jar.path" refid="junit4.jar" />
+
+               <delete file="${jdtDropinsDir}/plugins/${junit4jar.path}" />
+               <symlink link="${jdtDropinsDir}/plugins/${junit4jar.path}" 
resource="${junit4JarLocation}" />
+
+               <symlinkInstalledOSGiJars 
dependencies="${basedir}/dependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+               <symlinkNonOSGiJars 
dependencies="${basedir}/nonosgidependencies.properties" 
topLevelDir="${provisionDir}/plugins" />
+               
+               <symlinkInstalledOSGiJars 
dependencies="${basedir}/jdtdependencies.properties" 
topLevelDir="${jdtDropinsDir}/plugins" />
+               <symlinkNonOSGiJars 
dependencies="${basedir}/jdtnonosgidependencies.properties" 
topLevelDir="${jdtDropinsDir}/plugins" />
+               
+               <symlinkInstalledOSGiJars 
dependencies="${basedir}/sdkdependencies.properties" 
topLevelDir="${sdkDropinsDir}/plugins" />
+               
+               <delete dir="${platformAndCVSInstallation}" />
+               <delete dir="${jdtInstallation}" />
+               <delete dir="${sdkInstallation}" />
+
+               <echo file="provisionSDKinDropins-stamp" />
+       </target>
+
+       <target name="moveNewStuffToDropins">
+               <property name="dropinsDirectory" 
value="${orig}/dropins/${dropinsDir}" />
+               <property name="filesToMove" 
value="${topBuildDir}/filesToMove"/>
+               <property name="dirsToMove" value="${topBuildDir}/dirsToMove"/>
+
+               <property name="origFeaturesFile" 
value="${topBuildDir}/origFeatures"/>
+               <property name="newFeaturesFile" 
value="${topBuildDir}/newFeatures"/>
+               <property name="featureDifferencesFile" 
value="${topBuildDir}/featuresToMove.diff"/>
+               <property name="featuresToMoveFile" 
value="${topBuildDir}/featuresToMove"/>
+
+               <property name="origPluginsFile" 
value="${topBuildDir}/origPlugins"/>
+               <property name="newPluginsFile" 
value="${topBuildDir}/newPlugins"/>
+               <property name="pluginDifferencesFile" 
value="${topBuildDir}/pluginsToMove.diff"/>
+               <property name="pluginsToMoveFile" 
value="${topBuildDir}/pluginsToMove"/>
+               
+               <!-- features -->
+               <exec executable="ls" output="${origFeaturesFile}">
+                       <arg line="-1 ${orig}/features" />
+               </exec>
+               <exec executable="ls" output="${newFeaturesFile}">
+                       <arg line="-1 ${new}/features" />
+               </exec>
+               <exec executable="diff" output="${featureDifferencesFile}">
+                       <arg line="-u ${origFeaturesFile} ${newFeaturesFile}" />
+               </exec>
+               <exec executable="sed" output="${featuresToMoveFile}">
+                       <arg line="-n '/^+o/p' ${featureDifferencesFile}" />
+               </exec>
+               <exec executable="sed">
+                       <arg line="-i 's/^+//' ${featuresToMoveFile}" />
+               </exec>
+               
+               <!-- FIXME:  this assumes all features are directories -->
+               <copy file="${featuresToMoveFile}" tofile="${filesToMove}"/>
+               <copy file="${featuresToMoveFile}" tofile="${dirsToMove}"/>
+               <exec executable="sed">
+                       <arg line="-i '/.jar$/d' ${dirsToMove}" />
+               </exec>
+               <exec executable="sed">
+                       <arg line="-i 's/$/\/**/' ${dirsToMove}" />
+               </exec>
+               <exec executable="sed">
+                       <arg line="-i '/.jar$/!d' ${filesToMove}" />
+               </exec>
+
+               <mkdir dir="${dropinsDirectory}/features" />
+               <move todir="${dropinsDirectory}/features">
+                       <fileset dir="${new}/features" 
includesfile="${dirsToMove}"/>
+               </move>
+
+               <delete file="${origFeaturesFile}"/>
+               <delete file="${newFeaturesFile}"/>
+               <delete file="${featuresToMoveFile}"/>
+               <delete file="${featureDifferencesFile}"/>
+               <delete file="${filesToMove}"/>
+               <delete file="${dirsToMove}"/>          
+
+               <!-- plugins -->
+               <exec executable="ls" output="${origPluginsFile}">
+                       <arg line="-1 ${orig}/plugins" />
+               </exec>
+               <exec executable="ls" output="${newPluginsFile}">
+                       <arg line="-1 ${new}/plugins" />
+               </exec>
+               <exec executable="diff" output="${pluginDifferencesFile}">
+                       <arg line="-u ${origPluginsFile} ${newPluginsFile}" />
+               </exec>
+               <exec executable="sed" output="${pluginsToMoveFile}">
+                       <arg line="-n '/^+o/p' ${pluginDifferencesFile}" />
+               </exec>
+               <exec executable="sed">
+                       <arg line="-i 's/^+//' ${pluginsToMoveFile}" />
+               </exec>
+               
+               <copy file="${pluginsToMoveFile}" tofile="${filesToMove}"/>
+               <copy file="${pluginsToMoveFile}" tofile="${dirsToMove}"/>
+               <exec executable="sed">
+                       <arg line="-i '/.jar$/d' ${dirsToMove}" />
+               </exec>
+               <exec executable="sed">
+                       <arg line="-i 's/$/\/**/' ${dirsToMove}" />
+               </exec>
+               <exec executable="sed">
+                       <arg line="-i '/.jar$/!d' ${filesToMove}" />
+               </exec>
+               
+               <mkdir dir="${dropinsDirectory}/plugins" />
+               <move todir="${dropinsDirectory}/plugins">
+                       <fileset dir="${new}/plugins" 
includesfile="${dirsToMove}"/>
+               </move>
+               <move todir="${dropinsDirectory}/plugins">
+                       <fileset dir="${new}/plugins" 
includesfile="${filesToMove}"/>
+               </move>
+
+               <delete file="${origPluginsFile}"/>
+               <delete file="${newPluginsFile}"/>
+               <delete file="${pluginsToMoveFile}"/>
+               <delete file="${pluginDifferencesFile}"/>
+               <delete file="${filesToMove}"/>
+               <delete file="${dirsToMove}"/>
+       </target>
+
        <target name="package.extract.swt">
                <exec executable="./swt_bundle.sh" failOnError="true">
                        <arg value="${eclipse.rcp.package.root}" />
diff --git a/jdtdependencies.properties b/jdtdependencies.properties
new file mode 100644
index 0000000..22a74d2
--- /dev/null
+++ b/jdtdependencies.properties
@@ -0,0 +1 @@
+org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
diff --git a/sdknonosgidependencies.properties 
b/jdtnonosgidependencies.properties
similarity index 100%
rename from sdknonosgidependencies.properties
rename to jdtnonosgidependencies.properties
diff --git a/sdkdependencies.properties b/sdkdependencies.properties
index 05f528b..04a33b2 100644
--- a/sdkdependencies.properties
+++ b/sdkdependencies.properties
@@ -1,2 +1 @@
-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


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to