Author: damjan
Date: Fri Mar 23 00:18:40 2018
New Revision: 1827538
URL: http://svn.apache.org/viewvc?rev=1827538&view=rev
Log:
Port main/store to gbuild.
Patch by: me
Added:
openoffice/trunk/main/store/Library_store.mk
openoffice/trunk/main/store/Makefile
openoffice/trunk/main/store/Module_store.mk
openoffice/trunk/main/store/Package_inc.mk
openoffice/trunk/main/store/Package_xml.mk
openoffice/trunk/main/store/inc/store/dllapi.h
openoffice/trunk/main/store/prj/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/store/prj/build.lst
openoffice/trunk/main/store/prj/d.lst
openoffice/trunk/main/store/source/store.cxx
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1827538&r1=1827537&r2=1827538&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Fri Mar 23 00:18:40 2018
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,o
slideshow \
sot \
starmath \
+ store \
svgio \
svl \
svtools \
Added: openoffice/trunk/main/store/Library_store.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/Library_store.mk?rev=1827538&view=auto
==============================================================================
--- openoffice/trunk/main/store/Library_store.mk (added)
+++ openoffice/trunk/main/store/Library_store.mk Fri Mar 23 00:18:40 2018
@@ -0,0 +1,60 @@
+#**************************************************************
+#
+# 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,store))
+
+$(eval $(call
gb_Library_add_precompiled_header,store,$(SRCDIR)/store/inc/pch/precompiled_store))
+
+$(eval $(call gb_Library_set_versionmap,store,$(SRCDIR)/store/util/store.map))
+
+$(eval $(call gb_Library_set_include,store,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/store/inc \
+ -I$(SRCDIR)/store/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,store,\
+ -DSTORE_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,store,\
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_noexception_objects,store,\
+ store/source/object \
+ store/source/lockbyte \
+ store/source/storbase \
+ store/source/storbios \
+ store/source/storcach \
+ store/source/stordata \
+ store/source/stordir \
+ store/source/storlckb \
+ store/source/stortree \
+ store/source/storpage \
+ store/source/store \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/store/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/Makefile?rev=1827538&view=auto
==============================================================================
--- openoffice/trunk/main/store/Makefile (added)
+++ openoffice/trunk/main/store/Makefile Fri Mar 23 00:18:40 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:
Added: openoffice/trunk/main/store/Module_store.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/Module_store.mk?rev=1827538&view=auto
==============================================================================
--- openoffice/trunk/main/store/Module_store.mk (added)
+++ openoffice/trunk/main/store/Module_store.mk Fri Mar 23 00:18:40 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,store))
+
+$(eval $(call gb_Module_add_targets,store,\
+ Library_store \
+ Package_inc \
+ Package_xml \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/store/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/Package_inc.mk?rev=1827538&view=auto
==============================================================================
--- openoffice/trunk/main/store/Package_inc.mk (added)
+++ openoffice/trunk/main/store/Package_inc.mk Fri Mar 23 00:18:40 2018
@@ -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,store_inc,$(SRCDIR)/store/inc))
+
+$(eval $(call gb_Package_add_file,store_inc,inc/store/dllapi.h,store/dllapi.h))
+$(eval $(call gb_Package_add_file,store_inc,inc/store/store.h,store/store.h))
+$(eval $(call
gb_Package_add_file,store_inc,inc/store/store.hxx,store/store.hxx))
+$(eval $(call gb_Package_add_file,store_inc,inc/store/types.h,store/types.h))
Added: openoffice/trunk/main/store/Package_xml.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/Package_xml.mk?rev=1827538&view=auto
==============================================================================
--- openoffice/trunk/main/store/Package_xml.mk (added)
+++ openoffice/trunk/main/store/Package_xml.mk Fri Mar 23 00:18:40 2018
@@ -0,0 +1,26 @@
+###############################################################
+#
+# 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,store_xml,$(SRCDIR)/store/util))
+
+$(eval $(call gb_Package_add_file,store_xml,xml/store.xml,store.xml))
Added: openoffice/trunk/main/store/inc/store/dllapi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/inc/store/dllapi.h?rev=1827538&view=auto
==============================================================================
--- openoffice/trunk/main/store/inc/store/dllapi.h (added)
+++ openoffice/trunk/main/store/inc/store/dllapi.h Fri Mar 23 00:18:40 2018
@@ -0,0 +1,36 @@
+/**************************************************************
+ *
+ * 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 STORE_DLLAPI_H
+#define STORE_DLLAPI_H
+
+#include "sal/config.h"
+#include "sal/types.h"
+
+#if defined STORE_DLLIMPLEMENTATION
+#define STORE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define STORE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
Modified: openoffice/trunk/main/store/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/prj/build.lst?rev=1827538&r1=1827537&r2=1827538&view=diff
==============================================================================
--- openoffice/trunk/main/store/prj/build.lst (original)
+++ openoffice/trunk/main/store/prj/build.lst Fri Mar 23 00:18:40 2018
@@ -1,5 +1,2 @@
s8 store : sal NULL
-s8 store
usr1 - all s8_mkout NULL
-s8 store\inc
nmake - all s8_inc NULL
-s8 store\source nmake
- all s8_source s8_inc NULL
-s8 store\util
nmake - all s8_util s8_source NULL
+s8 store\prj nmake
- all s8_prj NULL
Modified: openoffice/trunk/main/store/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/prj/d.lst?rev=1827538&r1=1827537&r2=1827538&view=diff
==============================================================================
--- openoffice/trunk/main/store/prj/d.lst (original)
+++ openoffice/trunk/main/store/prj/d.lst Fri Mar 23 00:18:40 2018
@@ -1,14 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\store
-..\inc\store\*.h %_DEST%\inc%_EXT%\store\*.h
-..\inc\store\store.hxx %_DEST%\inc%_EXT%\store\store.hxx
-..\inc\store\store.inl %_DEST%\inc%_EXT%\store\store.inl
-..\util\store.xml %_DEST%\xml%_EXT%\store.xml
-
-..\%__SRC%\lib\istore.lib %_DEST%\lib%_EXT%\istore.lib
-..\%__SRC%\lib\store*.lib %_DEST%\lib%_EXT%\store*.lib
-..\%__SRC%\lib\libstore.*.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\sto*.dll %_DEST%\bin%_EXT%\sto*.dll
-
-
-
-linklib: libstore.*.*
Added: openoffice/trunk/main/store/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/prj/makefile.mk?rev=1827538&view=auto
==============================================================================
--- openoffice/trunk/main/store/prj/makefile.mk (added)
+++ openoffice/trunk/main/store/prj/makefile.mk Fri Mar 23 00:18:40 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/store/source/store.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/source/store.cxx?rev=1827538&r1=1827537&r2=1827538&view=diff
==============================================================================
--- openoffice/trunk/main/store/source/store.cxx (original)
+++ openoffice/trunk/main/store/source/store.cxx Fri Mar 23 00:18:40 2018
@@ -25,6 +25,7 @@
#include "precompiled_store.hxx"
#include "store/store.h"
+#include "store/dllapi.h"
#include <sal/types.h>
#include <rtl/memory.h>
@@ -74,7 +75,7 @@ using namespace store;
/*
* store_acquireHandle.
*/
-storeError SAL_CALL store_acquireHandle (
+STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle (
storeHandle Handle
) SAL_THROW_EXTERN_C()
{
@@ -89,7 +90,7 @@ storeError SAL_CALL store_acquireHandle
/*
* store_releaseHandle.
*/
-storeError SAL_CALL store_releaseHandle (
+STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle (
storeHandle Handle
) SAL_THROW_EXTERN_C()
{
@@ -109,7 +110,7 @@ storeError SAL_CALL store_releaseHandle
/*
* store_createMemoryFile.
*/
-storeError SAL_CALL store_createMemoryFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile (
sal_uInt16 nPageSize,
storeFileHandle *phFile
) SAL_THROW_EXTERN_C()
@@ -143,7 +144,7 @@ storeError SAL_CALL store_createMemoryFi
/*
* store_openFile.
*/
-storeError SAL_CALL store_openFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_openFile (
rtl_uString *pFilename,
storeAccessMode eAccessMode,
sal_uInt16 nPageSize,
@@ -181,7 +182,7 @@ storeError SAL_CALL store_openFile (
/*
* store_closeFile.
*/
-storeError SAL_CALL store_closeFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_closeFile (
storeFileHandle Handle
) SAL_THROW_EXTERN_C()
{
@@ -198,7 +199,7 @@ storeError SAL_CALL store_closeFile (
/*
* store_flushFile.
*/
-storeError SAL_CALL store_flushFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_flushFile (
storeFileHandle Handle
) SAL_THROW_EXTERN_C()
{
@@ -213,7 +214,7 @@ storeError SAL_CALL store_flushFile (
/*
* store_getFileRefererCount.
*/
-storeError SAL_CALL store_getFileRefererCount (
+STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount (
storeFileHandle Handle,
sal_uInt32 *pnRefCount
) SAL_THROW_EXTERN_C()
@@ -233,7 +234,7 @@ storeError SAL_CALL store_getFileReferer
/*
* store_getFileSize.
*/
-storeError SAL_CALL store_getFileSize (
+STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize (
storeFileHandle Handle,
sal_uInt32 *pnSize
) SAL_THROW_EXTERN_C()
@@ -252,7 +253,7 @@ storeError SAL_CALL store_getFileSize (
/*
* store_rebuildFile.
*/
-storeError SAL_CALL store_rebuildFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile (
rtl_uString *pSrcFilename,
rtl_uString *pDstFilename
) SAL_THROW_EXTERN_C()
@@ -289,7 +290,7 @@ storeError SAL_CALL store_rebuildFile (
/*
* store_openDirectory.
*/
-storeError SAL_CALL store_openDirectory (
+STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory (
storeFileHandle hFile,
rtl_uString *pPath,
rtl_uString *pName,
@@ -329,7 +330,7 @@ storeError SAL_CALL store_openDirectory
/*
* store_closeDirectory.
*/
-storeError SAL_CALL store_closeDirectory (
+STORE_DLLPUBLIC storeError SAL_CALL store_closeDirectory (
storeDirectoryHandle Handle
) SAL_THROW_EXTERN_C()
{
@@ -345,7 +346,7 @@ storeError SAL_CALL store_closeDirectory
/*
* store_findFirst.
*/
-storeError SAL_CALL store_findFirst (
+STORE_DLLPUBLIC storeError SAL_CALL store_findFirst (
storeDirectoryHandle Handle,
storeFindData *pFindData
) SAL_THROW_EXTERN_C()
@@ -369,7 +370,7 @@ storeError SAL_CALL store_findFirst (
/*
* store_findNext.
*/
-storeError SAL_CALL store_findNext (
+STORE_DLLPUBLIC storeError SAL_CALL store_findNext (
storeDirectoryHandle Handle,
storeFindData *pFindData
) SAL_THROW_EXTERN_C()
@@ -399,7 +400,7 @@ storeError SAL_CALL store_findNext (
/*
* store_openStream
*/
-storeError SAL_CALL store_openStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_openStream (
storeFileHandle hFile,
rtl_uString *pPath,
rtl_uString *pName,
@@ -439,7 +440,7 @@ storeError SAL_CALL store_openStream (
/*
* store_closeStream.
*/
-storeError SAL_CALL store_closeStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_closeStream (
storeStreamHandle Handle
) SAL_THROW_EXTERN_C()
{
@@ -455,7 +456,7 @@ storeError SAL_CALL store_closeStream (
/*
* store_readStream.
*/
-storeError SAL_CALL store_readStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_readStream (
storeStreamHandle Handle,
sal_uInt32 nOffset,
void *pBuffer,
@@ -477,7 +478,7 @@ storeError SAL_CALL store_readStream (
/*
* store_writeStream.
*/
-storeError SAL_CALL store_writeStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_writeStream (
storeStreamHandle Handle,
sal_uInt32 nOffset,
const void *pBuffer,
@@ -499,7 +500,7 @@ storeError SAL_CALL store_writeStream (
/*
* store_flushStream.
*/
-storeError SAL_CALL store_flushStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_flushStream (
storeStreamHandle Handle
) SAL_THROW_EXTERN_C()
{
@@ -514,7 +515,7 @@ storeError SAL_CALL store_flushStream (
/*
* store_getStreamSize.
*/
-storeError SAL_CALL store_getStreamSize (
+STORE_DLLPUBLIC storeError SAL_CALL store_getStreamSize (
storeStreamHandle Handle,
sal_uInt32 *pnSize
) SAL_THROW_EXTERN_C()
@@ -533,7 +534,7 @@ storeError SAL_CALL store_getStreamSize
/*
* store_setStreamSize.
*/
-storeError SAL_CALL store_setStreamSize (
+STORE_DLLPUBLIC storeError SAL_CALL store_setStreamSize (
storeStreamHandle Handle,
sal_uInt32 nSize
) SAL_THROW_EXTERN_C()
@@ -554,7 +555,7 @@ storeError SAL_CALL store_setStreamSize
/*
* store_attrib.
*/
-storeError SAL_CALL store_attrib (
+STORE_DLLPUBLIC storeError SAL_CALL store_attrib (
storeFileHandle Handle,
rtl_uString *pPath,
rtl_uString *pName,
@@ -595,7 +596,7 @@ storeError SAL_CALL store_attrib (
/*
* store_link.
*/
-storeError SAL_CALL store_link (
+STORE_DLLPUBLIC storeError SAL_CALL store_link (
storeFileHandle Handle,
rtl_uString *pSrcPath, rtl_uString *pSrcName,
rtl_uString *pDstPath, rtl_uString *pDstName
@@ -645,7 +646,7 @@ storeError SAL_CALL store_link (
/*
* store_symlink.
*/
-storeError SAL_CALL store_symlink (
+STORE_DLLPUBLIC storeError SAL_CALL store_symlink (
storeFileHandle Handle,
rtl_uString *pSrcPath, rtl_uString *pSrcName,
rtl_uString *pDstPath, rtl_uString *pDstName
@@ -688,7 +689,7 @@ storeError SAL_CALL store_symlink (
/*
* store_rename.
*/
-storeError SAL_CALL store_rename (
+STORE_DLLPUBLIC storeError SAL_CALL store_rename (
storeFileHandle Handle,
rtl_uString *pSrcPath, rtl_uString *pSrcName,
rtl_uString *pDstPath, rtl_uString *pDstName
@@ -731,7 +732,7 @@ storeError SAL_CALL store_rename (
/*
* store_remove.
*/
-storeError SAL_CALL store_remove (
+STORE_DLLPUBLIC storeError SAL_CALL store_remove (
storeFileHandle Handle,
rtl_uString *pPath,
rtl_uString *pName
