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

---
 releng/org.eclipse.rse.build/customTargets.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index e12ba54dc9b..d4803f37604 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -177,8 +177,11 @@
 		<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}"
@@ -191,7 +194,7 @@
 	</target>
 
 	<target name="copyOrbit" if="copyOrbit">
-		<copy todir="${buildDirectory}/tmpsite/new/eclipse/plugins">
+		<copy todir="${orbitDest}/plugins">
 			<fileset dir="${buildDirectory}/plugins">
 				<include name="org.apache.commons.net_*.jar"/>
 				<include name="org.apache.oro_*.jar"/>