Author: nickboldt Date: 2010-11-02 22:49:35 -0400 (Tue, 02 Nov 2010) New Revision: 26198 Modified: trunk/build/target-platform/build.xml Log: deprecate use of tycho.targetPlatform since it'll be removed in Tycho 0.11 (JBIDE-6982) Modified: trunk/build/target-platform/build.xml =================================================================== --- trunk/build/target-platform/build.xml 2010-11-03 00:24:36 UTC (rev 26197) +++ trunk/build/target-platform/build.xml 2010-11-03 02:49:35 UTC (rev 26198) @@ -50,7 +50,7 @@ There are also integration tests (will build JBT using platform repo or platform installed base): * test.local.target.platform.repo - * test.local.target.platform.installed.base + * test.local.target.platform.installed.base (deprecated) Thus, run script like this: @@ -63,7 +63,8 @@ <target name="all" depends="install"/> <!-- test target platform first by building against the target platform repo, then against the p2.dir-installed base --> - <target name="tests" depends="install, test.local.target.platform.repo, test.local.target.platform.installed.base"/> + <!-- target name="tests" depends="install, test.local.target.platform.repo, test.local.target.platform.installed.base" --> + <target name="tests" depends="install, test.local.target.platform.repo"/> <!-- 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" /> @@ -131,6 +132,7 @@ <untar compression="gzip" dest="${WORKINGDIR}" 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 <property name="deltapack.file" value="eclipse-${eclipse.version}-delta-pack.zip"/> <if> <not> @@ -141,6 +143,7 @@ </then> </if> <unzip src="${WORKINGDIR}/${deltapack.file}" dest="${WORKINGDIR}" overwrite="true"/> + --> <!-- make eclipse executable --> <chmod perm="+x" file="${WORKINGDIR}/eclipse/eclipse" /> @@ -178,13 +181,15 @@ </exec> </target> - <target name="test.local.target.platform.installed.base" description="test target platform completeness by running a build against its installed eclipse base"> + <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}" /> </exec> <exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}"> <arg line=" -f ../pom.xml clean install -B -U -fae -e -Dmaven.test.skip -Dtycho.targetPlatform=${WORKINGDIR}/eclipse" /> </exec> + --> </target> <target name="install.local.target.platform.repo" depends="init" description="use p2.director to install target platform into local eclipse">