[108259] Refactoring builds
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index 59a46e8..81b9f24 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -58,6 +58,7 @@
<ant antfile="${wtp.builder.home}/distribution/${build.distribution}.tests/build.xml" >
<property name="testRoot" value="${build.home}/${build.tests}-${build.distribution}-${buildType}" />
<property name="dependencyTargets" value="${wtp.builder.home}/scripts/dependency/build.xml" />
+ <property name="local.cache.dir" value="${build.home}/${build.local.repository}" />
</ant>
</target>
<!-- =================================
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 67f922d..f6f04ba 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -57,7 +57,7 @@
</target>
<target name="tagMapFiles" if="tagMaps">
- <cvs dest="${buildDirectory}/maps" command="tag v${timestamp}" />
+ <cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
</target>
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 9fbd88b..9d45977 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -54,7 +54,7 @@
</target>
<target name="tagMapFiles" if="tagMaps">
- <cvs dest="${buildDirectory}/maps" command="tag v${timestamp}" />
+ <cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
</target>
<!-- ===================================================================== -->
diff --git a/releng.wtpbuilder/components/wst.doc-sdk/customTargets.xml b/releng.wtpbuilder/components/wst.doc-sdk/customTargets.xml
index d0a632e..01093a7 100644
--- a/releng.wtpbuilder/components/wst.doc-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.doc-sdk/customTargets.xml
@@ -54,7 +54,7 @@
</target>
<target name="tagMapFiles" if="tagMaps">
- <cvs dest="${buildDirectory}/maps" command="tag v${timestamp}" />
+ <cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
</target>
<!-- ===================================================================== -->
diff --git a/releng.wtpbuilder/components/wst.doc/customTargets.xml b/releng.wtpbuilder/components/wst.doc/customTargets.xml
index d2dc5ab..be15613 100644
--- a/releng.wtpbuilder/components/wst.doc/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.doc/customTargets.xml
@@ -53,7 +53,7 @@
</target>
<target name="tagMapFiles" if="tagMaps">
- <cvs dest="${buildDirectory}/maps" command="tag v${timestamp}" />
+ <cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
</target>
<!-- ===================================================================== -->
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index 2165c48..ec83dc7 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -55,7 +55,7 @@
</target>
<target name="tagMapFiles" if="tagMaps">
- <cvs dest="${buildDirectory}/maps" command="tag v${timestamp}" />
+ <cvs dest="${buildDirectory}/maps" command="tag v${buildType}${timestamp}" />
</target>
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index d60dfd9..01acfdd 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -25,7 +25,7 @@
<property name="dependency.name" value="${@dependencyGroupId@name}" />
<property name="dependency.description" value="${@dependencyGroupId@url}" />
<property name="dependency.url" value="${@dependencyGroupId@url}" />
- <property name="local.cache.dir" value="c:\junk3" />
+ <property name="local.cache.dir" value="." />
<condition property="dependency.file" value="${@dependencyGroupId@file}">
<not>