diff options
| author | Andrey Loskutov | 2020-05-14 15:00:10 +0000 |
|---|---|---|
| committer | Sravan Kumar Lakkimsetti | 2021-08-13 08:35:32 +0000 |
| commit | 33aded892d50aed5607ffec6a30d51549ae32386 (patch) | |
| tree | 06375c2d3f53f146971c632343304a7a898fe3d0 | |
| parent | d07fd0e04f0a2c4cfffbbb4dfec595212e495eb5 (diff) | |
| download | rt.equinox.framework-33aded892d50aed5607ffec6a30d51549ae32386.tar.gz rt.equinox.framework-33aded892d50aed5607ffec6a30d51549ae32386.tar.xz rt.equinox.framework-33aded892d50aed5607ffec6a30d51549ae32386.zip | |
Bug 553538 - always prefer server VM if no arguments given
Historically we are searching fo client VM path first. Today most JRE's
prefer server VM variant, so let this one be default. Users that prefer
the client version still can specify that.
Change-Id: Ia215b01f96e8f36c0479e867985aa00244816718
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.framework/+/163044
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
3 files changed, 6 insertions, 6 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c index a38047f4e..2bf6b065a 100644 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c @@ -69,14 +69,14 @@ static char * findLib(char * command); #define MAX_LOCATION_LENGTH 40 /* none of the jvmLocations strings should be longer than this */ #define MAX_JVMLIB_LENGTH 15 /* none of the jvmLibs strings should be longer than this */ static const char* jvmLocations[] = { - "../lib/" JAVA_ARCH "/client", "../lib/" JAVA_ARCH "/server", + "../lib/" JAVA_ARCH "/client", "../lib/client", "../lib/server", - "../jre/lib/" JAVA_ARCH "/client", "../jre/lib/" JAVA_ARCH "/server", - "../jre/lib/client", + "../jre/lib/" JAVA_ARCH "/client", "../jre/lib/server", + "../jre/lib/client", NULL }; static const char* jvmLibs[] = { "libjvm.dylib", "libjvm.jnilib", "libjvm.so", NULL }; diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c b/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c index 5d35e9f2b..047a9dad5 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c @@ -47,11 +47,11 @@ #define MAX_LOCATION_LENGTH 40 /* none of the jvmLocations strings should be longer than this */ static const char* jvmLocations [] = { "j9vm", "../jre/bin/j9vm", "classic", "../jre/bin/classic", - "../lib/" JAVA_ARCH "/client", "../lib/" JAVA_ARCH "/server", + "../lib/" JAVA_ARCH "/client", "../lib/" JAVA_ARCH "/jrockit", - "../jre/lib/" JAVA_ARCH "/client", "../jre/lib/" JAVA_ARCH "/server", + "../jre/lib/" JAVA_ARCH "/client", "../jre/lib/" JAVA_ARCH "/jrockit", "../lib/jvm/jre/lib/" JAVA_ARCH "/client", NULL }; diff --git a/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c b/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c index f206561bc..71a8a710c 100644 --- a/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c +++ b/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c @@ -80,8 +80,8 @@ static _TCHAR* findLib( _TCHAR* command ); * for example jvmLocations[0] + dirSeparator + vmLibrary */ #define MAX_LOCATION_LENGTH 25 /* none of the jvmLocations strings should be longer than this */ static const _TCHAR* jvmLocations [] = { _T("j9vm"), _T("..\\jre\\bin\\j9vm"), - _T("client"), _T("..\\jre\\bin\\client"), _T("server"), _T("..\\jre\\bin\\server"), + _T("client"), _T("..\\jre\\bin\\client"), _T("classic"), _T("..\\jre\\bin\\classic"), _T("jrockit"), _T("..\\jre\\bin\\jrockit"), NULL }; |