From 427f38d6a1f7431d107b193196ada475f5b48841 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 16 Jul 2009 20:10:59 +0000
Subject: [PATCH] [283482] Provide execution environments for nightly builds
 (CDC-1.1, J2SE-1.4, J2SE-1.5)

---
 releng/org.eclipse.rse.build/build.pl   | 17 +++++++++++++++-
 releng/org.eclipse.rse.build/build.rb   | 26 +++++++++++++++++++++++++
 releng/org.eclipse.rse.build/go.sh      | 14 ++++++++++++-
 releng/org.eclipse.rse.build/nightly.sh |  6 +++---
 4 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/releng/org.eclipse.rse.build/build.pl b/releng/org.eclipse.rse.build/build.pl
index a1e699aa9b6..a82bc93d7ab 100644
--- a/releng/org.eclipse.rse.build/build.pl
+++ b/releng/org.eclipse.rse.build/build.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #*******************************************************************************
-# Copyright (c) 2006, 2007 IBM Corporation and others.
+# Copyright (c) 2006, 2009 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -87,6 +87,14 @@ $timeStamp = "${mydstamp}-${mytstamp}";
 $buildId = $buildType . $timeStamp;
 $buildId = ask("Enter the build id", $buildType . $timeStamp);
 
+# default value of the bootclasspath attribute used in ant javac calls.
+# these pathes are valid on build.eclipse.org  
+$bootclasspath = "/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar";
+$bootclasspath_15 = "/shared/common/jdk-1.5.0_16/jre/lib/rt.jar";
+#$bootclasspath_16 = "$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar";
+#$bootclasspath_foundation = "/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar";
+$bootclasspath_foundation11 = "/shared/dsdp/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip";
+
 $incantation = "java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main ";
 $incantation .= "-application org.eclipse.ant.core.antRunner ";
 $incantation .= "-buildfile ${pdeBuild}/scripts/build.xml ";
@@ -104,6 +112,13 @@ if ($buildType =~ "N") {
 	$incantation .= "-DforceContextQualifier=${buildId} ";
 	$incantation .= "-DfetchTag=HEAD ";
 }
+$incantation .= "-DdoPublish=true ";
+$incantation .= "-Dbootclasspath=${bootclasspath} ";
+$incantation .= "-DJ2SE-1.4=${bootclasspath} ";
+$incantation .= "-DJ2SE-1.5=${bootclasspath_15} ";
+$incantation .= "-DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} ";
+#$incantation .= "postBuild ";
+
 
 print("${incantation}\n");
 
diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb
index 9965ab0cbd9..36cde9e7773 100644
--- a/releng/org.eclipse.rse.build/build.rb
+++ b/releng/org.eclipse.rse.build/build.rb
@@ -1,4 +1,16 @@
 #!/usr/bin/ruby
+#*******************************************************************************
+# Copyright (c) 2006, 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# David Dykstal (IBM) - initial API and implementation
+# Martin Oberhuber (Wind River) - ongoing maintenance
+#*******************************************************************************
+
 # Build script for Remote System Explorer
 # Author: Dave Dykstal, Kushal Munir
 # Prerequisites:
@@ -56,6 +68,14 @@ mydstamp = Time.now.strftime("%Y%m%d")
 mytstamp = Time.now.strftime("%H%M")
 buildId = ask("Enter the build id", buildType + mydstamp + "-" + mydstamp)
 
+# default value of the bootclasspath attribute used in ant javac calls.
+# these pathes are valid on build.eclipse.org  
+bootclasspath = "/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
+bootclasspath_15 = "/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
+#bootclasspath_16 = "$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
+#bootclasspath_foundation = "/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
+bootclasspath_foundation11 = "/shared/dsdp/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
+
 command = "java -cp #{basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
 command += "-application org.eclipse.ant.core.antRunner "
 command += "-buildfile #{pdeBuild}/scripts/build.xml "
@@ -73,6 +93,12 @@ if ("#{buildType}" == "N") then
 	command += "-DforceContextQualifier=#{buildId} "
 	command += "-DfetchTag=HEAD "
 end
+command += "-DdoPublish=true "
+command += "-Dbootclasspath=#{bootclasspath} "
+command += "-DJ2SE-1.4=#{bootclasspath} "
+command += "-DJ2SE-1.5=#{bootclasspath_15} "
+command += "-DCDC-1.1/Foundation-1.1=#{bootclasspath_foundation11} "
+#command += "postBuild "
 
 puts(command)
 
diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh
index f06c9d41d09..d5a69faee9a 100755
--- a/releng/org.eclipse.rse.build/go.sh
+++ b/releng/org.eclipse.rse.build/go.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #*******************************************************************************
-# Copyright (c) 2006, 2007 Wind River Systems, Inc.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -42,6 +42,14 @@ timestamp="${mydstamp}-${mytstamp}"
 buildId="${buildType}${timestamp}"
 rm -rf "${buildDirectory}"
 
+# default value of the bootclasspath attribute used in ant javac calls.
+# these pathes are valid on build.eclipse.org  
+bootclasspath="/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
+bootclasspath_15="/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
+#bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
+#bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
+bootclasspath_foundation11="/shared/dsdp/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
+
 command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
 command="$command -application org.eclipse.ant.core.antRunner "
 command="$command -buildfile ${pdeBuild}/scripts/build.xml "
@@ -59,6 +67,10 @@ command="$command -DfetchTag=HEAD "
 command="$command -DskipFetch "
 command="$command -Dmydstamp=${mydstamp} "
 command="$command -Dmytstamp=${mytstamp} "
+#command="$command -Dbootclasspath=${bootclasspath} "
+#command="$command -DJ2SE-1.4=${bootclasspath} "
+#command="$command -DJ2SE-1.5=${bootclasspath_15} "
+#command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
 #command="$command -DJ2SE-1.2=../jres/1.2.2/lib/rt.jar "
 #command="$command postBuild "
 
diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
index 08c120429cc..2eb2abd3ffa 100755
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ b/releng/org.eclipse.rse.build/nightly.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #*******************************************************************************
-# Copyright (c) 2006, 2007 Wind River Systems, Inc.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -59,8 +59,8 @@ if [ "$3" != "" ]; then
 fi
 rm -rf "${buildDirectory}"
 
-#default value of the bootclasspath attribute used in ant javac calls.
-#these pathes are valid on build.eclipse.org  
+# default value of the bootclasspath attribute used in ant javac calls.
+# these pathes are valid on build.eclipse.org  
 bootclasspath="/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
 bootclasspath_15="/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
 #bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"