Repository.mk | 2 jvmaccess/Library_jvmaccess.mk | 70 ++++++++++++++++++++++++++ jvmaccess/Makefile | 32 +++++++++++ jvmaccess/Module_jvmaccess.mk | 18 ++---- jvmaccess/Package_inc.mk | 29 ++++++++++ jvmaccess/inc/jvmaccess/classpath.hxx | 5 + jvmaccess/inc/jvmaccess/jvmaccessdllapi.h | 37 +++++++++++++ jvmaccess/inc/jvmaccess/unovirtualmachine.hxx | 5 + jvmaccess/inc/jvmaccess/virtualmachine.hxx | 7 +- jvmaccess/prj/build.lst | 4 - jvmaccess/prj/d.lst | 9 --- jvmaccess/prj/makefile.mk | 50 +++++------------- jvmaccess/util/gcc3.map | 8 +- jvmaccess/util/mingw.map | 8 +- store/inc/store/store.h | 51 +++++++++--------- store/source/store.cxx | 50 +++++++++--------- 16 files changed, 261 insertions(+), 124 deletions(-)
New commits: commit 2fdf81edc591a1b46ada64474800e36855b88b1c Author: Damjan Jovanovic <dam...@apache.org> Date: Sat Mar 24 00:50:48 2018 +0000 Export the right main/store symbols. Patch by: me diff --git a/store/inc/store/store.h b/store/inc/store/store.h index 1cecdd8aa390..351e33b5e69b 100644 --- a/store/inc/store/store.h +++ b/store/inc/store/store.h @@ -25,6 +25,7 @@ #define _STORE_STORE_H_ "$Revision$" #include <store/types.h> +#include <store/dllapi.h> #ifdef __cplusplus extern "C" { @@ -39,7 +40,7 @@ typedef void* storeHandle; @param Handle [in] the Handle. @return store_E_None upon success */ -storeError SAL_CALL store_acquireHandle ( +STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C(); @@ -49,7 +50,7 @@ storeError SAL_CALL store_acquireHandle ( @return store_E_None upon success, store_E_InvalidHandle otherwise. */ -storeError SAL_CALL store_releaseHandle ( +STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C(); @@ -66,7 +67,7 @@ typedef void* storeFileHandle; @param phFile [out] the File Handle. @return store_E_None upon success */ -storeError SAL_CALL store_createMemoryFile ( +STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile ( sal_uInt16 nPageSize, storeFileHandle *phFile ) SAL_THROW_EXTERN_C(); @@ -84,7 +85,7 @@ storeError SAL_CALL store_createMemoryFile ( @param phFile [out] the File Handle. @return store_E_None upon success */ -storeError SAL_CALL store_openFile ( +STORE_DLLPUBLIC storeError SAL_CALL store_openFile ( rtl_uString *pFilename, storeAccessMode eAccessMode, sal_uInt16 nPageSize, @@ -97,7 +98,7 @@ storeError SAL_CALL store_openFile ( @return store_E_None upon success, store_E_InvalidHandle otherwise. */ -storeError SAL_CALL store_closeFile ( +STORE_DLLPUBLIC storeError SAL_CALL store_closeFile ( storeFileHandle hFile ) SAL_THROW_EXTERN_C(); @@ -106,7 +107,7 @@ storeError SAL_CALL store_closeFile ( @param hFile [in] the File Handle. @return store_E_None upon success */ -storeError SAL_CALL store_flushFile ( +STORE_DLLPUBLIC storeError SAL_CALL store_flushFile ( storeFileHandle hFile ) SAL_THROW_EXTERN_C(); @@ -116,7 +117,7 @@ storeError SAL_CALL store_flushFile ( @param pnRefCount [out] number of open directories and streams. @return store_E_None upon success */ -storeError SAL_CALL store_getFileRefererCount ( +STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount ( storeFileHandle hFile, sal_uInt32 *pnRefCount ) SAL_THROW_EXTERN_C(); @@ -127,7 +128,7 @@ storeError SAL_CALL store_getFileRefererCount ( @param pnSize [out] the file size in bytes. @return store_E_None upon success */ -storeError SAL_CALL store_getFileSize ( +STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize ( storeFileHandle hFile, sal_uInt32 *pnSize ) SAL_THROW_EXTERN_C(); @@ -140,7 +141,7 @@ storeError SAL_CALL store_getFileSize ( @param pDstFilename [in] created with store_AccessCreate. @return store_E_None upon success */ -storeError SAL_CALL store_rebuildFile ( +STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile ( rtl_uString *pSrcFilename, rtl_uString *pDstFilename ) SAL_THROW_EXTERN_C(); @@ -162,7 +163,7 @@ typedef void* storeDirectoryHandle; @param phDirectory [out] the Directory Handle. @return store_E_None upon success */ -storeError SAL_CALL store_openDirectory ( +STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory ( storeFileHandle hFile, rtl_uString *pPath, rtl_uString *pName, @@ -176,7 +177,7 @@ storeError SAL_CALL store_openDirectory ( @return store_E_None upon success, store_E_InvalidHandle otherwise. */ -storeError SAL_CALL store_closeDirectory ( +STORE_DLLPUBLIC storeError SAL_CALL store_closeDirectory ( storeDirectoryHandle hDirectory ) SAL_THROW_EXTERN_C(); @@ -187,7 +188,7 @@ storeError SAL_CALL store_closeDirectory ( @return store_E_None upon success, store_E_NoMoreFile upon end of iteration. */ -storeError SAL_CALL store_findFirst ( +STORE_DLLPUBLIC storeError SAL_CALL store_findFirst ( storeDirectoryHandle hDirectory, storeFindData *pFindData ) SAL_THROW_EXTERN_C(); @@ -199,7 +200,7 @@ storeError SAL_CALL store_findFirst ( @return store_E_None upon success, store_E_NoMoreFile upon end of iteration. */ -storeError SAL_CALL store_findNext ( +STORE_DLLPUBLIC storeError SAL_CALL store_findNext ( storeDirectoryHandle hDirectory, storeFindData *pFindData ) SAL_THROW_EXTERN_C(); @@ -221,7 +222,7 @@ typedef void* storeStreamHandle; @param phStrm [out] the Stream Handle. @return store_E_None upon success */ -storeError SAL_CALL store_openStream ( +STORE_DLLPUBLIC storeError SAL_CALL store_openStream ( storeFileHandle hFile, rtl_uString *pPath, rtl_uString *pName, @@ -235,7 +236,7 @@ storeError SAL_CALL store_openStream ( @return store_E_None upon success, store_E_InvalidHandle otherwise. */ -storeError SAL_CALL store_closeStream ( +STORE_DLLPUBLIC storeError SAL_CALL store_closeStream ( storeStreamHandle hStrm ) SAL_THROW_EXTERN_C(); @@ -248,7 +249,7 @@ storeError SAL_CALL store_closeStream ( @param pnDone [out] the number of bytes actually read. @return store_E_None upon success */ -storeError SAL_CALL store_readStream ( +STORE_DLLPUBLIC storeError SAL_CALL store_readStream ( storeStreamHandle hStrm, sal_uInt32 nOffset, void *pBuffer, @@ -265,7 +266,7 @@ storeError SAL_CALL store_readStream ( @param pnDone [out] the number of bytes actually written. @return store_E_None upon success */ -storeError SAL_CALL store_writeStream ( +STORE_DLLPUBLIC storeError SAL_CALL store_writeStream ( storeStreamHandle hStrm, sal_uInt32 nOffset, const void *pBuffer, @@ -278,7 +279,7 @@ storeError SAL_CALL store_writeStream ( @param hStrm [in] the Stream Handle. @return store_E_None upon success */ -storeError SAL_CALL store_flushStream ( +STORE_DLLPUBLIC storeError SAL_CALL store_flushStream ( storeStreamHandle hStrm ) SAL_THROW_EXTERN_C(); @@ -288,7 +289,7 @@ storeError SAL_CALL store_flushStream ( @param pnSize [out] the stream size in bytes. @return store_E_None upon success */ -storeError SAL_CALL store_getStreamSize ( +STORE_DLLPUBLIC storeError SAL_CALL store_getStreamSize ( storeStreamHandle hStrm, sal_uInt32 *pnSize ) SAL_THROW_EXTERN_C(); @@ -299,7 +300,7 @@ storeError SAL_CALL store_getStreamSize ( @param nSize [in] the new stream size in bytes. @return store_E_None upon success */ -storeError SAL_CALL store_setStreamSize ( +STORE_DLLPUBLIC storeError SAL_CALL store_setStreamSize ( storeStreamHandle hStrm, sal_uInt32 nSize ) SAL_THROW_EXTERN_C(); @@ -315,7 +316,7 @@ storeError SAL_CALL store_setStreamSize ( @param pnAttrib [out] the resulting attributes, may be NULL. @return store_E_None upon success */ -storeError SAL_CALL store_attrib ( +STORE_DLLPUBLIC storeError SAL_CALL store_attrib ( storeFileHandle hFile, rtl_uString *pPath, rtl_uString *pName, @@ -337,7 +338,7 @@ storeError SAL_CALL store_attrib ( @param pDstName [in] the Destination name @return store_E_None upon success */ -storeError SAL_CALL store_link ( +STORE_DLLPUBLIC storeError SAL_CALL store_link ( storeFileHandle hFile, rtl_uString *pSrcPath, rtl_uString *pSrcName, rtl_uString *pDstPath, rtl_uString *pDstName @@ -356,7 +357,7 @@ storeError SAL_CALL store_link ( @param pDstName [in] the Destination name @return store_E_None upon success */ -storeError SAL_CALL store_symlink ( +STORE_DLLPUBLIC storeError SAL_CALL store_symlink ( storeFileHandle hFile, rtl_uString *pSrcPath, rtl_uString *pSrcName, rtl_uString *pDstPath, rtl_uString *pDstName @@ -371,7 +372,7 @@ storeError SAL_CALL store_symlink ( @param pDstName [in] the Destination name @return store_E_None upon success */ -storeError SAL_CALL store_rename ( +STORE_DLLPUBLIC storeError SAL_CALL store_rename ( storeFileHandle hFile, rtl_uString *pSrcPath, rtl_uString *pSrcName, rtl_uString *pDstPath, rtl_uString *pDstName @@ -384,7 +385,7 @@ storeError SAL_CALL store_rename ( @param pName [in] the entry name @return store_E_None upon success */ -storeError SAL_CALL store_remove ( +STORE_DLLPUBLIC storeError SAL_CALL store_remove ( storeFileHandle hFile, rtl_uString *pPath, rtl_uString *pName diff --git a/store/source/store.cxx b/store/source/store.cxx index 2b49ee9f460e..0d0e32b12104 100644 --- a/store/source/store.cxx +++ b/store/source/store.cxx @@ -75,7 +75,7 @@ using namespace store; /* * store_acquireHandle. */ -STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle ( +storeError SAL_CALL store_acquireHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C() { @@ -90,7 +90,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle ( /* * store_releaseHandle. */ -STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle ( +storeError SAL_CALL store_releaseHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C() { @@ -110,7 +110,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle ( /* * store_createMemoryFile. */ -STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile ( +storeError SAL_CALL store_createMemoryFile ( sal_uInt16 nPageSize, storeFileHandle *phFile ) SAL_THROW_EXTERN_C() @@ -144,7 +144,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile ( /* * store_openFile. */ -STORE_DLLPUBLIC storeError SAL_CALL store_openFile ( +storeError SAL_CALL store_openFile ( rtl_uString *pFilename, storeAccessMode eAccessMode, sal_uInt16 nPageSize, @@ -182,7 +182,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openFile ( /* * store_closeFile. */ -STORE_DLLPUBLIC storeError SAL_CALL store_closeFile ( +storeError SAL_CALL store_closeFile ( storeFileHandle Handle ) SAL_THROW_EXTERN_C() { @@ -199,7 +199,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_closeFile ( /* * store_flushFile. */ -STORE_DLLPUBLIC storeError SAL_CALL store_flushFile ( +storeError SAL_CALL store_flushFile ( storeFileHandle Handle ) SAL_THROW_EXTERN_C() { @@ -214,7 +214,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_flushFile ( /* * store_getFileRefererCount. */ -STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount ( +storeError SAL_CALL store_getFileRefererCount ( storeFileHandle Handle, sal_uInt32 *pnRefCount ) SAL_THROW_EXTERN_C() @@ -234,7 +234,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount ( /* * store_getFileSize. */ -STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize ( +storeError SAL_CALL store_getFileSize ( storeFileHandle Handle, sal_uInt32 *pnSize ) SAL_THROW_EXTERN_C() @@ -253,7 +253,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize ( /* * store_rebuildFile. */ -STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile ( +storeError SAL_CALL store_rebuildFile ( rtl_uString *pSrcFilename, rtl_uString *pDstFilename ) SAL_THROW_EXTERN_C() @@ -290,7 +290,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile ( /* * store_openDirectory. */ -STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory ( +storeError SAL_CALL store_openDirectory ( storeFileHandle hFile, rtl_uString *pPath, rtl_uString *pName, @@ -330,7 +330,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory ( /* * store_closeDirectory. */ -STORE_DLLPUBLIC storeError SAL_CALL store_closeDirectory ( +storeError SAL_CALL store_closeDirectory ( storeDirectoryHandle Handle ) SAL_THROW_EXTERN_C() { @@ -346,7 +346,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_closeDirectory ( /* * store_findFirst. */ -STORE_DLLPUBLIC storeError SAL_CALL store_findFirst ( +storeError SAL_CALL store_findFirst ( storeDirectoryHandle Handle, storeFindData *pFindData ) SAL_THROW_EXTERN_C() @@ -370,7 +370,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_findFirst ( /* * store_findNext. */ -STORE_DLLPUBLIC storeError SAL_CALL store_findNext ( +storeError SAL_CALL store_findNext ( storeDirectoryHandle Handle, storeFindData *pFindData ) SAL_THROW_EXTERN_C() @@ -400,7 +400,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_findNext ( /* * store_openStream */ -STORE_DLLPUBLIC storeError SAL_CALL store_openStream ( +storeError SAL_CALL store_openStream ( storeFileHandle hFile, rtl_uString *pPath, rtl_uString *pName, @@ -440,7 +440,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openStream ( /* * store_closeStream. */ -STORE_DLLPUBLIC storeError SAL_CALL store_closeStream ( +storeError SAL_CALL store_closeStream ( storeStreamHandle Handle ) SAL_THROW_EXTERN_C() { @@ -456,7 +456,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_closeStream ( /* * store_readStream. */ -STORE_DLLPUBLIC storeError SAL_CALL store_readStream ( +storeError SAL_CALL store_readStream ( storeStreamHandle Handle, sal_uInt32 nOffset, void *pBuffer, @@ -478,7 +478,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_readStream ( /* * store_writeStream. */ -STORE_DLLPUBLIC storeError SAL_CALL store_writeStream ( +storeError SAL_CALL store_writeStream ( storeStreamHandle Handle, sal_uInt32 nOffset, const void *pBuffer, @@ -500,7 +500,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_writeStream ( /* * store_flushStream. */ -STORE_DLLPUBLIC storeError SAL_CALL store_flushStream ( +storeError SAL_CALL store_flushStream ( storeStreamHandle Handle ) SAL_THROW_EXTERN_C() { @@ -515,7 +515,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_flushStream ( /* * store_getStreamSize. */ -STORE_DLLPUBLIC storeError SAL_CALL store_getStreamSize ( +storeError SAL_CALL store_getStreamSize ( storeStreamHandle Handle, sal_uInt32 *pnSize ) SAL_THROW_EXTERN_C() @@ -534,7 +534,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_getStreamSize ( /* * store_setStreamSize. */ -STORE_DLLPUBLIC storeError SAL_CALL store_setStreamSize ( +storeError SAL_CALL store_setStreamSize ( storeStreamHandle Handle, sal_uInt32 nSize ) SAL_THROW_EXTERN_C() @@ -555,7 +555,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_setStreamSize ( /* * store_attrib. */ -STORE_DLLPUBLIC storeError SAL_CALL store_attrib ( +storeError SAL_CALL store_attrib ( storeFileHandle Handle, rtl_uString *pPath, rtl_uString *pName, @@ -596,7 +596,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_attrib ( /* * store_link. */ -STORE_DLLPUBLIC storeError SAL_CALL store_link ( +storeError SAL_CALL store_link ( storeFileHandle Handle, rtl_uString *pSrcPath, rtl_uString *pSrcName, rtl_uString *pDstPath, rtl_uString *pDstName @@ -646,7 +646,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_link ( /* * store_symlink. */ -STORE_DLLPUBLIC storeError SAL_CALL store_symlink ( +storeError SAL_CALL store_symlink ( storeFileHandle Handle, rtl_uString *pSrcPath, rtl_uString *pSrcName, rtl_uString *pDstPath, rtl_uString *pDstName @@ -689,7 +689,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_symlink ( /* * store_rename. */ -STORE_DLLPUBLIC storeError SAL_CALL store_rename ( +storeError SAL_CALL store_rename ( storeFileHandle Handle, rtl_uString *pSrcPath, rtl_uString *pSrcName, rtl_uString *pDstPath, rtl_uString *pDstName @@ -732,7 +732,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_rename ( /* * store_remove. */ -STORE_DLLPUBLIC storeError SAL_CALL store_remove ( +storeError SAL_CALL store_remove ( storeFileHandle Handle, rtl_uString *pPath, rtl_uString *pName commit 647179d372c31278be7872138b28ed64c27371d4 Author: Damjan Jovanovic <dam...@apache.org> Date: Sat Mar 24 00:02:32 2018 +0000 Move jvmaccess to RTVERLIBS so it can be versioned properly like dmake did. Patch by: me diff --git a/Repository.mk b/Repository.mk index 40a240fa7650..c9dd1cad9384 100644 --- a/Repository.mk +++ b/Repository.mk @@ -186,13 +186,13 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ i18nutil \ - jvmaccess \ ucbhelper \ vos3 \ )) $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ + jvmaccess \ salhelper \ )) commit f05905bd903ffec91876014b21bfdd8237361175 Author: Damjan Jovanovic <dam...@apache.org> Date: Sat Mar 24 00:00:51 2018 +0000 Port main/jvmaccess to gbuild. Patch by: me diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk new file mode 100644 index 000000000000..24c137545ed6 --- /dev/null +++ b/jvmaccess/Library_jvmaccess.mk @@ -0,0 +1,70 @@ +#************************************************************** +# +# 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,jvmaccess)) + +ifeq ($(COMNAME),msci) +$(eval $(call gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/msvc_win32_intel.map)) +else ifeq ($(COMNAME),sunpro5) +$(eval $(call gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/cc5_solaris_sparc.map)) +else ifeq ($(GUI)$(COM),WNTGCC) +$(eval $(call gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/mingw.map)) +else ifeq ($(COMNAME),gcc3) +$(eval $(call gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/gcc3.map)) +endif + +$(eval $(call gb_Library_set_include,jvmaccess,\ + $$(INCLUDE) \ + -I$(SRCDIR)/jvmaccess/inc \ +)) + +$(eval $(call gb_Library_add_api,jvmaccess,\ + udkapi \ +)) + +$(eval $(call gb_Library_add_defs,jvmaccess,\ + -DJVMACCESS_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,jvmaccess,\ + cppu \ + sal \ + salhelper \ + stl \ + $(gb_STDLIBS) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,jvmaccess,\ + advapi32 \ +)) +endif + + +$(eval $(call gb_Library_add_exception_objects,jvmaccess,\ + jvmaccess/source/classpath \ + jvmaccess/source/unovirtualmachine \ + jvmaccess/source/virtualmachine \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/jvmaccess/Makefile b/jvmaccess/Makefile new file mode 100644 index 000000000000..c1d144cbd4c9 --- /dev/null +++ b/jvmaccess/Makefile @@ -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: diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/Module_jvmaccess.mk similarity index 80% rename from jvmaccess/source/makefile.mk rename to jvmaccess/Module_jvmaccess.mk index 73b8d7a9027b..88089645b5a4 100644 --- a/jvmaccess/source/makefile.mk +++ b/jvmaccess/Module_jvmaccess.mk @@ -21,17 +21,11 @@ -PRJ = .. -PRJNAME = jvmaccess -TARGET = $(PRJNAME) +$(eval $(call gb_Module_Module,jvmaccess)) -ENABLE_EXCEPTIONS = TRUE +$(eval $(call gb_Module_add_targets,jvmaccess,\ + Library_jvmaccess \ + Package_inc \ +)) -.INCLUDE: settings.mk - -SLOFILES = \ - $(SLO)$/classpath.obj \ - $(SLO)$/unovirtualmachine.obj \ - $(SLO)$/virtualmachine.obj - -.INCLUDE: target.mk +# vim: set noet sw=4 ts=4: diff --git a/jvmaccess/Package_inc.mk b/jvmaccess/Package_inc.mk new file mode 100644 index 000000000000..c64245f52fe9 --- /dev/null +++ b/jvmaccess/Package_inc.mk @@ -0,0 +1,29 @@ +#************************************************************** +# +# 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_Package_Package,jvmaccess_inc,$(SRCDIR)/jvmaccess/inc/jvmaccess)) + +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/classpath.hxx,classpath.hxx)) +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/jvmaccessdllapi.h,jvmaccessdllapi.h)) +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/unovirtualmachine.hxx,unovirtualmachine.hxx)) +$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/virtualmachine.hxx,virtualmachine.hxx)) diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx index a5e67b8ceb40..72c89b20673f 100644 --- a/jvmaccess/inc/jvmaccess/classpath.hxx +++ b/jvmaccess/inc/jvmaccess/classpath.hxx @@ -26,6 +26,7 @@ #include "sal/config.h" #include "com/sun/star/uno/Reference.hxx" +#include "jvmaccess/jvmaccessdllapi.h" #if defined SOLAR_JAVA #include "jni.h" @@ -130,12 +131,12 @@ private: // that their mangled C++ names do not depend on the JDK version used at // compile time: - static void * doTranslateToUrls( + JVMACCESS_DLLPUBLIC static void * doTranslateToUrls( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context, void * environment, ::rtl::OUString const & classPath); - static void * doLoadClass( + JVMACCESS_DLLPUBLIC static void * doLoadClass( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context, void * environment, ::rtl::OUString const & classPath, diff --git a/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h b/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h new file mode 100644 index 000000000000..1ea1acad5bcc --- /dev/null +++ b/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h @@ -0,0 +1,37 @@ +/************************************************************** + * + * 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. + * + *************************************************************/ + + + +#ifndef INCLUDED_JVMACCESSDLLAPI_H +#define INCLUDED_JVMACCESSDLLAPI_H + +#include "sal/types.h" + +#if defined(JVMACCESS_DLLIMPLEMENTATION) +#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define JVMACCESS_DLLPRIVATE SAL_DLLPRIVATE + +#endif /* INCLUDED_JVMACCESSDLLAPI_H */ + diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx index 4fe573bb44ab..73ada3b86c81 100644 --- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx +++ b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx @@ -27,6 +27,7 @@ #include "sal/config.h" #include "salhelper/simplereferenceobject.hxx" #include "rtl/ref.hxx" +#include "jvmaccess/jvmaccessdllapi.h" namespace jvmaccess { @@ -35,11 +36,11 @@ class VirtualMachine; /** An encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader. */ -class UnoVirtualMachine: public salhelper::SimpleReferenceObject { +class JVMACCESS_DLLPUBLIC UnoVirtualMachine: public salhelper::SimpleReferenceObject { public: /** An exception indicating failure to create a UnoVirtualMachine. */ - class CreationException + class JVMACCESS_DLLPUBLIC CreationException { public: CreationException(); diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx index 53b5865ae8f0..79205b1d3524 100644 --- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx +++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx @@ -26,6 +26,7 @@ #include "rtl/ref.hxx" #include "salhelper/simplereferenceobject.hxx" +#include "jvmaccess/jvmaccessdllapi.h" #ifdef SOLAR_JAVA #include "jni.h" @@ -40,7 +41,7 @@ namespace jvmaccess { /** An encapsulating wrapper around a Java virtual machine. */ -class VirtualMachine: public salhelper::SimpleReferenceObject +class JVMACCESS_DLLPUBLIC VirtualMachine: public salhelper::SimpleReferenceObject { public: /** A helper to attach a thread to a Java virtual machine. @@ -53,12 +54,12 @@ public: detach the thread from the virtual machine upon destruction of the guard at the bottom of the stack). */ - class AttachGuard + class JVMACCESS_DLLPUBLIC AttachGuard { public: /** An exception indicating failure to create an AttachGuard. */ - class CreationException + class JVMACCESS_DLLPUBLIC CreationException { public: CreationException(); diff --git a/jvmaccess/prj/build.lst b/jvmaccess/prj/build.lst index 723c0a6ec6b8..7210a34e1bfd 100644 --- a/jvmaccess/prj/build.lst +++ b/jvmaccess/prj/build.lst @@ -1,4 +1,2 @@ jv jvmaccess : offapi ridljar cppu sal salhelper NULL -jv jvmaccess usr1 - all jv_mkout NULL -jv jvmaccess\source nmake - all jv_source NULL -jv jvmaccess\util nmake - all jv_util jv_source NULL +jv jvmaccess\prj nmake - all jv_prj NULL diff --git a/jvmaccess/prj/d.lst b/jvmaccess/prj/d.lst index 6590fc2a8b71..e69de29bb2d1 100644 --- a/jvmaccess/prj/d.lst +++ b/jvmaccess/prj/d.lst @@ -1,9 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\jvmaccess -..\inc\jvmaccess\classpath.hxx %_DEST%\inc%_EXT%\jvmaccess\classpath.hxx -..\inc\jvmaccess\unovirtualmachine.hxx %_DEST%\inc%_EXT%\jvmaccess\unovirtualmachine.hxx -..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc%_EXT%\jvmaccess\virtualmachine.hxx -..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib -..\%__SRC%\lib\jvmaccess*.lib %_DEST%\lib%_EXT%\jvmaccess*.lib -..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib%_EXT%\* -linklib: libjvmaccess*.*.* diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/prj/makefile.mk similarity index 53% rename from jvmaccess/util/makefile.mk rename to jvmaccess/prj/makefile.mk index 4f7a15265cd0..c62c6a657d16 100644 --- a/jvmaccess/util/makefile.mk +++ b/jvmaccess/prj/makefile.mk @@ -21,42 +21,24 @@ -PRJ = .. -PRJNAME = jvmaccess -TARGET = $(PRJNAME) +PRJ=.. +TARGET=prj -ENABLE_EXCEPTIONS = TRUE +.INCLUDE : settings.mk -.IF "$(OS)" != "WNT" && "$(OS)" != "OS2" -UNIXVERSIONNAMES = UDK -.ENDIF # WNT - -.INCLUDE: settings.mk - -.IF "$(UNIXVERSIONNAMES)" == "" -SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID) -.ELSE # UNIXVERSIONNAMES -SHL1TARGET = $(TARGET)$(COMID) -.ENDIF # UNIXVERSIONNAMES - -SHL1IMPLIB = i$(TARGET) -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB) -.IF "$(OS)" == "WNT" -SHL1STDLIBS += $(ADVAPI32LIB) -.ENDIF # WNT -SHL1RPATH = URELIB - -.IF "$(COMNAME)" == "msci" -SHL1VERSIONMAP = msvc_win32_intel.map -.ELIF "$(COMNAME)" == "sunpro5" -SHL1VERSIONMAP = cc5_solaris_sparc.map -.ELIF "$(GUI)$(COM)" == "WNTGCC" -SHL1VERSIONMAP = mingw.map -.ELIF "$(COMNAME)" == "gcc3" -SHL1VERSIONMAP = gcc3.map +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s .ENDIF -DEF1NAME = $(SHL1TARGET) +.IF "$(DEBUG)"!="" +DEBUG_ARGUMENT=DEBUG=$(DEBUG) +.ELIF "$(debug)"!="" +DEBUG_ARGUMENT=debug=$(debug) +.ELSE +DEBUG_ARGUMENT= +.ENDIF -.INCLUDE: target.mk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map index 1df8c297a15b..1bc94dc25a1b 100644 --- a/jvmaccess/util/gcc3.map +++ b/jvmaccess/util/gcc3.map @@ -28,8 +28,8 @@ UDK_3.1 { _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &) - # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException - # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException _ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) _ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) _ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() @@ -68,8 +68,8 @@ UDK_3.3 { _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &) - # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException - # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException + _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException + _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException _ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) _ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) _ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const diff --git a/jvmaccess/util/mingw.map b/jvmaccess/util/mingw.map index f2e39856b231..f1d811c13261 100644 --- a/jvmaccess/util/mingw.map +++ b/jvmaccess/util/mingw.map @@ -28,8 +28,8 @@ UDK_3_0_0 { _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &) _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException() _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &) - # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException - # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException _ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) _ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) _ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() @@ -52,8 +52,8 @@ UDK_3_0_0 { _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException() _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &) - # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException - # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException + _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException + _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException _ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) _ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *) _ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits