diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-18 10:18:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-18 10:18:42 +0000 |
| commit | 274e64c3b7af0d5e99be40b7457f058495cd5e30 (patch) | |
| tree | 783cbe8898eb3368f167ef3c5b7c166b74d0f18d /jvmfwk/plugins | |
| parent | 5f3c54c106d2f8d9c23d14c3faae60b75d61f6c8 (diff) | |
INTEGRATION: CWS fwkpostbeta04 (1.6.4); FILE MERGED
2005/02/17 11:35:04 jl 1.6.4.1: #i42962# #i42968# recognition of JREs on FreeBSD
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 742446ae068c..a2ae2d71a033 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sunversion.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-01-31 09:50:23 $ + * last change: $Author: obo $ $Date: 2005-03-18 11:18:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -233,8 +233,10 @@ bool SunVersion::init(const char *szVersion) if (m_preRelease == Rel_NONE) return false; #if defined(FREEBSD) - if (m_preRelease == Rel_FreeBSD) - return true; + if (m_preRelease == Rel_FreeBSD) { + m_nUpdateSpecial = *pCur; + return true; + } #endif } else @@ -273,6 +275,14 @@ SunVersion::PreRelease SunVersion::getPreRelease(const char *szRelease) else if (! strcmp(szRelease, "rc3")) return Rel_RC3; #if defined (FREEBSD) + else if (! strcmp(szRelease, "p1")) + return Rel_FreeBSD; + else if (! strcmp(szRelease, "p2")) + return Rel_FreeBSD; + else if (! strcmp(szRelease, "p3")) + return Rel_FreeBSD; + else if (! strcmp(szRelease, "p4")) + return Rel_FreeBSD; else if (! strcmp(szRelease, "p5")) return Rel_FreeBSD; else if (! strcmp(szRelease, "p6")) |