Author: nickboldt Date: 2010-11-10 01:14:53 -0500 (Wed, 10 Nov 2010) New Revision: 26398 Modified: trunk/build/target-platform/README.txt trunk/build/target-platform/build.xml trunk/build/target-platform/jbds.target.p2mirror.xml trunk/build/target-platform/multiple.target trunk/build/target-platform/multiple.target.p2mirror.xml trunk/build/target-platform/target2p2mirrorXml.xsl trunk/build/target-platform/targetUpdateFromRepo.xml Log: add missing prefix // on file: URLs Modified: trunk/build/target-platform/README.txt =================================================================== --- trunk/build/target-platform/README.txt 2010-11-10 06:14:41 UTC (rev 26397) +++ trunk/build/target-platform/README.txt 2010-11-10 06:14:53 UTC (rev 26398) @@ -44,7 +44,7 @@ but a local path reference is faster. 2. So, continuing from previous HOWTO, copy from /tmp/mutiple.target into - file://home/hudson/static_build_env/jbds/target-platform/mutiple.target/ + file:///home/hudson/static_build_env/jbds/target-platform/mutiple.target/ rsync -aPrz --delete /tmp/mutiple.target/* \ /home/hudson/static_build_env/jbds/target-platform/mutiple.target/ & Modified: trunk/build/target-platform/build.xml =================================================================== --- trunk/build/target-platform/build.xml 2010-11-10 06:14:41 UTC (rev 26397) +++ trunk/build/target-platform/build.xml 2010-11-10 06:14:53 UTC (rev 26398) @@ -196,10 +196,10 @@ <target name="test.local.target.platform.repo" description="test target platform completeness by running a build against its update site"> <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}" /> + <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}" /> + <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> @@ -207,7 +207,7 @@ 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}" /> + <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" /> @@ -255,7 +255,7 @@ <antcall target="run.director"> <param name="p2.director.installIU" value="${install}" /> <param name="p2.director.install.path" value="${WORKINGDIR}/eclipse" /> - <param name="p2.director.input.repo" value="file:/${repoDir}/" /> + <param name="p2.director.input.repo" value="file://${repoDir}/" /> </antcall> </target> @@ -263,7 +263,7 @@ <property name="p2.director.extraArgs" value="" /> <property name="p2.director.installIU" value="${install}" /> <property name="p2.director.install.path" value="${targetDir}" /> - <property name="p2.director.input.repo" value="jar:file:${sourceZip}!/" /> + <property name="p2.director.input.repo" value="jar:file://${sourceZip}!/" /> <echo> Source Repo(s): ${p2.director.input.repo} Install Path: ${p2.director.install.path} @@ -284,8 +284,8 @@ <arg line=" -destination ${p2.director.install.path}" /> <arg line=" -bundlepool ${p2.director.install.path}" /> <arg line=" -installIU ${p2.director.installIU}" /> - <arg line=" -metadataRepository ${p2.director.input.repo},file:${p2.director.install.path}/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile" /> - <arg line=" -artifactRepository ${p2.director.input.repo},file:${p2.director.install.path}" /> + <arg line=" -metadataRepository ${p2.director.input.repo},file://${p2.director.install.path}/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile" /> + <arg line=" -artifactRepository ${p2.director.input.repo},file://${p2.director.install.path}" /> <arg line=" -profileProperties org.eclipse.update.install.features=true" /> <arg line=" -vmargs" /> <arg line=" -Declipse.p2.data.area=${p2.director.install.path}/p2" /> Modified: trunk/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/jbds.target.p2mirror.xml 2010-11-10 06:14:41 UTC (rev 26397) +++ trunk/build/target-platform/jbds.target.p2mirror.xml 2010-11-10 06:14:53 UTC (rev 26398) @@ -25,7 +25,7 @@ <property value="false" name="verbose"/> <property value="false" name="followStrict"/> <echo level="info">Download features/plugins into ${repoDir}</echo> -<p2.mirror verbose="${verbose}" destination="file:${repoDir}"> +<p2.mirror verbose="${verbose}" destination="file://${repoDir}"> <slicingOptions followStrict="${followStrict}" includeFeatures="true"/> <source> <repository location="http://download.eclipse.org/releases/helios/"/> Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2010-11-10 06:14:41 UTC (rev 26397) +++ trunk/build/target-platform/multiple.target 2010-11-10 06:14:53 UTC (rev 26398) @@ -228,4 +228,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> +</target> \ No newline at end of file Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2010-11-10 06:14:41 UTC (rev 26397) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2010-11-10 06:14:53 UTC (rev 26398) @@ -25,7 +25,7 @@ <property value="false" name="verbose"/> <property value="false" name="followStrict"/> <echo level="info">Download features/plugins into ${repoDir}</echo> -<p2.mirror verbose="${verbose}" destination="file:${repoDir}"> +<p2.mirror verbose="${verbose}" destination="file://${repoDir}"> <slicingOptions followStrict="${followStrict}" includeFeatures="true"/> <source> <repository location="http://m2eclipse.sonatype.org/sites/m2e/"/> Modified: trunk/build/target-platform/target2p2mirrorXml.xsl =================================================================== --- trunk/build/target-platform/target2p2mirrorXml.xsl 2010-11-10 06:14:41 UTC (rev 26397) +++ trunk/build/target-platform/target2p2mirrorXml.xsl 2010-11-10 06:14:53 UTC (rev 26398) @@ -13,7 +13,7 @@ <xsl:param name="verbose" select="'${verbose}'" as="xs:string"/> <xsl:param name="followStrict" select="'${followStrict}'" as="xs:string"/> - <xsl:param name="destination" select="'file:${repoDir}'" as="xs:string"/> + <xsl:param name="destination" select="'file://${repoDir}'" as="xs:string"/> <xsl:template match="target"> <project name="Download target platform" default="download.target.platform"> Modified: trunk/build/target-platform/targetUpdateFromRepo.xml =================================================================== --- trunk/build/target-platform/targetUpdateFromRepo.xml 2010-11-10 06:14:41 UTC (rev 26397) +++ trunk/build/target-platform/targetUpdateFromRepo.xml 2010-11-10 06:14:53 UTC (rev 26398) @@ -14,7 +14,7 @@ <property name="unified.targetFile" value="unified.target" /> <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform/... /> <property name="local.targetFile" value="local.target" /> - <property name="local.URL" value="file:/${repoDir}" /> + <property name="local.URL" value="file://${repoDir}" /> <property name="tmpDir" value="${java.io.tmpdir}/targetUpdateFromRepo" />