From 249fae56e0c6d7d4fbd979f46fa04cc5f381649d Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Fri, 2 May 2008 03:41:42 +0000
Subject: [PATCH] 224522 fix to make dropins folder variable based on steam
---
releng.wtpbuilder/distribution/dali.site/build.xml | 4 +++-
releng.wtpbuilder/distribution/dali.tests/build.xml | 3 ++-
.../distribution/dali.tests/testScripts/junit-tests.xml | 2 ++
releng.wtpbuilder/distribution/incubator.site/build.xml | 4 +++-
releng.wtpbuilder/distribution/incubator.tests/build.xml | 2 ++
.../incubator.tests/testScripts/wtp-junit-tests.xml | 2 ++
releng.wtpbuilder/distribution/patches.site/build.xml | 2 ++
releng.wtpbuilder/distribution/patches.tests/build.xml | 2 ++
.../patches.tests/testScripts/wtp-junit-tests.xml | 2 ++
releng.wtpbuilder/distribution/patches2.site/build.xml | 3 ++-
releng.wtpbuilder/distribution/patches2.tests/build.xml | 2 ++
.../patches2.tests/testScripts/wtp-junit-tests.xml | 2 ++
releng.wtpbuilder/distribution/wtp.adopters/build.xml | 2 ++
.../distribution/wtp.tests/testScripts/wtp-junit-tests.xml | 2 ++
14 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/releng.wtpbuilder/distribution/dali.site/build.xml b/releng.wtpbuilder/distribution/dali.site/build.xml
index 2b21cbe19..944c23791 100644
--- a/releng.wtpbuilder/distribution/dali.site/build.xml
+++ b/releng.wtpbuilder/distribution/dali.site/build.xml
@@ -25,7 +25,9 @@
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
<jvmarg value="-DbuildDirectory=${buildDirectory}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
- <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-buildfile" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index de70c3914..668699ede 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -172,7 +172,8 @@
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
-
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-nosplash" />
<arg value="-consolelog" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
index 99935fc75..9d3231c6b 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
@@ -206,6 +206,8 @@
<jvmarg value="-DPLUGIN_PATH=${plugin-path}" />
<jvmarg line="${extraVMargs}" />
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-nosplash" />
<arg value="-consolelog" />
<arg value="-debug" />
diff --git a/releng.wtpbuilder/distribution/incubator.site/build.xml b/releng.wtpbuilder/distribution/incubator.site/build.xml
index f03f0a394..7c7d07741 100644
--- a/releng.wtpbuilder/distribution/incubator.site/build.xml
+++ b/releng.wtpbuilder/distribution/incubator.site/build.xml
@@ -35,7 +35,9 @@
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
<jvmarg value="-DbuildDirectory=${buildDirectory}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
- <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-data" />
<arg value="${basedir}/workspace" />
<arg value="-application" />
diff --git a/releng.wtpbuilder/distribution/incubator.tests/build.xml b/releng.wtpbuilder/distribution/incubator.tests/build.xml
index 44110f399..d1e18da91 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/build.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/build.xml
@@ -209,6 +209,8 @@
value="-DbuildId=${buildId}" />
<jvmarg
value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg
value="-nosplash" />
<arg
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 cec18898a..ca1022426 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
@@ -210,6 +210,8 @@
line="${extraVMargs}" />
<jvmarg
value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg
value="-nosplash" />
<arg
diff --git a/releng.wtpbuilder/distribution/patches.site/build.xml b/releng.wtpbuilder/distribution/patches.site/build.xml
index 258959d11..d243e1af0 100644
--- a/releng.wtpbuilder/distribution/patches.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches.site/build.xml
@@ -43,6 +43,8 @@
<jvmarg value="-DbuildDirectory=${buildDirectory}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-data" />
<arg value="${basedir}/workspace" />
<arg value="-application" />
diff --git a/releng.wtpbuilder/distribution/patches.tests/build.xml b/releng.wtpbuilder/distribution/patches.tests/build.xml
index 579fd6833..f60def5e0 100644
--- a/releng.wtpbuilder/distribution/patches.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/build.xml
@@ -199,6 +199,8 @@
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-nosplash" />
<arg value="-consolelog" />
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
index 85f89c576..37eb753e4 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
@@ -210,6 +210,8 @@
<jvmarg value="-DPLUGIN_PATH=${plugin-path}" />
<jvmarg line="${extraVMargs}" />
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-nosplash" />
<arg value="-consolelog" />
<arg value="-debug" />
diff --git a/releng.wtpbuilder/distribution/patches2.site/build.xml b/releng.wtpbuilder/distribution/patches2.site/build.xml
index 93f66ef61..ef03842f8 100644
--- a/releng.wtpbuilder/distribution/patches2.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches2.site/build.xml
@@ -35,7 +35,8 @@
value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
<jvmarg
value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log" />
-
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-DmapVersionTag=${mapVersionTag}" />
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
diff --git a/releng.wtpbuilder/distribution/patches2.tests/build.xml b/releng.wtpbuilder/distribution/patches2.tests/build.xml
index d1b881b3c..2834c216c 100644
--- a/releng.wtpbuilder/distribution/patches2.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches2.tests/build.xml
@@ -251,6 +251,8 @@
value="-DbuildId=${buildId}" />
<jvmarg
value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg
value="-nosplash" />
<arg
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
index 71f71987a..2c7a92d5c 100644
--- a/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
@@ -205,6 +205,8 @@
line="${extraVMargs}" />
<jvmarg
value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg
value="-nosplash" />
<arg
diff --git a/releng.wtpbuilder/distribution/wtp.adopters/build.xml b/releng.wtpbuilder/distribution/wtp.adopters/build.xml
index 598540c8b..34ac06806 100644
--- a/releng.wtpbuilder/distribution/wtp.adopters/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.adopters/build.xml
@@ -266,6 +266,8 @@
<jvmarg value="-Xmx512M" />
<jvmarg line="${vmargs}" />
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg value="-application" />
<arg value="${application}" />
</java>
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 9863191d4..abc20dd3c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -210,6 +210,8 @@
line="${extraVMargs}" />
<jvmarg
value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dprojectname=${projectname}" />
<arg
value="-nosplash" />
<arg
--
GitLab