diff options
25 files changed, 39 insertions, 38 deletions
diff --git a/bundles/org.eclipse.equinox.executable/build.properties b/bundles/org.eclipse.equinox.executable/build.properties index 434353e08..c52071562 100644 --- a/bundles/org.eclipse.equinox.executable/build.properties +++ b/bundles/org.eclipse.equinox.executable/build.properties @@ -10,7 +10,7 @@ ############################################################################### #custom = true p2.group.id = org.eclipse.equinox.executable -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 customBuildCallbacks=customBuildCallbacks.xml bin.includes = bin/,\ feature.xml,\ diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh index 6661d93f2..29d3871cb 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh @@ -40,12 +40,6 @@ defaultJava=DEFAULT_JAVA_JNI defaultJavaHome="" javaHome="" makefile="" -if [ "$OS" = "" ]; then - OS=`uname -s` -fi -if [ "$MODEL" = "" ]; then - MODEL=`uname -m` -fi if [ "${CC}" = "" ]; then CC=cc export CC @@ -74,19 +68,26 @@ while [ "$1" != "" ]; do fi shift done +if [ "$defaultOS" = "" ]; then + defaultOS=`uname -s` +fi +if [ "$defaultOSArch" = "" ]; then + defaultOSArch=`uname -m` +fi + -case $OS in - "Linux") +case $defaultOS in + "Linux" | "linux") makefile="make_linux.mak" defaultOS="linux" - case $MODEL in + case $defaultOSArch in "x86_64") 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="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; - i?86) + i?86 | "x86") 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="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" @@ -123,7 +124,7 @@ case $OS in ;; esac ;; - "AIX") + "AIX" | "aix") makefile="make_aix.mak" defaultOS="aix" if [ -z "$defaultOSArch" ]; then @@ -131,7 +132,7 @@ case $OS in fi [ -d /bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk" ;; - "HP-UX") + "HP-UX" | "hpux") makefile="make_hpux.mak" defaultOS="hpux" case $defaultOSArch in @@ -147,7 +148,7 @@ case $OS in export PATH PKG_CONFIG_PATH [ -d /opt/java1.5 ] && defaultJavaHome="/opt/java1.5" ;; - "SunOS") + "SunOS" | "solaris") makefile="make_solaris.mak" defaultOS="solaris" OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" @@ -158,7 +159,7 @@ case $OS in PROC=`uname -p` fi case ${PROC} in - "i386") + "i386" | "x86") defaultOSArch="x86" [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14" CC=cc diff --git a/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties index e6d8bf664..489bba3fa 100644 --- a/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties +++ b/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties index 3c1650ec3..f66b407ca 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties index 2098d957d..dac0524c2 100644 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties +++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties index 41b843029..bfcd67952 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties index 234b3360a..ef8d505b2 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122
\ No newline at end of file +binaryTag=v20130117-1237
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties index 09becaf83..4c52679df 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties index 05c12abfd..948d99dba 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties index 3f3ae6ef3..61b1080e6 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties index b5dccd0ee..034d952af 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties index bc0b75a2a..8c9bad618 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122
\ No newline at end of file +binaryTag=v20130117-1237
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties index b7c515834..e78a585f0 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122
\ No newline at end of file +binaryTag=v20130117-1237
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties index ccc02ad1a..416719224 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties index 0d1a9985a..96b140c38 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties index 4aa18ef4b..2c78c084b 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties index 745d6883e..9486930cd 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties index dc9f593b8..9620af474 100644 --- a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties +++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties @@ -16,4 +16,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties index b1b747cb9..de6ce56ae 100644 --- a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties +++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties index 834ae12f4..9d9078b98 100644 --- a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties index f9e9f84d3..35fa94aae 100644 --- a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties +++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ customBuildCallbacks=customBuildCallbacks.xml generateSourceBundle=false -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties index 048a0d7a0..448154dfb 100644 --- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20121107-1122
\ No newline at end of file +binaryTag=v20130117-1237
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties index d59a0b60f..0c8b6d485 100644 --- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20121107-1122
\ No newline at end of file +binaryTag=v20130117-1237
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties index 1a996de27..d1a332cfd 100644 --- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties +++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties index e1bbd80d0..89b10b3a3 100644 --- a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties +++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties @@ -15,4 +15,4 @@ bin.includes = META-INF/,\ about.html generateSourceBundle=false customBuildCallbacks=customBuildCallbacks.xml -binaryTag=v20121107-1122 +binaryTag=v20130117-1237 |