90217

8 files changed, 22 insertions, 19 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh
index 5b71af9304..69f46cbc84 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh
@@ -12,7 +12,7 @@
 
 cd `dirname $0`
 
-OUTPUT_DIR=../../../org.eclipse.swt.carbon/os/macosx/ppc
+OUTPUT_DIR=../../../org.eclipse.swt.carbon.macosx.ppc
 
 export OUTPUT_DIR
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.xml
index feeee8c989..49cec0c49b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.xml
@@ -13,7 +13,7 @@
 		<arg line="${basedir}/bin/library/build.sh"/>
 		<arg line="install"/>
 	</exec>
-	<eclipse.refreshLocal resource="org.eclipse.swt.carbon" depth="infinite" />		
+	<eclipse.refreshLocal resource="org.eclipse.swt.carbon.macosx.ppc" depth="infinite" />		
 </target>
 
 <target name="clean">
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index 0e9809caaf..2a23721dcf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -39,7 +39,7 @@ case $OS in
 					GECKO_LIBS="-L${GECKO_SDK}/lib -L${GECKO_SDK}/bin -lembed_base_s -lxpcomglue_s -lxpcom -lnspr4 -lplds4 -lplc4"
 				fi
 				SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
-				OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/linux/x86_64
+				OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.x86_64
 				makefile="make_linux.mak"
 				echo "Building Linux GTK AMD64 version of SWT"
 				;;
@@ -56,7 +56,7 @@ case $OS in
 					GECKO_INCLUDES="-include ${GECKO_SDK}/mozilla-config.h -I${GECKO_SDK}/nspr/include -I${GECKO_SDK}/xpcom/include -I${GECKO_SDK}/string/include -I${GECKO_SDK}/embed_base/include -I${GECKO_SDK}/embedstring/include"
 					GECKO_LIBS="-L${GECKO_SDK}/embedstring/bin -lembedstring -L${GECKO_SDK}/embed_base/bin -lembed_base_s -L${GECKO_SDK}/xpcom/bin -lxpcomglue_s -lxpcom -L${GECKO_SDK}/nspr/bin -lnspr4 -lplds4 -lplc4"
 				fi
-				OUTPUT_DIR=../../../org.eclipse.swt.gtk/os/linux/x86
+				OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.x86
 				makefile="make_linux.mak"
 				echo "Building Linux GTK x86 version of SWT"
 				;;
@@ -68,7 +68,7 @@ case $OS in
 				fi
 				AWT_LIB_PATH=$JAVA_HOME/jre/bin
 				XTEST_LIB_PATH=/usr/X11R6/lib
-				OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/linux/ppc
+				OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.ppc
 				makefile="make_linux.mak"
 				;;
 			"ppc64")
@@ -80,7 +80,7 @@ case $OS in
 				AWT_LIB_PATH=$JAVA_HOME/jre/bin
 				XTEST_LIB_PATH=/usr/X11R6/lib
 				SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
-				OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/linux/ppc64
+				OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.ppc64
 				makefile="make_linux.mak"
 				;;
 			"ia64")
@@ -92,7 +92,7 @@ case $OS in
 				AWT_LIB_PATH=$JAVA_HOME/jre/lib/ia64
 				XTEST_LIB_PATH=/usr/X11R6/lib
 				SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
-				OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/linux/ia64
+				OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.ia64
 				makefile="make_linux.mak"
 				;;
 			*)
@@ -116,7 +116,7 @@ case $OS in
 #		if [ "${GECKO_SDK}" = "" ]; then
 #			GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
 #		fi
-		OUTPUT_DIR=../../../org.eclipse.swt.gtk/os/solaris/sparc
+		OUTPUT_DIR=../../../org.eclipse.swt.gtk.solaris.sparc
 		makefile="make_solaris.mak"
 		echo "Building Solaris GTK version of SWT"
 		;;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml
index 3af244dab8..1449f4c20c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml
@@ -15,7 +15,7 @@
 		<arg line="make_mozilla"/>
 		<arg line="install"/>
 	</exec>
-	<eclipse.refreshLocal resource="org.eclipse.swt.gtk" depth="infinite" />
+	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" />
 </target>
 
 <!-- Build swt.so for Solaris GTK (no Mozilla) -->
@@ -24,7 +24,7 @@
 		<arg line="${basedir}/bin/library/build.sh"/>
 		<arg line="install"/>
 	</exec>
-	<eclipse.refreshLocal resource="org.eclipse.swt.gtk" depth="infinite" />
+	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.solaris.sparc" depth="infinite" />
 </target>
 	
 <!-- Build swt.so for GTK 64 -->
@@ -34,7 +34,7 @@
 		<arg line="make_mozilla"/>
 		<arg line="install"/>
 	</exec>
-	<eclipse.refreshLocal resource="org.eclipse.swt.gtk64" depth="infinite" />	
+	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86_64" depth="infinite" />	
 </target>
 
 <target name="clean">
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
index a23e759a55..527a9bc287 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
@@ -35,7 +35,7 @@ case $OS in
 			if [ "${CDE_HOME}" = "" ]; then
 				CDE_HOME=/usr/dt
 			fi
-			OUTPUT_DIR=../../../org.eclipse.swt.motif/os/aix/ppc
+			OUTPUT_DIR=../../../org.eclipse.swt.motif.aix.ppc
 			makefile="make_aix.mak"
 			echo "Building AIX motif ppc version of SWT"
 		esac
@@ -52,7 +52,7 @@ case $OS in
 			if [ "${QT_HOME}" = "" ]; then
 				QT_HOME=$QTDIR
 			fi
-			OUTPUT_DIR=../../../org.eclipse.swt.motif/os/linux/x86
+			OUTPUT_DIR=../../../org.eclipse.swt.motif.linux.x86
 			makefile="make_linux.mak"
 			echo "Building Linux motif x86 version of SWT"
 		esac
@@ -69,7 +69,7 @@ case $OS in
 			if [ "${CDE_HOME}" = "" ]; then
 				CDE_HOME=/usr/dt		
 			fi
-			OUTPUT_DIR=../../../org.eclipse.swt.motif/os/solaris/sparc
+			OUTPUT_DIR=../../../org.eclipse.swt.motif.solaris.sparc
 			PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
 			export PATH
 			makefile="make_solaris.mak"
@@ -88,7 +88,7 @@ case $OS in
 				if [ "${CDE_HOME}" = "" ]; then
 					CDE_HOME=/usr/dt
 				fi
-				OUTPUT_DIR=../../../org.eclipse.swt.motif/os/hpux/ia64
+				OUTPUT_DIR=../../../org.eclipse.swt.motif.hpux.ia64
 				makefile="make_hpux_ia64.mak"
 				echo "Building HPUX motif ia64 version of SWT"
 				;;
@@ -102,7 +102,7 @@ case $OS in
 				if [ "${CDE_HOME}" = "" ]; then
 					CDE_HOME=/usr/dt
 				fi
-				OUTPUT_DIR=../../../org.eclipse.swt.motif/os/hpux/PA_RISC
+				OUTPUT_DIR=../../../org.eclipse.swt.motif.hpux.PA_RISC
 				makefile="make_hpux_PA_RISC.mak"
 				echo "Building HPUX motif risc version of SWT"
 				;;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.xml
index 315eab94a5..2027a57bbb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.xml
@@ -13,7 +13,10 @@
 		<arg line="${basedir}/bin/library/build.sh"/>
 		<arg line="install"/>
 	</exec>
-	<eclipse.refreshLocal resource="org.eclipse.swt.motif" depth="infinite" />		
+	<eclipse.refreshLocal resource="org.eclipse.swt.motif.aix.ppc" depth="infinite" />		
+	<eclipse.refreshLocal resource="org.eclipse.swt.motif.hpux.PA_RISC" depth="infinite" />		
+	<eclipse.refreshLocal resource="org.eclipse.swt.motif.linux.x86" depth="infinite" />		
+	<eclipse.refreshLocal resource="org.eclipse.swt.motif.solaris.sparc" depth="infinite" />		
 </target>
 
 <target name="clean">
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh
index 4aaf2a463d..837e8d6be3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh
@@ -12,7 +12,7 @@
 
 cd `dirname $0`
 
-OUTPUT_DIR=../../../org.eclipse.swt.photon/os/qnx/x86
+OUTPUT_DIR=../../../org.eclipse.swt.photon.qnx.x86
 IVE_HOME=~/ive/bin
 
 export IVE_HOME OUTPUT_DIR
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.xml
index 66496a4a6e..0b7ec419c1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.xml
@@ -13,7 +13,7 @@
 		<arg line="${basedir}/bin/library/build.sh"/>
 		<arg line="install"/>
 	</exec>
-	<eclipse.refreshLocal resource="org.eclipse.swt.photon" depth="infinite" />
+	<eclipse.refreshLocal resource="org.eclipse.swt.photon.qnx.x86" depth="infinite" />
 </target>
 
 <target name="clean">