[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 2 commits - jvmfwk/inc jvmfwk/Library_sunjavaplugin.mk jvmfwk/Package_inc.mk postprocess/rebase solenv/bin ure/source
David Tardon
dtardon at kemper.freedesktop.org
Mon Dec 26 01:48:19 PST 2011
jvmfwk/Library_sunjavaplugin.mk | 4 +++
jvmfwk/Package_inc.mk | 1
jvmfwk/inc/jvmfwk/framework.h | 2 -
jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h | 44 +++++++++++++++++++++++++++++++++
jvmfwk/inc/jvmfwk/vendorplugin.h | 9 +++---
postprocess/rebase/coffbase.txt | 2 -
solenv/bin/linkoo | 2 -
ure/source/README | 4 +--
8 files changed, 59 insertions(+), 9 deletions(-)
New commits:
commit 3c29bf2260bb3d982a72c755df5ae10845a62110
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 26 10:47:24 2011 +0100
sunjavaplugin has been renamed
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 6119c53..0326309 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -143,7 +143,7 @@ extern "C" {
<p>
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 ....
</p>
<p>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 ea7f867..7c6961a 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 3008835..c11a6e9 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 1463e04..efb88d9 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]
commit eff62d413895d02b92da1a8396cb2bea1ce93902
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 26 10:46:37 2011 +0100
export libsunjavaplugin's API functions
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 6e1a2f6..9ce5461 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_Library_Library,sunjavaplugin))
+$(eval $(call gb_Library_add_defs,sunjavaplugin,\
+ -DJVMFWK_PLUGIN_DLLIMPLEMENTATION \
+))
+
ifneq ($(JVM_ONE_PATH_CHECK),)
$(eval $(call gb_Library_add_defs,sunjavaplugin,\
-DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" \
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
index f8ae7ea..fd8a616 100644
--- a/jvmfwk/Package_inc.mk
+++ b/jvmfwk/Package_inc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk))
$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h))
$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h))
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h))
$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
new file mode 100644
index 0000000..c7a2990
--- /dev/null
+++ b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+ * (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+#define INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined JVMFWK_PLUGIN_DLLIMPLEMENTATION
+# define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+# define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMFWK_PLUGIN_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index 3ccbb0e..302037c 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -30,6 +30,7 @@
#if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H
#define INCLUDED_JVMFWK_VENDORPLUGIN_H
+#include "jvmfwkplugindllapi.h"
#include "jvmfwk/framework.h"
#include "rtl/ustring.h"
#ifdef SOLAR_JAVA
@@ -126,7 +127,7 @@ typedef enum
<code>sMinVersion,sMaxVersion,arExcludeList</code> are not recognized as valid
version strings.
*/
-javaPluginError jfw_plugin_getAllJavaInfos(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getAllJavaInfos(
rtl_uString *sVendor,
rtl_uString *sMinVersion,
rtl_uString *sMaxVersion,
@@ -177,7 +178,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
does not mean necessarily that there is no JRE. There could be a JRE but it has
a vendor which is not supported by this API implementation.
*/
-javaPluginError jfw_plugin_getJavaInfoByPath(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath(
rtl_uString *sLocation,
rtl_uString *sVendor,
rtl_uString *sMinVersion,
@@ -230,7 +231,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
JFW_PLUGIN_E_VM_CREATION_FAILED a VM could not be created. The error was caused
by the JRE.
*/
-javaPluginError jfw_plugin_startJavaVirtualMachine(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine(
const JavaInfo *pInfo,
const JavaVMOption *arOptions,
sal_Int32 nSizeOptions,
@@ -256,7 +257,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br>
*/
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
#ifdef __cplusplus
}
More information about the Libreoffice-commits
mailing list