[jbosstools-commits] JBoss Tools SVN: r29626 - trunk/build/target-platform.

Author: nickboldt Date: 2011-03-08 17:53:05 -0500 (Tue, 08 Mar 2011) New Revision: 29626 Modified: trunk/build/target-platform/build.xml Log: add jbds target for default creation of jbds.target -> ./JBDS_REPO on local Modified: trunk/build/target-platform/build.xml =================================================================== --- trunk/build/target-platform/build.xml 2011-03-08 22:53:05 UTC (rev 29625) +++ trunk/build/target-platform/build.xml 2011-03-08 22:53:05 UTC (rev 29626) @@ -73,6 +73,10 @@ To run for JBDS target file instead of JBT target files, pass in alternate target file and resulting repo path: $ ant -DtargetFile=jbds.target -DrepoDir=${WORKINGDIR}/JBDS_REPO/ + +Or, simply call the jbds target, to use the defaults in the previous example: + + $ ant jbds </echo> </target> @@ -85,9 +89,16 @@ <!-- to install from the target platform repo, first build the repo, then install using p2.director --> <target name="install" depends="build.local.target.platform.repo, install.local.target.platform.repo" /> - <target name="build.local.target.platform.repo" - depends="init, get.arch, get.eclipse, gen.p2mirror.script, run.p2mirror.script, update.target.file, cleanup" /> + <target name="jbds" description="default local build of jbds.target in ./JBDS_REPO/" depends="init"> + <var name="targetFile" unset="true" /> + <var name="targetFile" value="jbds.target" /> + <var name="repoDir" unset="true" /> + <var name="repoDir" value="${WORKINGDIR}/JBDS_REPO" /> + <antcall target="build.local.target.platform.repo" /> + </target> + <target name="build.local.target.platform.repo" depends="init, get.arch, get.eclipse, gen.p2mirror.script, run.p2mirror.script, update.target.file, cleanup" /> + <!-- ********************************************************************************** --> <target name="init"> @@ -209,8 +220,7 @@ </exec> </target> - <target name="test.local.target.platform.installed.base" - description="test target platform completeness by running a build against its installed eclipse base - Dtycho.targetPlatform to be removed in Tycho 0.11 so this test is deprecated"> + <target name="test.local.target.platform.installed.base" description="test target platform completeness by running a build against its installed eclipse base - Dtycho.targetPlatform to be removed in Tycho 0.11 so this test is deprecated"> <!-- <exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}"> <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}" /> @@ -231,24 +241,9 @@ <sequential> <var name="feature.jarfile" unset="true" /> <var name="feature.id" unset="true" /> - <propertyregex property="feature.jarfile" - defaultvalue="@{featureJar}" - input="@{featureJar}" - regexp=".+/features/([^/]+\.jar)" - replace="\1" - override="true" /> - <propertyregex property="feature.id" - defaultvalue="${feature.jarfile}" - input="${feature.jarfile}" - regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar" - replace="\1" - override="true" /> - <propertyregex property="feature.id" - defaultvalue="${feature.id}" - input="${feature.id}" - regexp="([^_]+)_(\d+\.\d+\.\d+)\.jar" - replace="\1" - override="true" /> + <propertyregex property="feature.jarfile" defaultvalue="@{featureJar}" input="@{featureJar}" regexp=".+/features/([^/]+\.jar)" replace="\1" override="true" /> + <propertyregex property="feature.id" defaultvalue="${feature.jarfile}" input="${feature.jarfile}" regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar" replace="\1" override="true" /> + <propertyregex property="feature.id" defaultvalue="${feature.id}" input="${feature.id}" regexp="([^_]+)_(\d+\.\d+\.\d+)\.jar" replace="\1" override="true" /> <var name="install" value="${install},${feature.id}.feature.group" /> <var name="feature.jarfile" unset="true" /> <var name="feature.id" unset="true" />