basebuilder changes

releng.wtpbuilder/build.properties

@@ -81,6 +81,7 @@ javacDebugInfo=true
 # This is the eclipse releng driver
 # It is only used to drive the build process
 # it must be relative to the buildHome
+eclipse.base.version=3.1.0
 eclipse.builder=org.eclipse.releng.basebuilder
 eclipse.builder.version=r311_vM20050914-1235
 eclipse.builder.fetch=true
@@ -127,8 +128,9 @@ compilerArg=-showversion
 
 #############################################################
 # Other inline resolved properties
-pde.build.scripts=${build.home}/${eclipse.builder}/plugins/org.eclipse.pde.build_3.1.0/scripts
+pde.build.scripts=${build.home}/${eclipse.builder}/plugins/org.eclipse.pde.build_${eclipse.base.version}/scripts
 buildDirectory=${build.home}/${build.current}-${build.distribution}-${buildType}/${build.directory}
+pde.builder.path=${build.home}/builders/${eclipse.builder.version}/${eclipse.builder}
 builder=${basedir}/components/${component}
 
  
\ No newline at end of file

releng.wtpbuilder/distribution/wtp.build/build.xml

@@ -48,7 +48,7 @@
 	<target name="getBaseBuilder" if="eclipse.builder.fetch">
 		<dirname file="${ant.file}" property="wtbuilder.dir"/>
 		<property name="buildTargets" value="${wtp.builder.home}/scripts/build/build.xml" />
-		<!-- delete dir="${build.home}/${eclipse.builder}" failonerror="false"/ -->
+		<!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
 		<ant antfile="${buildTargets}" target="getBaseBuilder" />
 	</target>
 	

releng.wtpbuilder/distribution/wtp.site/build.xml

 <project name="Build specific targets and properties" default="build">
     <target name="build">
-        <java classpath="${build.home}/${eclipse.builder}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
+        <java classpath="${pde.builder.path}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
             <jvmarg value="-Dosgi.ws=${basews}" />
             <jvmarg value="-Dosgi.os=${baseos}" />
             <jvmarg value="-Dosgi.arch=${basearch}" />

releng.wtpbuilder/distribution/wtp.tests/build.xml

@@ -77,7 +77,7 @@
 			<sysproperty key="baseLocation" value="${baseLocation}" />
 			<sysproperty key="testDir" value="${testRoot}" />
 			<sysproperty key="perf.buildId" value="${buildType}${date}-${time}" />
-			<sysproperty key="eclipseBuilderDirectory" value="${build.home}/${eclipse.builder}" />
+			<sysproperty key="eclipseBuilderDirectory" value="${pde.builder.path}" />
 		</java>
 	</target>
 

releng.wtpbuilder/scripts/build/build.xml

@@ -42,7 +42,7 @@
 	</target>
 
 	<target name="checkBaseBuilder">
-		<available property="basebuilderLocal" file="${build.home}/${eclipse.builder}" />
+		<available property="basebuilderLocal" file="${pde.builder.path}" />
 	</target>
 
 	<target name="getBaseBuilder" depends="checkBaseBuilder" unless="basebuilderLocal">
@@ -52,7 +52,8 @@
 		     in some cases, won't run at all, in the best of cases, will simply
 		     be unstable, as its the development version -->
 		<property name="eclipse.builder.version" value="r311_vM20050914-1235" />
-		<cvs cvsRoot="${builderCvsRoot}" package="org.eclipse.releng.basebuilder" dest="${build.home}" tag="${eclipse.builder.version}" />
+		<mkdir dir="${build.home}/builders/${eclipse.builder.version}" />
+		<cvs cvsRoot="${builderCvsRoot}" package="org.eclipse.releng.basebuilder" dest="${build.home}/builders/${eclipse.builder.version}" tag="${eclipse.builder.version}" />
 	</target>
 
 
@@ -82,7 +83,7 @@
 	</target>
 
 	<target name="runEclipseBuild" if="buildId">
-		<java classpath="${build.home}/${eclipse.builder}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
+		<java classpath="${pde.builder.path}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
 			<jvmarg value="-Dosgi.ws=${basews}" />
 			<jvmarg value="-Dosgi.os=${baseos}" />
 			<jvmarg value="-Dosgi.arch=${basearch}" />
@@ -109,7 +110,7 @@
 	</target>
 	
 	<target name="runEclipseBuildStamped" unless="buildId">
-		<java classpath="${build.home}/${eclipse.builder}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
+		<java classpath="${pde.builder.path}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
 			<jvmarg value="-Dosgi.ws=${basews}" />
 			<jvmarg value="-Dosgi.os=${baseos}" />
 			<jvmarg value="-Dosgi.arch=${basearch}" />