4:37 p.m.
Author: objectiser
Date: 2010-03-06 17:37:56 -0500 (Sat, 06 Mar 2010)
New Revision: 187
Modified:
tools/eclipse/trunk/plugins/eclipse-build/build.properties
tools/eclipse/trunk/plugins/eclipse-build/pom.xml
tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml
Log:
Updated to remove local configuration paths.
Modified: tools/eclipse/trunk/plugins/eclipse-build/build.properties
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/build.properties 2010-03-06 22:12:20 UTC
(rev 186)
+++ tools/eclipse/trunk/plugins/eclipse-build/build.properties 2010-03-06 22:37:56 UTC
(rev 187)
@@ -40,8 +40,6 @@
buildDirectory=${base}/eclipse.build
baseLocation=${base}/eclipse
-eclipseDir=/home/gbrown/repositories/savara/tools-eclipse-trunk/plugins/eclipse-build/target
-
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
#baseos=win32
#basews=win32
Modified: tools/eclipse/trunk/plugins/eclipse-build/pom.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/pom.xml 2010-03-06 22:12:20 UTC (rev 186)
+++ tools/eclipse/trunk/plugins/eclipse-build/pom.xml 2010-03-06 22:37:56 UTC (rev 187)
@@ -28,7 +28,7 @@
<tasks>
<property name="eclipse.home"
value="target/eclipse" />
- <property name="localEclipseDrop"
value="${basedir}/local-eclipse-drop-mirror" />
+ <property name="localEclipseDrop"
value="${basedir}/../../../local-eclipse-drop-mirror" />
<delete failonerror="false"
dir="target/eclipse.build"/>
@@ -38,6 +38,7 @@
<ant target="setupLocalEclipse"
antfile="setupEclipse.xml">
<property name="localEclipseDrop"
value="${localEclipseDrop}" />
+ <property name="JAVA_HOME"
value="${env.JAVA_HOME}" />
</ant>
<java
jar="${eclipse.home}/plugins/org.eclipse.equinox.launcher_1.0.201.R35x_v20090715.jar"
Modified: tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml 2010-03-06 22:12:20 UTC
(rev 186)
+++ tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml 2010-03-06 22:37:56 UTC
(rev 187)
@@ -2,7 +2,8 @@
<property file="build.properties"/>
- <property name="localEclipseDrop"
value="${basedir}/local-eclipse-drop-mirror" />
+ <property name="localEclipseDrop"
value="${basedir}/../../../local-eclipse-drop-mirror" />
+ <property name="eclipseDir" value="${basedir}/target" />
<property name="dependenciesDir" value="${basedir}/dependencies"
/>
<!-- set the OS name, make sure each condition is mutally exclusive -->
@@ -51,6 +52,7 @@
</target>
<target name="getEclipseJar" depends="checkEclipseJar"
unless="skipGetEclipseJar">
+
<mkdir dir="${localEclipseDrop}/eclipse/${eclipseBuildRevision}" />
<get usetimestamp="true"
src="${eclipseURL}/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}"
@@ -88,6 +90,7 @@
</target>
<target name="checkEclipseJar">
+<echo>CHECK ECLIPSE JAR: ${localEclipseDrop} ${env.JAVA_HOME}</echo>
<available
file="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.zip"
property="skipGetEclipseJar" />
</target>
@@ -151,7 +154,7 @@
<property name="targetDir"
value="${eclipseDir}/eclipse"/>
<property name="install"
value="org.pi4soa.core.feature.feature.group"/>
<property name="eclipseDir" value="${eclipseDir}" />
- <property name="JAVA_HOME"
value="/home/gbrown/tools/jdk1.6.0_18" />
+ <property name="JAVA_HOME" value="${JAVA_HOME}" />
</ant>
</target>