Author: hdu
Date: Wed May 8 18:02:20 2013
New Revision: 1480381
URL: http://svn.apache.org/r1480381
Log:
#i121715# support 64bit JRE on MacOSX
XCode4 rejects string concatenations that are ambigous with the
the new C++ feature "user-defined literals" (N2378)
Modified:
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
Modified:
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1480381&r1=1480380&r2=1480381&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
Wed May 8 18:02:20 2013
@@ -105,7 +105,7 @@ int SunInfo::compareVersions(const rtl::
rtl::OUString sFirst = getVersion();
SunVersion version1(sFirst);
- JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+ JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin"
SAL_DLLEXTENSION
" does not know the version: ")
+ sFirst + OUSTR(" as valid for a SUN/Oracle JRE."));
SunVersion version2(sSecond);
Modified:
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx?rev=1480381&r1=1480380&r2=1480381&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
Wed May 8 18:02:20 2013
@@ -879,7 +879,7 @@ rtl::Reference<VendorBase> getJREInfoByP
SameOrSubDirJREMap(sResolvedDir));
if (entry2 != mapJREs.end())
{
- JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
+ JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ":
")
+ OUSTR("JRE found again (detected before): ") +
sResolvedDir
+ OUSTR(".\n"));
return entry2->second;
@@ -930,7 +930,7 @@ rtl::Reference<VendorBase> getJREInfoByP
MapIt entry = mapJREs.find(sFilePath);
if (entry != mapJREs.end())
{
- JFW_TRACE2(OUSTR("[Java framework]
sunjavaplugin"SAL_DLLEXTENSION ": ")
+ JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"
SAL_DLLEXTENSION ": ")
+ OUSTR("JRE found again (detected before): ") + sFilePath
+ OUSTR(".\n"));
@@ -1018,7 +1018,7 @@ rtl::Reference<VendorBase> getJREInfoByP
vecBadPaths.push_back(sFilePath);
else
{
- JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
+ JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ":
")
+ OUSTR("Found JRE: ") + sResolvedDir
+ OUSTR(" \n at: ") + path + OUSTR(".\n"));
Modified:
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx?rev=1480381&r1=1480380&r2=1480381&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
(original)
+++
openoffice/branches/rejuvenate01/main/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
Wed May 8 18:02:20 2013
@@ -39,9 +39,9 @@ namespace jfw_plugin
#define JFW_PLUGIN_ARCH "sparcv9"
#elif defined SPARC
#define JFW_PLUGIN_ARCH "sparc"
-#elif defined X86_64
+#elif defined(X86_64) || defined(__x86_64__)
#define JFW_PLUGIN_ARCH "amd64"
-#elif defined INTEL
+#elif defined(INTEL) || defined(__i386__)
#define JFW_PLUGIN_ARCH "i386"
#elif defined POWERPC64
#define JFW_PLUGIN_ARCH "ppc64"
