diff options
author | Silenio Quarti | 2012-09-13 14:22:58 +0000 |
---|---|---|
committer | Silenio Quarti | 2012-09-13 14:22:58 +0000 |
commit | 352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0 (patch) | |
tree | dcec5b84c16f46add046b7fce3c9939a61161dd2 | |
parent | 2a29bdfc8fcaedd42bc24f7f1e40f8f282b33db3 (diff) | |
download | rt.equinox.framework-352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0.tar.gz rt.equinox.framework-352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0.tar.xz rt.equinox.framework-352c9d4d326c6c720d4ac4f64d9ce50f6017b6f0.zip |
Bug 389363 - Merge Equinox framework into 3.8.2/4.2.2v20120913-142258
12 files changed, 33 insertions, 32 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/build.sh b/bundles/org.eclipse.equinox.executable/library/carbon/build.sh index dfd0cde8d..ac923d2ff 100644 --- a/bundles/org.eclipse.equinox.executable/library/carbon/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/carbon/build.sh @@ -60,9 +60,10 @@ PROGRAM_OUTPUT="$programOutput" DEFAULT_OS="$defaultOS" DEFAULT_OS_ARCH="$defaultOSArch" DEFAULT_WS="$defaultWS" -PPC_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/ppc/Eclipse.app/Contents/MacOS" -X86_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/x86/Eclipse.app/Contents/MacOS" -X86_64_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/x86_64/Eclipse.app/Contents/MacOS" +EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable +PPC_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/ppc/Eclipse.app/Contents/MacOS" +X86_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86/Eclipse.app/Contents/MacOS" +X86_64_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86_64/Eclipse.app/Contents/MacOS" if [ "$DEFAULT_WS" == "cocoa" ]; then makefile="make_cocoa.mak" diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/build.xml b/bundles/org.eclipse.equinox.executable/library/carbon/build.xml index b4308a9a2..990298e64 100644 --- a/bundles/org.eclipse.equinox.executable/library/carbon/build.xml +++ b/bundles/org.eclipse.equinox.executable/library/carbon/build.xml @@ -7,7 +7,6 @@ <arg line="${basedir}/build.sh"/> <arg line="install"/> </exec> - <eclipse.refreshLocal resource="platform-launcher" depth="infinite" /> </target> <target name="clean"> diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh index 894ce4a1f..cc4c49a79 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh @@ -35,6 +35,7 @@ programOutput="eclipse" defaultOS="" defaultOSArch="" defaultWS="gtk" +EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable defaultJava=DEFAULT_JAVA_JNI defaultJavaHome="" javaHome="" @@ -59,39 +60,39 @@ case $OS in defaultOSArch="x86_64" defaultJava=DEFAULT_JAVA_EXEC [ -d /bluebird/teamswt/swt-builddir/build/JRE/x64/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/x64/jdk1.6.0_14" - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; i?86) defaultOSArch="x86" [ -d /bluebird/teamswt/swt-builddir/build/JRE/x32/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/x32/jdk1.6.0_14" - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; "ppc") defaultOSArch="ppc" defaultJava=DEFAULT_JAVA_EXEC [ -d /bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50" - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; "ppc64") defaultOSArch="ppc64" defaultJava=DEFAULT_JAVA_EXEC [ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50" - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; "s390") defaultOSArch="s390" defaultJava=DEFAULT_JAVA_EXEC - OUTPUT_DIR="../../contributed/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch" ;; "s390x") defaultOSArch="s390x" defaultJava=DEFAULT_JAVA_EXEC - OUTPUT_DIR="../../contributed/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch" ;; "ia64") defaultOSArch="ia64" defaultJava=DEFAULT_JAVA_EXEC - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; *) echo "*** Unknown MODEL <${MODEL}>" @@ -115,7 +116,7 @@ case $OS in "SunOS") makefile="make_solaris.mak" defaultOS="solaris" - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH export PATH @@ -195,8 +196,8 @@ elif [ "$defaultOSArch" = "s390" ]; then export M_ARCH fi -LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" -OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" +LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" +OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS DEFAULT_JAVA LIBRARY_DIR diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.xml b/bundles/org.eclipse.equinox.executable/library/gtk/build.xml index 65a05c0ee..f485479d3 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/build.xml +++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.xml @@ -7,7 +7,6 @@ <arg line="${basedir}/build.sh"/> <arg line="install"/> </exec> - <eclipse.refreshLocal resource="platform-launcher" depth="infinite" /> </target> <target name="build_eclipse_ppc"> @@ -16,7 +15,6 @@ <arg line="${basedir}/build.sh"/> <arg line="install"/> </exec> - <eclipse.refreshLocal resource="platform-launcher" depth="infinite" /> </target> <target name="clean"> diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.sh b/bundles/org.eclipse.equinox.executable/library/motif/build.sh index 0aa148406..7bc48e7d6 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/motif/build.sh @@ -37,9 +37,10 @@ defaultOS="" defaultOSArch="" defaultWS="motif" defaultJava=DEFAULT_JAVA_JNI +EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable makefile="" javaHome="" -outputRoot="../../bin" +outputRoot="bin" if [ "$OS" = "" ]; then OS=`uname -s` fi @@ -54,7 +55,7 @@ case $OS in defaultOSArch="ppc" defaultWS="motif" MOTIF_HOME=/usr - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; "Linux") makefile="make_linux.mak" @@ -63,13 +64,13 @@ case $OS in defaultWS="motif" X11_HOME=/usr/X11R6 MOTIF_HOME=~/motif21 - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; "SunOS") # PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH [ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && javaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14" - outputRoot="../../contributed" + outputRoot="contributed" export PATH makefile="make_solaris.mak" defaultOS="solaris" @@ -78,7 +79,7 @@ case $OS in OS="Solaris" X11_HOME=/usr/openwin MOTIF_HOME=/usr/dt - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; "HP-UX") X11_HOME=/usr @@ -89,7 +90,7 @@ case $OS in defaultOS="hpux" defaultOSArch="ia64_32" defaultWS="motif" - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" javaHome="/opt/java1.5" defaultJava=DEFAULT_JAVA_EXEC PATH=/opt/hp-gcc/bin:$PATH @@ -100,7 +101,7 @@ case $OS in defaultOS="hpux" defaultOSArch="PA_RISC" defaultWS="motif" - OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; esac ;; @@ -141,8 +142,8 @@ DEFAULT_WS="$defaultWS" JAVA_HOME=$javaHome DEFAULT_JAVA=$defaultJava -LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" -OUTPUT_DIR="$outputRoot/$defaultWS/$defaultOS/$defaultOSArch" +LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" +OUTPUT_DIR="$EXEC_DIR/$outputRoot/$defaultWS/$defaultOS/$defaultOSArch" export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME DEFAULT_JAVA LIBRARY_DIR diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.xml b/bundles/org.eclipse.equinox.executable/library/motif/build.xml index b4308a9a2..990298e64 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/build.xml +++ b/bundles/org.eclipse.equinox.executable/library/motif/build.xml @@ -7,7 +7,6 @@ <arg line="${basedir}/build.sh"/> <arg line="install"/> </exec> - <eclipse.refreshLocal resource="platform-launcher" depth="infinite" /> </target> <target name="clean"> diff --git a/bundles/org.eclipse.equinox.executable/library/photon/build.sh b/bundles/org.eclipse.equinox.executable/library/photon/build.sh index ea8405923..43ef9b167 100644 --- a/bundles/org.eclipse.equinox.executable/library/photon/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/photon/build.sh @@ -60,7 +60,8 @@ PROGRAM_OUTPUT="$programOutput" DEFAULT_OS="$defaultOS" DEFAULT_OS_ARCH="$defaultOSArch" DEFAULT_WS="$defaultWS" -OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" +EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable +OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS diff --git a/bundles/org.eclipse.equinox.executable/library/photon/build.xml b/bundles/org.eclipse.equinox.executable/library/photon/build.xml index b4308a9a2..990298e64 100644 --- a/bundles/org.eclipse.equinox.executable/library/photon/build.xml +++ b/bundles/org.eclipse.equinox.executable/library/photon/build.xml @@ -7,7 +7,6 @@ <arg line="${basedir}/build.sh"/> <arg line="install"/> </exec> - <eclipse.refreshLocal resource="platform-launcher" depth="infinite" /> </target> <target name="clean"> diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.bat b/bundles/org.eclipse.equinox.executable/library/win32/build.bat index f64ce1d09..81f5afcd1 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/build.bat +++ b/bundles/org.eclipse.equinox.executable/library/win32/build.bat @@ -134,7 +134,8 @@ set PROGRAM_LIBRARY=%programLibrary% set DEFAULT_OS=%defaultOS% set DEFAULT_OS_ARCH=%defaultOSArch% set DEFAULT_WS=%defaultWS% -set OUTPUT_DIR=..\..\bin\%defaultWS%\%defaultOS%\%defaultOSArch% +set EXEC_DIR=..\..\.\..\..\rt.equinox.binaries\org.eclipse.equinox.executable +set OUTPUT_DIR=%EXEC_DIR%\bin\%defaultWS%\%defaultOS%\%defaultOSArch% set JAVA_HOME=%javaHome% rem -------------------------- diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.sh b/bundles/org.eclipse.equinox.executable/library/win32/build.sh index f81f52b00..853eaf4cf 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/win32/build.sh @@ -58,7 +58,8 @@ PROGRAM_OUTPUT="$programOutput" DEFAULT_OS="$defaultOS" DEFAULT_OS_ARCH="$defaultOSArch" DEFAULT_WS="$defaultWS" -OUTPUT_DIR=../../bin/$defaultWS/$defaultOS/$defaultOSArch +EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable +OUTPUT_DIR=$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.xml b/bundles/org.eclipse.equinox.executable/library/win32/build.xml index a5a99abbd..056b85926 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/build.xml +++ b/bundles/org.eclipse.equinox.executable/library/win32/build.xml @@ -6,7 +6,6 @@ <exec dir="." executable="${basedir}\build.bat"> <arg line="install"/> </exec> - <eclipse.refreshLocal resource="platform-launcher" depth="infinite" /> </target> <target name="clean"> diff --git a/bundles/org.eclipse.equinox.executable/library/wpf/build.bat b/bundles/org.eclipse.equinox.executable/library/wpf/build.bat index 5a2611d14..57e1d7525 100644 --- a/bundles/org.eclipse.equinox.executable/library/wpf/build.bat +++ b/bundles/org.eclipse.equinox.executable/library/wpf/build.bat @@ -105,7 +105,8 @@ set PROGRAM_LIBRARY=%programLibrary% set DEFAULT_OS=%defaultOS% set DEFAULT_OS_ARCH=%defaultOSArch% set DEFAULT_WS=%defaultWS% -set OUTPUT_DIR=..\..\bin\%defaultWS%\%defaultOS%\%defaultOSArch% +set EXEC_DIR=..\..\.\..\..\rt.equinox.binaries\org.eclipse.equinox.executable +set OUTPUT_DIR=%EXEC_DIR%\bin\%defaultWS%\%defaultOS%\%defaultOSArch% set JAVA_HOME=%javaHome% rem -------------------------- |