diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-12 20:38:47 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-12 20:38:47 +0000 |
| commit | 95c136d0d1d94a5a1e226ca9850bf026e8e788b7 (patch) | |
| tree | e65902a20e667e47aa4263b064ea6fc2503b7990 /jvmfwk | |
| parent | 31b05c84a5f0dfde7f620f1bd1255d98327e1870 (diff) | |
CWS-TOOLING: integrate CWS ooo31osol_DEV300
2009-05-14 15:49:09 +0200 ihi r271896 : #i101913# added missing solaris entries
2009-05-14 12:36:19 +0200 ihi r271885 : #i101913# ARCH -> all
2009-05-13 11:14:52 +0200 jl r271846 : #i101457# Do not search for Java every time OOo starts
2009-05-13 08:49:28 +0200 jl r271838 : #tr6585548# Redone last change. On Solaris we do not scan the directories anymore and instead just ckeck /usr/jdk/latest
2009-05-12 17:10:03 +0200 jl r271828 : #i64357# We scan on Unix only for a java in different folders if we haven't found one by looking into JAVA_HOME or PATH
2009-05-12 13:17:04 +0200 releng r271819 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
2009-05-12 13:08:28 +0200 is r271816 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
Diffstat (limited to 'jvmfwk')
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 1a6f99f65ba4..19130d23ae7e 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -106,7 +106,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) errcode = jfw_existJRE(pInfo, &bExist); if (errcode == JFW_E_NONE) { - if (false == findAndSelect(&pInfo)) + if (!bExist && !findAndSelect(&pInfo)) return -1; } else diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 66496afa5611..fedfa75947ec 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -740,9 +740,8 @@ vector<Reference<VendorBase> > getAllJREInfos() //Otherwise in SDKs Java may be started twice createJavaInfoFromPath(vecInfos); -#ifdef UNX createJavaInfoDirScan(vecInfos); -#endif + bubbleSortVersion(vecInfos); return vecInfos; } @@ -1114,6 +1113,15 @@ bool makeDriveLetterSame(OUString * fileURL) } #ifdef UNX +#ifdef SOLARIS + +void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) +{ + JFW_TRACE2(OUSTR("\n[Java framework] Checking \"/usr/jdk/latest\"\n")); + getJREInfoByPath(OUSTR("file:////usr/jdk/latest"), vecInfos); +} + +#else void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) { OUString excMessage = OUSTR("[Java framework] sunjavaplugin: " @@ -1236,5 +1244,6 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) } } } -#endif +#endif // ifdef SOLARIS +#endif // ifdef UNX } |