diff options
| -rw-r--r-- | jvmfwk/inc/jvmfwk/vendorplugin.h | 7 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 10 | ||||
| -rw-r--r-- | jvmfwk/prj/d.lst | 1 |
3 files changed, 12 insertions, 6 deletions
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h index 4b9eb1a01095..77c4fc539a5c 100644 --- a/jvmfwk/inc/jvmfwk/vendorplugin.h +++ b/jvmfwk/inc/jvmfwk/vendorplugin.h @@ -2,9 +2,9 @@ * * $RCSfile: vendorplugin.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jl $ $Date: 2004-05-03 14:55:13 $ + * last change: $Author: jl $ $Date: 2004-05-05 14:11:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,8 @@ typedef enum JFW_PLUGIN_E_INVALID_ARG, JFW_PLUGIN_E_WRONG_VERSION_FORMAT, JFW_PLUGIN_E_FAILED_VERSION, - JFW_PLUGIN_E_NO_JRE + JFW_PLUGIN_E_NO_JRE, + JFW_PLUGIN_E_WRONG_VENDOR } javaPluginError; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 6da7a96fe5ea..2171502c2991 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sunjavaplugin.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jl $ $Date: 2004-05-03 14:29:51 $ + * last change: $Author: jl $ $Date: 2004-05-05 14:11:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,7 @@ #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - +#define SUN_MICRO "Sun Microsystems Inc." namespace { struct Init @@ -290,6 +290,10 @@ javaPluginError startJavaVirtualMachine( javaPluginError errcode = JFW_PLUGIN_E_NONE; if ( pInfo == NULL || ppVm == NULL || ppEnv == NULL) return JFW_PLUGIN_E_INVALID_ARG; + rtl::OUString sVendor(pInfo->sVendor); + rtl::OUString sSunVendor(OUSTR(SUN_MICRO)); + if (sVendor.equals(sSunVendor) == sal_False) + return JFW_PLUGIN_E_WRONG_VENDOR; // On linux we load jvm with RTLD_GLOBAL. This is necessary for debugging, because // libjdwp.so need a symbol (fork1) from libjvm which it only gets if the jvm is loaded // witd RTLD_GLOBAL. On Solaris libjdwp.so is correctly linked with libjvm.so diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index 8ce5e67beecd..02ca3918d1bc 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -8,6 +8,7 @@ mkdir: %_DEST%\bin%_EXT%\jvmfwk_so_wnt ..\%__SRC%\lib\libjvmfwk*.dylib* %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\sunjavaplugin*.dll %_DEST%\bin%_EXT%\* +..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\javaldx %_DEST%\bin%_EXT%\javaldx ..\source\useatjava.txt %_DEST%\bin%_EXT%\useatjava.txt ..\source\javasettings.xml %_DEST%\bin%_EXT%\javasettings.xml |