Trying to get the lowly build to work
diff --git a/org.eclipse.e4.builder/builder/general/ant-test.xml b/org.eclipse.e4.builder/builder/general/ant-test.xml
index 4ba52af..f09b7c2 100644
--- a/org.eclipse.e4.builder/builder/general/ant-test.xml
+++ b/org.eclipse.e4.builder/builder/general/ant-test.xml
@@ -1,4 +1,4 @@
-<project name="Build specific targets and properties" default="testTransform">
+<project name="Build specific targets and properties" default="fixMirror">
<property name="builddate" value="20090924"/>
<property name="buildtime" value="1515"/>
<property name="wstBuildDir" value="I-3.2I-20090910052601"/>
@@ -67,7 +67,6 @@
</target>
<target name="run.version.query">
- <delete dir="${base.builder}/configuration/.settings" includeemptydirs="true" failonerror="false" />
<exec executable="/opt/local/ibm-java2-i386-50/bin/java" failonerror="false" dir="${base.builder}" timeout="900000" output="${builder}/version.properties" error="/dev/null">
<arg line="-jar ${base.builder.launcher}" />
<arg line="-application org.eclipse.equinox.p2.director" />
@@ -78,4 +77,9 @@
</target>
+ <target name="fixMirror">
+ <p2.mirror source="http://download.eclipse.org/eclipse/updates/3.6-I-builds" destination="file:/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/old-helios-p2-mirrored">
+ <iu id="org.eclipse.help.base" version="3.4.100.v20090904"/>
+ </p2.mirror>
+ </target>
</project>
diff --git a/org.eclipse.e4.builder/builder/general/build.properties b/org.eclipse.e4.builder/builder/general/build.properties
index 7e7211c..309a30f 100644
--- a/org.eclipse.e4.builder/builder/general/build.properties
+++ b/org.eclipse.e4.builder/builder/general/build.properties
@@ -194,7 +194,7 @@
gefp2Repo=http://download.eclipse.org/tools/gef/updates/interim
#WST base URL. I must be used with the current I build to get the updateSite
-wstp2Repo=http://download.eclipse.org/webtools/downloads/drops/R3.2/${wstBuildDir}/updateSite
+wstp2Repo=http://download.eclipse.org/webtools/downloads/drops/R3.2.0/${wstBuildDir}/updateSite
#zipDir=/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/helios-zips
#eclipsep2Repo=file:${zipDir}/composite360.zip
diff --git a/org.eclipse.e4.builder/builder/general/customTargets.xml b/org.eclipse.e4.builder/builder/general/customTargets.xml
index dc6067c..e3dc34e 100644
--- a/org.eclipse.e4.builder/builder/general/customTargets.xml
+++ b/org.eclipse.e4.builder/builder/general/customTargets.xml
@@ -84,7 +84,7 @@
<target name="postSetup">
<antcall target="getBaseComponents" />
<echo message="Mirror from ${eclipsep2Repo} to ${transformedRepoLocation}-mirrored" />
- <p2.mirror destination="${transformedRepoLocation}-mirrored">
+ <!--p2.mirror destination="${transformedRepoLocation}-mirrored">
<source>
<repository location="${eclipsep2Repo}" />
</source>
@@ -92,10 +92,10 @@
<iu id="org.eclipse.sdk.feature.group"/>
<iu id="org.eclipse.equinox.p2.user.ui.feature.group"/>
<iu id="org.eclipse.rcp.configuration.feature.group"/>
- <!--iu id="org.eclipse.emf.sdk.feature.group"/-->
+ <iu id="org.eclipse.emf.sdk.feature.group"/-->
<!--iu id="org.eclipse.wst.xml_ui.feature.feature.group"/-->
<!--iu id="org.eclipse.gef.feature.group"/-->
- </p2.mirror>
+ <!--/p2.mirror-->
<echo>${eclipsep2Repo}</echo>
<echo>${emfp2Repo}</echo>
@@ -104,7 +104,8 @@
<echo>Running against helios I builds: ${transformedRepoLocation} </echo>
<p2.repo2runnable destination="${transformedRepoLocation}" failOnError="false">
<source>
- <repository location="file:${transformedRepoLocation}-mirrored" />
+ <!--repository location="file:${transformedRepoLocation}-mirrored" /-->
+ <repository location="${eclipsep2Repo}" />
<repository location="${emfp2Repo}" />
<repository location="${gefp2Repo}" />
<repository location="${wstp2Repo}" />
diff --git a/org.eclipse.e4.builder/scripts/masterBuild.sh b/org.eclipse.e4.builder/scripts/masterBuild.sh
index e441385..db946c3 100755
--- a/org.eclipse.e4.builder/scripts/masterBuild.sh
+++ b/org.eclipse.e4.builder/scripts/masterBuild.sh
@@ -32,8 +32,8 @@
#basebuilderBranch=$( grep v2009 /cvsroot/eclipse/org.eclipse.releng.basebuilder/about.html,v | head -1 | cut -f1 -d: | tr -d "[:blank:]" )
#eclipseIBuild=$( ls -d /home/data/httpd/download.eclipse.org/eclipse/downloads/drops/I*/eclipse-SDK-I*-linux-gtk${archProp}.tar.gz | tail -1 | cut -d/ -f9 )
basebuilderBranch=v20090916c
- #wstBuildDir=$( ls -d /home/www/webtools/downloads/drops/R3.2/I-* | tail -1 | cut -d/ -f10 )
- wstBuildDir=S-3.2.0M2-20090924194346
+ wstBuildDir=$( ls -d /home/www/webtools/downloads/drops/R3.2.0/I-* | tail -1 | cut -d/ -f8 )
+ #wstBuildDir=I-3.2.0-20091008044047
}
@@ -52,8 +52,7 @@
projRoot=':pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse'
basebuilderBranch=v20090916c
- #wstBuildDir=$( ls -d /home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.2/I-* | tail -1 | cut -d/ -f10 )
- wstBuildDir=S-3.2.0M2-20090924194346
+ wstBuildDir=I-3.2.0-20091008044047
}
commonProperties () {
@@ -214,7 +213,7 @@
echo "[start] [`date +%H\:%M\:%S`] Invoking Eclipse build with -enableassertions and -cp $cpAndMain ...";
cmd="$javaHome/bin/java -enableassertions \
-cp $cpAndMain \
- -application org.eclipse.ant.core.antRunner \
+ -application org.eclipse.ant.core.antRunner -v \
-buildfile $buildfile \
-Dbuilder=${builderDir}/builder/general \
-Dbuilddate=$builddate \
