Binaries v20150121-0748
diff --git a/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties
index b72aa16..ae74450 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 98bca4e..18ac115 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties
index 3163870..8949576 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 f2bf2b8..a07324a 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 4d87200..95a19b2 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
\ No newline at end of file
+binaryTag=v20150121-0748
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/META-INF/p2.inf b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/META-INF/p2.inf
index 5fc69b6..588302b 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/META-INF/p2.inf
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/META-INF/p2.inf
@@ -1,3 +1,3 @@
# bug 407433 - launcher .so files need exec permissions on HPUX
-instructions.install = chmod(targetDir:${artifact.location},targetFile:eclipse_1605.so,permissions:755);
+instructions.install = chmod(targetDir:${artifact.location},targetFile:eclipse_1606.so,permissions:755);
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 3d50a8d..d9d9463 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 b361277..8c43e38 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 c145fdd..8329600 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 bfbaa3a..64f4c92 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 f56f47c..c90d4a5 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
\ No newline at end of file
+binaryTag=v20150121-0748
\ 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 b080571..29c5868 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
\ No newline at end of file
+binaryTag=v20150121-0748
\ 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 32b46b2..8fb75de 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 06dbf23..94c1e0c 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 01449e0..235df36 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 67c1633..a7dec55 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 cbf628a..01f70d5 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 eb0b7a6..e7e0064 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 10b6f4f..eed3341 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 e1a481b..b089850 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 @@
customBuildCallbacks=customBuildCallbacks.xml
generateSourceBundle=false
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 93a2817..9bc9c7e 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 @@
about.html
generateSourceBundle=false
customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20140603-0926
\ No newline at end of file
+binaryTag=v20150121-0748
\ 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 89df1a5..025df8d 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 @@
about.html
generateSourceBundle=false
customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20140603-0926
\ No newline at end of file
+binaryTag=v20150121-0748
\ 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 92065ce..af5fd4d 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 @@
about.html
generateSourceBundle=false
customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
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 025fbb2..b945150 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 @@
about.html
generateSourceBundle=false
customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20140603-0926
+binaryTag=v20150121-0748
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c
index 788fc75..73df274 100644
--- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c
+++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c
@@ -486,6 +486,8 @@
processDefaultAction(initialArgc, initialArgv);
}
+#ifndef _WIN32
+#ifndef MACOSX
if (gtkVersionString != NULL) {
int gtkVersion;
_stscanf(gtkVersionString, _T_ECLIPSE("%d"), >kVersion);
@@ -496,6 +498,8 @@
setenv("SWT_GTK3","1",1);
}
}
+#endif
+#endif
/* try to open the specified file in an already running eclipse */
/* on Mac we are only registering an event handler here, always do this */
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
index 7d47680..44bd6e0 100644
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
@@ -211,8 +211,15 @@
fi
export M_ARCH
elif [ "$defaultOSArch" = "s390" ]; then
+ if [ "${JAVA_HOME}" = "" ]; then
+ export JAVA_HOME="/home/swtbuild/java5/s390/ibm-java2-s390-50"
+ fi
M_ARCH=-m31
export M_ARCH
+elif [ "$defaultOSArch" = "s390x" ]; then
+ if [ "${JAVA_HOME}" = "" ]; then
+ export JAVA_HOME="/home/swtbuild/java5/s390x/ibm-java2-s390x-50"
+ fi
elif [ "$defaultOSArch" = "ia64" ]; then
M_ARCH=-mlp64
export M_ARCH
diff --git a/features/org.eclipse.equinox.executable.feature/library/make_version.mak b/features/org.eclipse.equinox.executable.feature/library/make_version.mak
index 9a2dd19..117a44e 100644
--- a/features/org.eclipse.equinox.executable.feature/library/make_version.mak
+++ b/features/org.eclipse.equinox.executable.feature/library/make_version.mak
@@ -10,5 +10,5 @@
#*******************************************************************************
maj_ver=1
-min_ver=605
+min_ver=606
LIB_VERSION = $(maj_ver)$(min_ver)
