diff options
author | Andrew Niefer | 2010-07-15 16:08:14 +0000 |
---|---|---|
committer | Andrew Niefer | 2010-07-15 16:08:14 +0000 |
commit | cf2c946e2dd916cf3144839a6f0be961f8ad57eb (patch) | |
tree | efba2c2a7cb4b85ecbaaedf78629d5e56a9ab636 /bundles | |
parent | cd27d5c0e8700e1b192b45b7b5a950e406a48a3f (diff) | |
download | rt.equinox.framework-cf2c946e2dd916cf3144839a6f0be961f8ad57eb.tar.gz rt.equinox.framework-cf2c946e2dd916cf3144839a6f0be961f8ad57eb.tar.xz rt.equinox.framework-cf2c946e2dd916cf3144839a6f0be961f8ad57eb.zip |
bug 320005 - isSunVM should return true for OracleR36x_v20100715
Diffstat (limited to 'bundles')
7 files changed, 10 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.executable/feature.xml b/bundles/org.eclipse.equinox.executable/feature.xml index 09c554393..801453900 100644 --- a/bundles/org.eclipse.equinox.executable/feature.xml +++ b/bundles/org.eclipse.equinox.executable/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.equinox.executable" label="%featureName" - version="3.4.0.qualifier"> + version="3.4.1.qualifier"> <description> %description diff --git a/bundles/org.eclipse.equinox.executable/library/make_version.mak b/bundles/org.eclipse.equinox.executable/library/make_version.mak index 2be9ebdef..7c4d0c6f4 100644 --- a/bundles/org.eclipse.equinox.executable/library/make_version.mak +++ b/bundles/org.eclipse.equinox.executable/library/make_version.mak @@ -10,5 +10,5 @@ #******************************************************************************* maj_ver=1 -min_ver=307 +min_ver=308 LIB_VERSION = $(maj_ver)$(min_ver) diff --git a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c index 11ec827e6..8033224ae 100644 --- a/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c +++ b/bundles/org.eclipse.equinox.executable/library/win32/eclipseWin.c @@ -78,6 +78,7 @@ typedef struct { #define COMPANY_NAME_KEY _T_ECLIPSE("\\StringFileInfo\\%04x%04x\\CompanyName") #define SUN_MICROSYSTEMS _T_ECLIPSE("Sun Microsystems") +#define ORACLE _T_ECLIPSE("Oracle") static void sendOpenFileMessage(HWND window) { _TCHAR* id; @@ -595,6 +596,9 @@ int isSunVM( _TCHAR * javaVM, _TCHAR * jniLib ) { if (_tcsncmp(value, SUN_MICROSYSTEMS, _tcslen(SUN_MICROSYSTEMS)) == 0) { result = 1; break; + } else if (_tcsncmp(value, ORACLE, _tcslen(ORACLE)) == 0) { + result = 1; + break; } } free(key); diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF index 04012838e..e69c7f38f 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.ia64;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.1.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)" Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=ia64)) Bundle-Localization: launcher.win32.win32.ia64 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF index 6abe8ba2b..dd5cfdc3d 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86; singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.1.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)" Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86)) Bundle-Localization: launcher.win32.win32.x86 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF index 8675dc0e0..a5a4fb5f2 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86_64;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.1.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)" Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64)) Bundle-Localization: launcher.win32.win32.x86_64 diff --git a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF index 01280ea82..6ca4a0772 100644 --- a/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.launcher.wpf.win32.x86; singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.1.qualifier Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)" Eclipse-PlatformFilter: (& (osgi.ws=wpf) (osgi.os=win32) (osgi.arch=x86)) Bundle-Localization: launcher.wpf.win32.x86 |