[108259] Refactoring builds

releng.wtpbuilder/components/jst-sdk/customTargets.xml

@@ -50,11 +50,13 @@
 		</echo>
 		<cvs cvsRoot="${mapCvsRoot}" package="releng/maps" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 
 

releng.wtpbuilder/components/jst.tests/customTargets.xml

@@ -49,11 +49,13 @@
 		</echo>
 		<cvs cvsRoot="${mapCvsRoot}" package="releng/maps" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 
 

releng.wtpbuilder/components/jst/customTargets.xml

@@ -53,11 +53,13 @@
 			tag="${mapVersionTag}"
 		/>
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 	
 

releng.wtpbuilder/components/wst-sdk/customTargets.xml

@@ -50,11 +50,13 @@
 		</echo>
 		<cvs cvsRoot="${mapCvsRoot}" package="releng/maps" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 
 	<!-- ===================================================================== -->

releng.wtpbuilder/components/wst.doc-sdk/customTargets.xml

@@ -50,11 +50,13 @@
 		</echo>
 		<cvs cvsRoot="${mapCvsRoot}" package="releng/maps" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 
 	<!-- ===================================================================== -->

releng.wtpbuilder/components/wst.doc/customTargets.xml

@@ -49,11 +49,13 @@
 		</echo>
 		<cvs cvsRoot="${mapCvsRoot}" package="releng/maps" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 
 	<!-- ===================================================================== -->

releng.wtpbuilder/components/wst.perf.tests/customTargets.xml

@@ -48,11 +48,13 @@
 		</echo>
 		<cvs cvsRoot="${mapCvsRoot}" package="releng/maps" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 
 

releng.wtpbuilder/components/wst.tests/customTargets.xml

@@ -51,11 +51,13 @@
 		</echo>
 		<cvs cvsRoot="${mapCvsRoot}" package="releng/maps" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
 		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
+		<antcall target="tagMapFiles" >
+			<param name="mapCvsRoot"  value="${mapCvsRoot}" />
+		</antcall>
 	</target>
 
 	<target name="tagMapFiles" if="tagMaps">
-		<cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
+		<cvs  cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
 	</target>
 
 

releng.wtpbuilder/scripts/build/build.xml

@@ -41,7 +41,7 @@
 		<echo message="buildDirectory: ${buildDirectory}" />
 
 		<ant antfile="build.xml" dir="${pde.build.scripts}"  >
-			<property name="user.dir" value="${wtp.builder.home}/components/${component}" />			
+			<property name="builderDirectory" value="${wtp.builder.home}/components/${component}" />			
 			<property name="wtp.builder.home" value="${wtp.builder.home}" />			
 			<property name="buildBranch" value="${buildBranch}" />			
 			<property name="cvsUser" value="${cvsUser}" />