Author: nickboldt
Date: 2011-03-03 16:00:30 -0500 (Thu, 03 Mar 2011)
New Revision: 29476
Modified:
trunk/build/target-platform/build.xml
Log:
make path used to expand Eclipse unique so that 3.6 and 3.7 don't overlap and crash
each other
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2011-03-03 20:59:44 UTC (rev 29475)
+++ trunk/build/target-platform/build.xml 2011-03-03 21:00:30 UTC (rev 29476)
@@ -155,9 +155,9 @@
</if>
<!-- purge previous eclipse install to avoid conflicts w/ Eclipse feature versions
-->
- <delete dir="${WORKINGDIR}/eclipse" includeemptydirs="true"
quiet="true" />
+ <delete dir="${WORKINGDIR}/eclipse-${eclipse.version}"
includeemptydirs="true" quiet="true" />
- <untar compression="gzip" dest="${WORKINGDIR}"
src="${WORKINGDIR}/${eclipse.file}" overwrite="true" />
+ <untar compression="gzip"
dest="${WORKINGDIR}/eclipse-${eclipse.version}"
src="${WORKINGDIR}/${eclipse.file}" overwrite="true" />
<!-- add 70M delta pack, eg.
http://download.eclipse.org/eclipse/downloads/drops/M20101006-0936/downlo...
-->
<!-- ONLY need deltapack if using -Dtycho.targetPlatform, which is now depredated
@@ -174,7 +174,7 @@
-->
<!-- make eclipse executable -->
- <chmod perm="+x" file="${WORKINGDIR}/eclipse/eclipse" />
+ <chmod perm="+x"
file="${WORKINGDIR}/eclipse-${eclipse.version}/eclipse/eclipse" />
</target>
@@ -185,7 +185,7 @@
<!-- /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data /tmp/workspace
-consolelog -application
org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml -Ddebug=true
-DfollowStrict=true -DrepoDir=/tmp/REPO/ -->
<target name="run.p2mirror.script" description="build target update
site using p2.mirror">
- <exec executable="${WORKINGDIR}/eclipse/eclipse"
dir="${basedir}">
+ <exec
executable="${WORKINGDIR}/eclipse-${eclipse.version}/eclipse/eclipse"
dir="${basedir}">
<arg line=" -nosplash -data ${tmpdir}/workspace -consolelog -application
org.eclipse.ant.core.antRunner" />
<arg line=" -f ${targetFile}.p2mirror.xml -DfollowStrict=true
-DrepoDir=${repoDir}" />
<arg line=" -Ddebug=true" />