Author: damjan
Date: Thu Dec 6 06:24:29 2018
New Revision: 1848262
URL: http://svn.apache.org/viewvc?rev=1848262&view=rev
Log:
Port main/bridges to gbuild.
Patch by: me
Added:
openoffice/trunk/main/bridges/Ant_java_uno.mk
openoffice/trunk/main/bridges/Library_cpp_uno.mk
openoffice/trunk/main/bridges/Library_java_uno.mk
openoffice/trunk/main/bridges/Makefile (with props)
openoffice/trunk/main/bridges/Module_bridges.mk
openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
openoffice/trunk/main/bridges/java/
openoffice/trunk/main/bridges/java/java_uno/
openoffice/trunk/main/bridges/java/java_uno/build.xml (with props)
openoffice/trunk/main/bridges/java/java_uno/manifest
openoffice/trunk/main/bridges/java/java_uno/src/
openoffice/trunk/main/bridges/java/java_uno/src/main/
openoffice/trunk/main/bridges/java/java_uno/src/main/java/
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
(with props)
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
(with props)
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
openoffice/trunk/main/bridges/prj/makefile.mk
Removed:
openoffice/trunk/main/bridges/source/jni_uno/java/
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/bridges/prj/build.lst
openoffice/trunk/main/bridges/prj/d.lst
openoffice/trunk/main/bridges/source/bridge_exports.map
openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx
openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx
openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Thu Dec 6 06:24:29 2018
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,o
basic \
bean \
binaryurp \
+ bridges \
canvas \
codemaker \
comphelper \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Thu Dec 6 06:24:29 2018
@@ -194,9 +194,15 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+ gcc3_uno \
+ java_uno \
jpipe \
jpipx \
+ msci_uno \
+ mscx_uno \
+ s5abi_uno \
sunjavaplugin \
+ sunpro5_uno \
xmlreader \
))
Added: openoffice/trunk/main/bridges/Ant_java_uno.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/Ant_java_uno.mk?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/Ant_java_uno.mk (added)
+++ openoffice/trunk/main/bridges/Ant_java_uno.mk Thu Dec 6 06:24:29 2018
@@ -0,0 +1,27 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Ant_Ant,java_uno,$(SRCDIR)/bridges/java/java_uno/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/bridges/Library_cpp_uno.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/Library_cpp_uno.mk?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/Library_cpp_uno.mk (added)
+++ openoffice/trunk/main/bridges/Library_cpp_uno.mk Thu Dec 6 06:24:29 2018
@@ -0,0 +1,565 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,$(COMNAME)_uno))
+
+$(eval $(call
gb_Library_add_precompiled_header,$(COMNAME)_uno,$(SRCDIR)/bridges/inc/pch/precompiled_bridges))
+
+$(eval $(call gb_Library_set_include,$(COMNAME)_uno,\
+ $$(INCLUDE) \
+ -I$(SRCDIR) \
+ -I$(SRCDIR)/bridges/inc \
+ -I$(SRCDIR)/bridges/inc/pch \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call
gb_Library_set_private_extract_of_public_api,$(COMNAME)_uno,$(OUTDIR)/bin/udkapi.rdb,\
+ com.sun.star.uno.XInterface \
+ com.sun.star.uno.TypeClass \
+))
+
+#$(eval $(call gb_Library_add_api,$(COMNAME)_uno, \
+# udkapi \
+# offapi \
+#))
+
+$(eval $(call
gb_Library_set_versionmap,$(COMNAME)_uno,$(SRCDIR)/bridges/source/bridge_exports.map))
+
+$(eval $(call gb_Library_add_linked_libs,$(COMNAME)_uno,\
+ cppu \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/shared/bridge \
+ bridges/source/cpp_uno/shared/component \
+ bridges/source/cpp_uno/shared/cppinterfaceproxy \
+ bridges/source/cpp_uno/shared/types \
+ bridges/source/cpp_uno/shared/unointerfaceproxy \
+ bridges/source/cpp_uno/shared/vtablefactory \
+ bridges/source/cpp_uno/shared/vtables \
+))
+
+# Disable optimization for cppinterfaceproxy.cxx -
+# attribute constructor / destructor do not get called otherwise.
+ifeq ($(COM),GCC)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/shared/cppinterfaceproxy,
$(gb_COMPILERNOOPTFLAGS) \
+))
+endif
+
+
+###################################################
+ifeq ($(OS)-$(CPUNAME)-$(COMNAME),FREEBSD-ARM-gcc3)
+###################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_arm/except \
+ bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno \
+ bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_freebsd_arm/except \
+ bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno \
+ bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper \
+))
+
+##########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),FREEBSD-INTEL-gcc3)
+##########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_intel/except \
+ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno \
+ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_intel/call \
+))
+
+############################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),FREEBSD-POWERPC-gcc3)
+############################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc/except \
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc/cpp2uno \
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+##############################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),FREEBSD-POWERPC64-gcc3)
+##############################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/except \
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+###########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),FREEBSD-X86_64-gcc3)
+###########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi \
+ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except \
+ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_freebsd_x86-64/call \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-ALPHA_-gcc3)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_alpha/except \
+ bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp \
+))
+
+######################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-ARM-gcc3)
+######################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_arm/except \
+ bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_arm/except \
+ bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_arm/armhelper \
+))
+
+#######################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-HPPA-gcc3)
+#######################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_hppa/call \
+ bridges/source/cpp_uno/gcc3_linux_hppa/except \
+ bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_hppa/call \
+ bridges/source/cpp_uno/gcc3_linux_hppa/except \
+ bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+#######################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-IA64-gcc3)
+#######################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_ia64/except \
+ bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_ia64/call \
+))
+
+########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-INTEL-gcc3)
+########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_intel/abi \
+ bridges/source/cpp_uno/gcc3_linux_intel/except \
+ bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_intel/call \
+))
+
+
+#######################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-M68K-gcc3)
+#######################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_m68k/except \
+ bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_m68k/except \
+ bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+#########################################################
+# It's a MIPS, apparently...
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-GODSON-gcc3)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_mips/except \
+ bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+##########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-POWERPC-gcc3)
+##########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_powerpc/except \
+ bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+############################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-POWERPC64-gcc3)
+############################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_powerpc64/except \
+ bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+#######################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-S390-gcc3)
+#######################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_s390/except \
+ bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp \
+))
+
+########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-S390X-gcc3)
+########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_s390x/except \
+ bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp \
+))
+
+########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-SPARC-gcc3)
+########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_sparc/except \
+ bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_sparc/call \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-X86_64-gcc3)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_x86-64/abi \
+ bridges/source/cpp_uno/gcc3_linux_x86-64/except \
+ bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno \
+ bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_linux_x86-64/call \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),MACOSX-INTEL-gcc3)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_macosx_intel/except \
+ bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno \
+ bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_macosx_intel/call \
+))
+
+###########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),MACOSX-POWERPC-gcc3)
+###########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_macosx_powerpc/except \
+ bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno \
+ bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,$(COMNAME)_uno,\
+ dl \
+))
+
+###########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),MACOSX-X86_64-s5abi)
+###########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/s5abi_macosx_x86_64/abi \
+ bridges/source/cpp_uno/s5abi_macosx_x86_64/except \
+ bridges/source/cpp_uno/s5abi_macosx_x86_64/cpp2uno \
+ bridges/source/cpp_uno/s5abi_macosx_x86_64/uno2cpp \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),NETBSD-INTEL-gcc3)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_netbsd_intel/except \
+ bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno \
+ bridges/source/cpp_uno/gcc3_netbsd_intel/uno2cpp \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),OS2-INTEL-gcc3)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_os2_intel/except \
+ bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno \
+ bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COM),SOLARIS-INTEL-C50)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc50_solaris_intel/except \
+ bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno \
+ bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc50_solaris_intel/call \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COM),SOLARIS-INTEL-C52)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc50_solaris_intel/except \
+ bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno \
+ bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc50_solaris_intel/call \
+))
+
+##########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),SOLARIS-INTEL-gcc3)
+##########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_solaris_intel/except \
+ bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno \
+ bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COM),SOLARIS-SPARC-C52)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc50_solaris_sparc/except \
+ bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno \
+ bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc50_solaris_sparc/call \
+))
+
+##########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),SOLARIS-SPARC-gcc3)
+##########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/gcc3_solaris_sparc/except \
+ bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno \
+ bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno \
+ bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COM),SOLARIS-SPARC64-C52)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno \
+ bridges/source/cpp_uno/cc5_solaris_sparc64/exceptions \
+ bridges/source/cpp_uno/cc5_solaris_sparc64/isdirectreturntype \
+ bridges/source/cpp_uno/cc5_solaris_sparc64/uno2cpp \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/cc5_solaris_sparc64/callvirtualmethod \
+ bridges/source/cpp_uno/cc5_solaris_sparc64/fp \
+ bridges/source/cpp_uno/cc5_solaris_sparc64/vtableslotcall \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),WNT-INTEL-msci)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/msvc_win32_intel/cpp2uno \
+ bridges/source/cpp_uno/msvc_win32_intel/dllinit \
+ bridges/source/cpp_uno/msvc_win32_intel/except \
+ bridges/source/cpp_uno/msvc_win32_intel/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/msvc_win32_intel/except \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+#########################################################
+else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),WNT-INTEL-gcc3)
+#########################################################
+
+$(eval $(call gb_Library_add_exception_objects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/mingw_intel/cpp2uno \
+ bridges/source/cpp_uno/mingw_intel/dllinit \
+ bridges/source/cpp_uno/mingw_intel/except \
+ bridges/source/cpp_uno/mingw_intel/smallstruct \
+ bridges/source/cpp_uno/mingw_intel/uno2cpp \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ bridges/source/cpp_uno/msvc_win32_intel/uno2cpp \
+, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+$(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
+ bridges/source/cpp_uno/mingw_intel/call \
+))
+
+ifeq ($(EXCEPTIONS),sjlj)
+$(eval $(call gb_Library_add_defs,$(COMNAME)_uno,\
+ -DBROKEN_ALLOCA \
+))
+endif
+
+#####################################
+else
+#####################################
+
+$(call gb_Output_error,Unsupported OS-platform-ABI $(OS)-$(CPUNAME)-$(COMNAME)
- please add a bridge under main/bridges/source/cpp_uno)
+
+#####################################
+endif
+#####################################
+
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/bridges/Library_java_uno.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/Library_java_uno.mk?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/Library_java_uno.mk (added)
+++ openoffice/trunk/main/bridges/Library_java_uno.mk Thu Dec 6 06:24:29 2018
@@ -0,0 +1,67 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,java_uno))
+
+$(eval $(call
gb_Library_add_precompiled_header,java_uno,$(SRCDIR)/bridges/inc/pch/precompiled_bridges_java_uno))
+
+$(eval $(call gb_Library_set_include,java_uno,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/bridges/inc \
+ -I$(SRCDIR)/bridges/inc/pch \
+ -I$(SRCDIR)/bridges/source/jni_uno \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call
gb_Library_set_private_extract_of_public_api,java_uno,$(OUTDIR)/bin/udkapi.rdb,\
+ com.sun.star.uno.XInterface \
+ com.sun.star.uno.TypeClass \
+))
+
+#$(eval $(call gb_Library_add_api,java_uno, \
+# udkapi \
+# offapi \
+#))
+
+$(eval $(call
gb_Library_set_versionmap,java_uno,$(SRCDIR)/bridges/source/jni_uno/java_uno.map))
+
+$(eval $(call gb_Library_add_linked_libs,java_uno,\
+ cppu \
+ jvmaccess \
+ sal \
+ salhelper \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,java_uno,\
+ bridges/source/jni_uno/jni_bridge \
+ bridges/source/jni_uno/jni_data \
+ bridges/source/jni_uno/jni_info \
+ bridges/source/jni_uno/jni_java2uno \
+ bridges/source/jni_uno/jni_uno2java \
+ bridges/source/jni_uno/nativethreadpool \
+))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/bridges/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/Makefile?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/Makefile (added)
+++ openoffice/trunk/main/bridges/Makefile Thu Dec 6 06:24:29 2018
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/bridges/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/bridges/Module_bridges.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/Module_bridges.mk?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/Module_bridges.mk (added)
+++ openoffice/trunk/main/bridges/Module_bridges.mk Thu Dec 6 06:24:29 2018
@@ -0,0 +1,33 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,bridges))
+
+$(eval $(call gb_Module_add_targets,bridges,\
+ Ant_java_uno \
+ Library_cpp_uno \
+ Library_java_uno \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx
(added)
+++ openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.cxx Thu
Dec 6 06:24:29 2018
@@ -0,0 +1,25 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#include "precompiled_bridges.hxx"
+
Added: openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx
(added)
+++ openoffice/trunk/main/bridges/inc/pch/precompiled_bridges_java_uno.hxx Thu
Dec 6 06:24:29 2018
@@ -0,0 +1,144 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:31.967936
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "boost/static_assert.hpp"
+
+#include "com/sun/star/bridge/InvalidProtocolChangeException.hdl"
+#include "com/sun/star/bridge/InvalidProtocolChangeException.hpp"
+#include "com/sun/star/bridge/ProtocolProperty.hdl"
+#include "com/sun/star/bridge/ProtocolProperty.hpp"
+#include "com/sun/star/bridge/XBridge.hpp"
+#include "com/sun/star/bridge/XBridgeFactory.hpp"
+#include "com/sun/star/bridge/XInstanceProvider.hpp"
+#include "com/sun/star/bridge/XUnoUrlResolver.hpp"
+#include "com/sun/star/connection/ConnectionSetupException.hpp"
+#include "com/sun/star/connection/NoConnectException.hpp"
+#include "com/sun/star/connection/XAcceptor.hpp"
+#include "com/sun/star/connection/XConnection.hpp"
+#include "com/sun/star/connection/XConnector.hpp"
+#include "com/sun/star/frame/XComponentLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMain.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/registry/InvalidRegistryException.hpp"
+#include "com/sun/star/registry/XImplementationRegistration.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/text/XTextDocument.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hdl"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hdl"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/TypeClass.hdl"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hdl"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/genfunc.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "cppuhelper/weak.hxx"
+
+
+#include "osl/conditn.h"
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/doublecheckedlocking.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/mutex.h"
+#include "osl/mutex.hxx"
+#include "osl/process.h"
+#include "osl/semaphor.h"
+#include "osl/thread.h"
+#include "osl/thread.hxx"
+#include "osl/time.h"
+
+#include "rtl/alloc.h"
+#include "rtl/byteseq.h"
+#include "rtl/byteseq.hxx"
+#include "rtl/instance.hxx"
+#include "rtl/memory.h"
+#include "rtl/process.h"
+#include "rtl/random.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/unload.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sal/alloca.h"
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "sys/types.h"
+
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+#include "typelib/typedescription.hxx"
+
+#include "uno/any2.h"
+#include "uno/data.h"
+#include "uno/dispatcher.h"
+#include "uno/environment.h"
+#include "uno/environment.hxx"
+#include "uno/lbnames.h"
+#include "uno/mapping.h"
+#include "uno/mapping.hxx"
+#include "uno/sequence2.h"
+#include "uno/threadpool.h"
+//---MARKER---
+#endif
Added: openoffice/trunk/main/bridges/java/java_uno/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/build.xml?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/java/java_uno/build.xml (added)
+++ openoffice/trunk/main/bridges/java/java_uno/build.xml Thu Dec 6 06:24:29
2018
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+
+<project name="java_uno" default="main" basedir=".">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+ <property name="jar.classpath" value="jurt.jar ridl.jar ../../lib/
../bin/"/>
+ <property name="jar.manifest" value="manifest"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ </path>
+ </target>
+
+</project>
+
Propchange: openoffice/trunk/main/bridges/java/java_uno/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openoffice/trunk/main/bridges/java/java_uno/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: openoffice/trunk/main/bridges/java/java_uno/manifest
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/manifest?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/java/java_uno/manifest (added)
+++ openoffice/trunk/main/bridges/java/java_uno/manifest Thu Dec 6 06:24:29
2018
@@ -0,0 +1 @@
+Sealed: true
Added:
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java?rev=1848262&view=auto
==============================================================================
---
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
(added)
+++
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
Thu Dec 6 06:24:29 2018
@@ -0,0 +1,48 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+package com.sun.star.bridges.jni_uno;
+
+import com.sun.star.lib.util.NativeLibraryLoader;
+
+//==============================================================================
+public final class JNI_info_holder
+{
+ static {
+ NativeLibraryLoader.loadLibrary(JNI_info_holder.class.getClassLoader(),
+ "java_uno");
+ }
+
+ private static JNI_info_holder s_holder = new JNI_info_holder();
+
+ private static long s_jni_info_handle;
+
+
//__________________________________________________________________________
+ private native void finalize( long jni_info_handle );
+
+
//__________________________________________________________________________
+ protected void finalize()
+ {
+ finalize( s_jni_info_handle );
+ }
+}
Propchange:
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java?rev=1848262&view=auto
==============================================================================
---
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
(added)
+++
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
Thu Dec 6 06:24:29 2018
@@ -0,0 +1,214 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+package com.sun.star.bridges.jni_uno;
+
+import com.sun.star.lib.util.AsynchronousFinalizer;
+import com.sun.star.lib.util.NativeLibraryLoader;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.IEnvironment;
+import com.sun.star.uno.IQueryInterface;
+
+
+//==============================================================================
+public final class JNI_proxy implements java.lang.reflect.InvocationHandler
+{
+ static {
+ NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(),
+ "java_uno");
+ }
+ protected static ClassLoader s_classloader =
+ JNI_proxy.class.getClassLoader();
+ protected static Class s_InvocationHandler [] =
+ new Class [] { java.lang.reflect.InvocationHandler.class };
+
+ protected long m_bridge_handle;
+ protected IEnvironment m_java_env;
+ protected long m_receiver_handle;
+ protected long m_td_handle;
+ protected Type m_type;
+ protected String m_oid;
+ protected Class m_class;
+
+
//__________________________________________________________________________
+ public static String get_stack_trace( Throwable throwable )
+ throws Throwable
+ {
+ boolean current_trace = false;
+ if (null == throwable)
+ {
+ throwable = new Throwable();
+ current_trace = true;
+ }
+ java.io.StringWriter string_writer =
+ new java.io.StringWriter();
+ java.io.PrintWriter print_writer =
+ new java.io.PrintWriter( string_writer, true );
+ throwable.printStackTrace( print_writer );
+ print_writer.flush();
+ print_writer.close();
+ string_writer.flush();
+ String trace = string_writer.toString();
+ if (current_trace)
+ {
+ // cut out first two lines
+ int n = trace.indexOf( '\n' );
+ n = trace.indexOf( '\n', n +1 );
+ trace = trace.substring( n +1 );
+ }
+ return "\njava stack trace:\n" + trace;
+ }
+
+
//__________________________________________________________________________
+ private native void finalize( long bridge_handle );
+
+
//__________________________________________________________________________
+ public void finalize()
+ {
+ AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() {
+ public void run() throws Throwable {
+ JNI_proxy.this.finalize( m_bridge_handle );
+ }
+ });
+ }
+
+
//__________________________________________________________________________
+ private JNI_proxy(
+ long bridge_handle, IEnvironment java_env,
+ long receiver_handle, long td_handle, Type type, String oid )
+ {
+ m_bridge_handle = bridge_handle;
+ m_java_env = java_env;
+ m_receiver_handle = receiver_handle;
+ m_td_handle = td_handle;
+ m_type = type;
+ m_oid = oid;
+ m_class = m_type.getZClass();
+ }
+
+
//__________________________________________________________________________
+ public static Object create(
+ long bridge_handle, IEnvironment java_env,
+ long receiver_handle, long td_handle, Type type, String oid,
+ java.lang.reflect.Constructor proxy_ctor )
+ throws Throwable
+ {
+ JNI_proxy handler = new JNI_proxy(
+ bridge_handle, java_env, receiver_handle, td_handle, type, oid );
+ Object proxy = proxy_ctor.newInstance( new Object [] { handler } );
+ return java_env.registerInterface( proxy, new String [] { oid }, type
);
+ }
+
+
//__________________________________________________________________________
+ public static java.lang.reflect.Constructor get_proxy_ctor( Class clazz )
+ throws Throwable
+ {
+ Class proxy_class = java.lang.reflect.Proxy.getProxyClass(
+ s_classloader,
+ new Class [] { clazz, IQueryInterface.class,
+ com.sun.star.lib.uno.Proxy.class } );
+ return proxy_class.getConstructor( s_InvocationHandler );
+ }
+
+
//__________________________________________________________________________
+ private native Object dispatch_call(
+ long bridge_handle, String decl_class, String method, Object args [] )
+ throws Throwable;
+
+ // InvocationHandler impl
+
//__________________________________________________________________________
+ public Object invoke(
+ Object proxy, java.lang.reflect.Method method, Object args [] )
+ throws Throwable
+ {
+ Class decl_class = method.getDeclaringClass();
+ String method_name = method.getName();
+
+ if (Object.class.equals( decl_class ))
+ {
+ if (method_name.equals( "hashCode" ))
+ {
+ // int hashCode()
+ return Integer.valueOf( m_oid.hashCode() );
+ }
+ else if (method_name.equals( "equals" ))
+ {
+ // boolean equals( Object obj )
+ return isSame(args[0]);
+ }
+ else if (method_name.equals( "toString" ))
+ {
+ // String toString()
+ return this.toString() + " [oid=" + m_oid +
+ ", type=" + m_type.getTypeName() + "]";
+ }
+ }
+ // UNO interface call
+ else if (decl_class.isAssignableFrom( m_class ))
+ {
+ // dispatch interface call
+ return dispatch_call(
+ m_bridge_handle, decl_class.getName(), method_name, args );
+ }
+ // IQueryInterface impl
+ else if (IQueryInterface.class.equals( decl_class ))
+ {
+ if (method_name.equals( "queryInterface" ))
+ {
+ // Object queryInterface( Type type )
+ Object registered_proxy =
+ m_java_env.getRegisteredInterface( m_oid, (Type)args[ 0 ]
);
+ if (null == registered_proxy)
+ {
+ return dispatch_call(
+ m_bridge_handle,
+ "com.sun.star.uno.XInterface", method_name, args );
+ }
+ else
+ {
+ return registered_proxy;
+ }
+ }
+ else if (method_name.equals( "isSame" ))
+ {
+ // boolean isSame( Object object )
+ return isSame(args[0]);
+ }
+ else if (method_name.equals( "getOid" ))
+ {
+ // String getOid()
+ return m_oid;
+ }
+ }
+
+ throw new com.sun.star.uno.RuntimeException(
+ "[jni_uno bridge error] unexpected call on proxy " +
+ proxy.toString() + ": " + method.toString() );
+ }
+
+ private Boolean isSame(Object obj) {
+ return obj != null
+ && m_oid.equals(UnoRuntime.generateOid(obj));
+ }
+}
Propchange:
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk?rev=1848262&view=auto
==============================================================================
---
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
(added)
+++
openoffice/trunk/main/bridges/java/java_uno/src/main/java/com/sun/star/bridges/jni_uno/makefile.mk
Thu Dec 6 06:24:29 2018
@@ -0,0 +1,49 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+PRJ=..$/..$/..$/..$/..$/..$/..$/..
+
+PRJNAME=bridges
+TARGET=java_uno
+PACKAGE=com$/sun$/star$/bridges$/jni_uno
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+JARFILES=jurt.jar ridl.jar
+JAVAFILES=$(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java
$(JAVACLASSFILES)))
+
+JAVACLASSFILES= \
+ $(CLASSDIR)$/$(PACKAGE)$/JNI_proxy.class \
+ $(CLASSDIR)$/$(PACKAGE)$/JNI_info_holder.class
+
+JARCLASSDIRS=$(PACKAGE)
+JARTARGET=$(TARGET).jar
+JARCOMPRESS=TRUE
+JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/
+CUSTOMMANIFESTFILE = manifest
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
Modified: openoffice/trunk/main/bridges/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/build.lst?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/prj/build.lst (original)
+++ openoffice/trunk/main/bridges/prj/build.lst Thu Dec 6 06:24:29 2018
@@ -1,36 +1,2 @@
br bridges : cppuhelper jurt jvmaccess salhelper NULL
-br bridges
usr1 - all br_mkout NULL
-br bridges\inc
nmake - all br_inc NULL
-br bridges\unotypes nmake
- all br_unotypes NULL
-br bridges\source\cpp_uno\mingw_intel nmake - w
br_gcc3i br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci
br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_intel nmake - u
br_gcc3li br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_os2_intel nmake - p
br_gcc3os br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u
br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_x86-64 nmake - u
br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u
br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_powerpc nmake - u
br_gcc3fp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_powerpc64 nmake - u
br_gcc3fp_64 br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u
br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u
br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_mips nmake - u
br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_m68k nmake - u
br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u
br_gcc3l3 br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u
br_gcc3l3_64 br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_sparc nmake - u
br_gcc3ls br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_linux_arm nmake - u
br_gcc3lr br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u
br_gcc3la br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u
br_gcc3lh br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u
br_gcc3ll br_unotypes NULL
-br bridges\source\cpp_uno\gcc3_macosx_intel nmake
- u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake
- u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\s5abi_macosx_x86-64 nmake
- u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\cc50_solaris_sparc nmake
- u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64
br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\cc50_solaris_intel nmake
- u br_cc50soli br_unotypes br_cppuno_shared br_inc NULL
-br bridges\source\cpp_uno\gcc3_solaris_sparc nmake
- u br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_solaris_intel nmake
- u br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u
br_gccni br_unotypes br_inc NULL
-br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared
br_unotypes br_inc NULL
-br bridges\source\jni_uno nmake -
all br_jni_uno br_unotypes br_inc NULL
-br bridges\source\jni_uno\java\com\sun\star\bridges\jni_uno
nmake - all br_jni_uno_java br_unotypes br_inc NULL
+br bridges\prj
nmake - all br_prj NULL
Modified: openoffice/trunk/main/bridges/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/d.lst?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/prj/d.lst (original)
+++ openoffice/trunk/main/bridges/prj/d.lst Thu Dec 6 06:24:29 2018
@@ -1,11 +0,0 @@
-..\%__SRC%\lib\libjava_uno* %_DEST%\lib%_EXT%\libjava_uno*
-..\%__SRC%\bin\java_uno* %_DEST%\bin%_EXT%\java_uno*
-..\%__SRC%\class\java_uno*.jar %_DEST%\bin%_EXT%\java_uno*.jar
-
-..\%__SRC%\bin\msci_uno.* %_DEST%\bin%_EXT%\msci_uno.*
-..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin%_EXT%\gcc3_uno.dll
-..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
-..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
-..\%__SRC%\lib\libs5abi_uno.* %_DEST%\lib%_EXT%\libs5abi_uno.*
-..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
-..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
Added: openoffice/trunk/main/bridges/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/makefile.mk?rev=1848262&view=auto
==============================================================================
--- openoffice/trunk/main/bridges/prj/makefile.mk (added)
+++ openoffice/trunk/main/bridges/prj/makefile.mk Thu Dec 6 06:24:29 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
$(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/bridges/source/bridge_exports.map
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/bridge_exports.map?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/bridge_exports.map (original)
+++ openoffice/trunk/main/bridges/source/bridge_exports.map Thu Dec 6 06:24:29
2018
@@ -23,6 +23,24 @@ UDK_3_0_0 {
component_canUnload;
uno_initEnvironment;
uno_ext_getMapping;
+
+
+ ###############################################
+ # C++ RTTI for exception handling:
+ ###############################################
+
+ # typeinfo for com::sun::star::uno::RuntimeException
+ _ZTIN3com3sun4star3uno16RuntimeExceptionE;
+
+ # typeinfo for com::sun::star::uno::Exception
+ _ZTIN3com3sun4star3uno9ExceptionE;
+
+ # typeinfo name for com::sun::star::uno::RuntimeException
+ _ZTSN3com3sun4star3uno16RuntimeExceptionE;
+
+ # typeinfo name for com::sun::star::uno::Exception
+ _ZTSN3com3sun4star3uno9ExceptionE;
+
local:
*;
};
Modified: openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx (original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/shared/component.cxx Thu Dec
6 06:24:29 2018
@@ -192,12 +192,12 @@ static void SAL_CALL environmentDisposin
&bridges::cpp_uno::shared::g_moduleCount.modCnt );
}
-sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SAL_THROW_EXTERN_C() {
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(TimeValue * pTime)
SAL_THROW_EXTERN_C() {
return bridges::cpp_uno::shared::g_moduleCount.canUnload(
&bridges::cpp_uno::shared::g_moduleCount, pTime);
}
-void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv)
+SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment *
pCppEnv)
SAL_THROW_EXTERN_C()
{
OSL_ENSURE( pCppEnv->pExtEnv, "### expected extended environment!" );
@@ -215,7 +215,7 @@ void SAL_CALL uno_initEnvironment(uno_En
pCppEnv->environmentDisposing = environmentDisposing;
}
-void SAL_CALL uno_ext_getMapping(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo)
SAL_THROW_EXTERN_C()
{
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_bridge.cxx Thu Dec 6
06:24:29 2018
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jni_bridge.h"
@@ -452,7 +452,7 @@ void SAL_CALL java_env_disposing( uno_En
}
//------------------------------------------------------------------------------
-void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
+JNIEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
SAL_THROW_EXTERN_C()
{
java_env->environmentDisposing = java_env_disposing;
@@ -466,7 +466,7 @@ void SAL_CALL uno_initEnvironment( uno_E
}
//------------------------------------------------------------------------------
-void SAL_CALL uno_ext_getMapping(
+JNIEXPORT void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
SAL_THROW_EXTERN_C()
{
@@ -557,7 +557,7 @@ void SAL_CALL uno_ext_getMapping(
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
+JNIEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
SAL_THROW_EXTERN_C()
{
return (*g_moduleCount.canUnload)( &g_moduleCount, pTime );
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_data.cxx Thu Dec 6
06:24:29 2018
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jni_bridge.h"
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_info.cxx Thu Dec 6
06:24:29 2018
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jni_bridge.h"
#include "com/sun/star/uno/RuntimeException.hpp"
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_java2uno.cxx Thu Dec 6
06:24:29 2018
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include <sal/alloca.h>
Modified: openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/jni_uno2java.cxx Thu Dec 6
06:24:29 2018
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include <sal/alloca.h>
Modified: openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx?rev=1848262&r1=1848261&r2=1848262&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx (original)
+++ openoffice/trunk/main/bridges/source/jni_uno/nativethreadpool.cxx Thu Dec
6 06:24:29 2018
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_bridges.hxx"
+#include "precompiled_bridges_java_uno.hxx"
#include "jvmaccess/virtualmachine.hxx"
#include "rtl/byteseq.h"
