simplify build parameters
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 34c5780..a64e085 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -323,6 +323,8 @@
unless="J2SE-1.4"
message="classpath to J2SE-1.4 Execution Environment must be set" />
+ <!-- we read these in as ant properties, so in java call below, we convert
+ them to system (environment) properties, which is where PDE expects to find them -->
<echo message="J2SE-1.5=${J2SE-1.5}" />
<echo message="J2SE-1.4=${J2SE-1.4}" />
@@ -337,6 +339,8 @@
<jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
<jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}" />
<jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}" />
+ <jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
+ <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
@@ -376,6 +380,10 @@
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
+ <jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}" />
+ <jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}" />
+ <jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
+ <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DjavacDebugInfo=${javacDebugInfo}" />