Author: nickboldt
Date: 2010-10-07 14:56:12 -0400 (Thu, 07 Oct 2010)
New Revision: 25578
Modified:
trunk/build/target-platform/build.xml
trunk/build/target-platform/e361-wtp322.target
trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
Log:
add more TPTP features and parameterize target.platorm.URL
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2010-10-07 18:43:57 UTC (rev 25577)
+++ trunk/build/target-platform/build.xml 2010-10-07 18:56:12 UTC (rev 25578)
@@ -34,6 +34,8 @@
</condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from
parent when calling this script -->
+ <property name="repoDir" value="${WORKINGDIR}/REPO"/>
+
<target name="all" depends="build.local.target.platform.repo,
test.local.target.platform.repo"/>
<target name="build.local.target.platform.repo" depends="init,
get.arch, get.eclipse, gen.p2mirror.script, run.p2mirror.script, cleanup" />
@@ -100,7 +102,7 @@
<target name="run.p2mirror.script" description="build target update
site using p2.mirror">
<exec executable="${WORKINGDIR}/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=${WORKINGDIR}/REPO/" />
+ <arg line=" -f ${targetFile}.p2mirror.xml -DfollowStrict=true
-DrepoDir=${repoDir}" />
<arg line=" -Ddebug=true" />
</exec>
</target>
@@ -111,7 +113,10 @@
<target name="test.local.target.platform.repo" description="test
target platform completeness by running a build against it">
<exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
- <arg line=" -f ../pom.xml clean install -B -U -fae -e -P
helios-local-target,!helios -Dmaven.test.skip"/>
+ <arg line=" -f ../parent/pom.xml clean install -B -U -fae -e -P
helios-local-target,!helios -Dmaven.test.skip
-Dtarget.platorm.URL=file:/${repoDir}"/>
</exec>
+ <exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
+ <arg line=" -f ../pom.xml clean install -B -U -fae -e -P
helios-local-target,!helios -Dmaven.test.skip
-Dtarget.platorm.URL=file:/${repoDir}"/>
+ </exec>
</target>
</project>
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-10-07 18:43:57 UTC (rev 25577)
+++ trunk/build/target-platform/e361-wtp322.target 2010-10-07 18:56:12 UTC (rev 25578)
@@ -48,7 +48,11 @@
</location>
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
<unit version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"
id="org.eclipse.tptp.platform.profile.server.feature.group"/>
- <repository
location="http://download.eclipse.org/tptp/updates/"/>
+ <unit version="4.3.1.v201009092123-797908s73533D4H6D56"
id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+ <unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"
id="org.eclipse.tptp.platform.core.feature.group"/>
+ <unit version="4.5.1.v201009092123-797A18s73533L4F6D6D"
id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+ <unit version="4.5.1.v201009092123-7L7O8bBgJ9E99jAfGWEM"
id="org.eclipse.tptp.platform.trace.feature.group"/>
+ <repository
location="http://download.eclipse.org/tptp/updates/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
<unit version="2.6.1.v20100914-1218"
id="org.eclipse.emf.ecore.feature.group"/>
Modified: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-07 18:43:57 UTC
(rev 25577)
+++ trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-07 18:56:12 UTC
(rev 25578)
@@ -37,7 +37,7 @@
<repository
location="http://download.jboss.org/jbosstools/updates/requirements/...
<repository
location="http://download.jboss.org/jbosstools/updates/requirements/...
<repository
location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
-<repository
location="http://download.eclipse.org/tptp/updates/"/>
+<repository
location="http://download.eclipse.org/tptp/updates/helios/"/>
<repository
location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R...
<repository
location="http://download.eclipse.org/technology/swtbot/helios/dev-b...
<repository
location="http://download.eclipse.org/birt/update-site/2.6/"/>
@@ -58,6 +58,10 @@
<iu version=""
id="org.mozilla.xulrunner.feature.feature.group"/>
<iu version="" id="org.mozilla.xpcom.feature.feature.group"/>
<iu version=""
id="org.eclipse.tptp.platform.profile.server.feature.group"/>
+<iu version=""
id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+<iu version=""
id="org.eclipse.tptp.platform.core.feature.group"/>
+<iu version=""
id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+<iu version=""
id="org.eclipse.tptp.platform.trace.feature.group"/>
<iu version="" id="org.eclipse.emf.ecore.feature.group"/>
<iu version="" id="org.eclipse.emf.feature.group"/>
<iu version="" id="org.eclipse.emf.codegen.feature.group"/>