From 3c29bf2260bb3d982a72c755df5ae10845a62110 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 26 Dec 2011 10:47:24 +0100 Subject: [PATCH] sunjavaplugin has been renamed --- jvmfwk/inc/jvmfwk/framework.h | 2 +- postprocess/rebase/coffbase.txt | 2 +- solenv/bin/linkoo | 2 +- ure/source/README | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 6119c53b42fc..032630961911 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -143,7 +143,7 @@ extern "C" {

regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2 -env:"UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\jurt.jar" - -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\sunjavaplugin.dll -register .... + -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\libsunjavaplugin.dll -register ....

Additionall parameters for the Java VM can be provided. For every parameter a seperate bootstrap parameter must be specified. The names are diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt index ea7f867a4004..7c6961aef708 100644 --- a/postprocess/rebase/coffbase.txt +++ b/postprocess/rebase/coffbase.txt @@ -271,7 +271,7 @@ store3.dll 0x000000005e2e0000 0x00020000 streams.uno.dll 0x000000005e2b0000 0x00020000 stringresourcemi.uno.dll 0x000000005e280000 0x00020000 stsmi.dll 0x000000005e1f0000 0x00080000 -sunjavaplugin.dll 0x000000005e1c0000 0x00020000 +libsunjavaplugin.dll 0x000000005e1c0000 0x00020000 svgfiltermi.dll 0x000000005e190000 0x00020000 svgmi.dll 0x000000005e160000 0x00020000 svlmi.dll 0x000000005e090000 0x000c0000 diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 300883542af3..c11a6e95389d 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -113,7 +113,7 @@ my $brand_program_dir = 'program'; my $ure_lib_dir = 'ure-link/lib'; my $win_ure_lib_dir = 'URE/bin'; -my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); +my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' ); my $bin; $bin = "|\\.bin" if ($TARGET eq 'wntgcci.pro'); diff --git a/ure/source/README b/ure/source/README index 1463e04fdbbb..efb88d9e4511 100644 --- a/ure/source/README +++ b/ure/source/README @@ -68,7 +68,7 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3 [private; Linux x86 only] /opt/openoffice.org/ure/lib/libjvmaccessC52.so.3 [private; Solaris only] /opt/openoffice.org/ure/lib/libjvmfwk.so.3 [private] -/opt/openoffice.org/ure/lib/sunjavaplugin.so [private] +/opt/openoffice.org/ure/lib/libsunjavaplugin.so [private] /opt/openoffice.org/ure/lib/JREProperties.class [private] /opt/openoffice.org/ure/lib/jvmfwk3rc [private] /opt/openoffice.org/ure/lib/libgcc3_uno.so [private; Linux x86 only] @@ -129,7 +129,7 @@ Program Files\URE\bin\store3.dll [private] Program Files\URE\bin\xmlreader.dll [private] Program Files\URE\bin\jvmaccess3MSC.dll [private] Program Files\URE\bin\jvmfwk3.dll [private] -Program Files\URE\bin\sunjavaplugin.dll [private] +Program Files\URE\bin\libsunjavaplugin.dll [private] Program Files\URE\bin\JREProperties.class [private] Program Files\URE\bin\jvmfwk3.ini [private] Program Files\URE\bin\msci_uno.dll [private]