cleanup for restructuring
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index c6bd9e4..e84dbd3 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -25,6 +25,7 @@
eclipse.builder=org.eclipse.releng.basebuilder
eclipse.builder.version=M3_34
+#eclipse.builder.version=RC4_33
#eclipse.builder.version=r322_v20070104
# uncomment if its desired to 'force' fetch of eclipse builder
# (if not already defined from elsewhere)
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index e2f5a5e..eb7dddd 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -25,6 +25,9 @@
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index e3c1369..605671b 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -2,9 +2,11 @@
name="Build specific targets and properties"
default="noDefault">
- <property file="build.properties" />
-
<property environment="env" />
+
+ <property
+ name="buildDirectory"
+ value="${buildDirectory}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
@@ -122,6 +124,14 @@
reallyquiet="${env.CVS_REALLY_QUIET}" />
-->
+ <cvs
+ cvsRoot="${mapCvsRoot}"
+ package="${env.RELENGJSF}"
+ dest="${buildDirectory}/maps"
+ tag="${releng-jsf-mapVersionTag}"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}" />
+
<!--tag the map files project-->
<antcall target="tagMapFiles">
<param
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 471aed6..52af18f 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -3,7 +3,7 @@
default="noDefault">
<property environment="env" />
-
+
<property
name="buildDirectory"
value="${buildDirectory}" />
@@ -81,7 +81,7 @@
<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
<!-- ===================================================================== -->
<target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
- <condition property="mapsLocal">
+ <condition property="mapsLocal">
<and>
<available file="${buildDirectory}/maps/${env.RELENG}" />
<available file="${buildDirectory}/maps/${env.RELENGJSF}" />
@@ -107,7 +107,8 @@
value="HEAD" />
- <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>
+
+ <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>
<property
name="cvsPackage"
value="${env.RELENGMAPS}" />
@@ -117,9 +118,10 @@
cvsRoot="${mapCvsRoot}"
package="${cvsPackage}"
dest="${buildDirectory}/maps"
- tag="${mapVersionTag}"
+ tag="${mapVersionTag}"
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}" />
+
<!--
<cvs
cvsRoot="${mapCvsRoot}"
@@ -128,7 +130,15 @@
tag="${mapVersionTag}"
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}" />
--->
+-->
+
+ <cvs
+ cvsRoot="${mapCvsRoot}"
+ package="${env.RELENGJSF}"
+ dest="${buildDirectory}/maps"
+ tag="${releng-jsf-mapVersionTag}"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"/>
<!--tag the map files project-->
<antcall target="tagMapFiles">
@@ -145,8 +155,7 @@
<include name="**/*.map" />
</fileset>
</copy>
- -->
-
+ -->
</target>
@@ -349,6 +358,6 @@
<condition property="useLocalMaps">
<equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
</condition>
- </target>
+ </target>
</project>