From 5538d6bbe6301e8ce5636145a43c6b9f3b09bc3f Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Tue, 16 Sep 2008 23:16:47 +0000
Subject: [PATCH] [releng] Another stab at adopting Orbit

---
 releng/org.eclipse.rse.build/build.properties  | 2 +-
 releng/org.eclipse.rse.build/customTargets.xml | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties
index 69277210d1f..6adf854b5a9 100644
--- a/releng/org.eclipse.rse.build/build.properties
+++ b/releng/org.eclipse.rse.build/build.properties
@@ -30,7 +30,7 @@ collBase=.
 archivesFormat =\
 linux, gtk, ppc-zip &\
 	*,*,*-zip
-bootclasspath=${java.home}/lib/rt.jar:${java.home}/lib/jsse.jar
+# bootclasspath=${java.home}/lib/rt.jar:${java.home}/lib/jsse.jar
 baseos=linux
 basews=gtk
 basearch=ppc
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index d4803f37604..45d8f32ad28 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -174,15 +174,13 @@
 		<exec executable="unzip" dir="${buildDirectory}/${buildLabel}">
 			<arg line="-q ${archiveName} -d ${tmpsite}" />
 		</exec>
+		<property name="orbitDest" value="${tmpsite}/eclipse"/>
+		<antcall target="copyOrbitBundlesToUpdateSite"/>
 		<copy todir="${buildUpdateSitePath}">
 		    <fileset dir="${tmpsite}/eclipse"/>
 		</copy>
-		<property name="orbitDest" value="${buildUpdateSitePath}"/>
-		<antcall target="copyOrbitBundlesToUpdateSite"/>
 
 		<unpackUpdateJars site="${tmpsite}/eclipse" output="${tmpsite}/new/eclipse"/>
-		<property name="orbitDest" value="${tmpsite}/new/eclipse"/>
-		<antcall target="copyOrbitBundlesToUpdateSite"/>
 		<antcall target="packageLicenseFiles"/>
 		<zip destfile="${buildDirectory}/${buildLabel}/${archiveName}"
 			basedir="${tmpsite}/new"