make dropins directory variable
diff --git a/releng.wtpbuilder/distribution/incubator.tests/build.xml b/releng.wtpbuilder/distribution/incubator.tests/build.xml
index 8b92d21..3df100a 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/build.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/build.xml
@@ -11,6 +11,11 @@
<fail
message="testRoot must be set for this task"
unless="testRoot" />
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
+
<!--
Steps to do after the build is done.
@@ -105,7 +110,7 @@
executable="unzip"
failonerror="true">
<arg
- line="-o -qq wtp-incubator-xsl_sdk-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-incubator-xsl_sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
<echo
message="installing xsl tests" />
@@ -114,7 +119,7 @@
executable="unzip"
failonerror="true">
<arg
- line="-o -qq wtp-incubator-xsl-tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-incubator-xsl-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
</target>
@@ -142,7 +147,7 @@
value="${env.JAVA_5_HOME}/bin/java" />
<property
name="plugin-path"
- value="${testRoot}/eclipse/dropins/eclipse/plugins" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins" />
<property
name="vmargs"
value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
index 5128e93..fa0ac66 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
@@ -4,6 +4,12 @@
basedir=".">
<property
environment="env" />
+
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
+
<echo
level="info"
message="starting Automated Eclipse Testing" />
@@ -34,7 +40,7 @@
<!-- The root of the eclipse installation -->
<property
name="eclipse-home"
- value="${testRoot}/eclipse/dropins/eclipse/" />
+ value="${testRoot}${dropinsFolder}/eclipse/" />
<!-- The directory that will contain the xml and html results from the tests that are run -->
<property
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
index cfab419..865dc27 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
@@ -4,6 +4,11 @@
basedir=".">
<property
environment="env" />
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
+
<target
name="init">
<!--
@@ -45,7 +50,7 @@
value="${junit-report-output}" />
<property
name="plugin-path"
- value="${testRoot}/eclipse/dropins/eclipse/plugins/${testPlugin}" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}" />
<property
name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml b/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
index 83e14dd..79fc162 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
@@ -10,7 +10,12 @@
<project
name="test"
default="get">
-
+ <property
+ environment="env" />
+<!-- required to get proper value of dropinsFolder -->
+<property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+<echo message="keyCfgFile: ${keyCfgFile}" />
+<property file="${keyCfgFile}" />
<target name="get">
<antcall target="getAndInstallDropins">
<param
@@ -84,7 +89,7 @@
value="${groupId}" />
<property
name="install.destination"
- value="${base.install.dir}/eclipse/dropins" />
+ value="${base.install.dir}${dropinsFolder}" />
</ant>
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 98f0025..dbaa6e8 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -8,6 +8,10 @@
be ${env.Path} not ${env.PATH} on Windows -->
<property
environment="env" />
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
<fail
message="testRoot must be set for this task"
unless="testRoot" />
@@ -103,35 +107,35 @@
executable="unzip"
failonerror="false">
<arg
- line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
failonerror="false">
<arg
- line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
failonerror="false">
<arg
- line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
failonerror="false">
<arg
- line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
failonerror="false">
<arg
- line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
</target>
@@ -160,7 +164,7 @@
value="${env.JAVA_5_HOME}/bin/java" />
<property
name="plugin-path"
- value="${testRoot}/eclipse/dropins/eclipse/plugins" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins" />
<property
name="vmargs"
value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index 26e8ec7..017cc3c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -4,6 +4,11 @@
basedir=".">
<property
environment="env" />
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
+
<echo
level="info"
message="starting Automated Eclipse Testing" />
@@ -38,7 +43,7 @@
<!-- The root of the eclipse installation -->
<property
name="eclipse-home"
- value="${testRoot}/eclipse/dropins/eclipse/" />
+ value="${testRoot}${dropinsFolder}/eclipse/" />
<!-- The directory that will contain the xml and html results from the tests that are run -->
<property
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index ccca32a..1f2e58b 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -4,6 +4,11 @@
basedir=".">
<property
environment="env" />
+
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
<target
name="init">
<!--
@@ -45,7 +50,7 @@
value="${junit-report-output}" />
<property
name="plugin-path"
- value="${testRoot}/eclipse/dropins/eclipse/plugins/${testPlugin}" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}" />
<property
name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
index cbcefb0..72bb168 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
@@ -10,7 +10,12 @@
<project
name="test"
default="get">
-
+ <property
+ environment="env" />
+<!-- required to get proper value of dropinsFolder -->
+<property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+<echo message="keyCfgFile: ${keyCfgFile}" />
+<property file="${keyCfgFile}" />
<target name="get">
<antcall target="getAndInstallDropins">
<param
@@ -112,7 +117,7 @@
value="${groupId}" />
<property
name="install.destination"
- value="${base.install.dir}/eclipse/dropins" />
+ value="${base.install.dir}${dropinsFolder}" />
</ant>
</target>