gbuild conversion: store module

Change-Id: Idbab17b87d042079a8fa6ded7a7424a745761b2f

Makefile

@@ -113,6 +113,7 @@ smoketest\
 sot\
 starmath\
 stoc\
+store\
 svl\
 svtools\
 svx\
@@ -232,7 +233,6 @@ solenv\
 soltools\
 stax\
 stlport\
-store\
 sysui\
 testtools\
 tomcat\

store/Library_store.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,store))
+
+$(eval $(call gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store.map))
+
+$(eval $(call gb_Library_use_packages,store,\
+	store_inc \
+))
+
+$(eval $(call gb_Library_add_defs,store,\
+	$(LFS_CFLAGS) \
+	-DSTORE_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_use_libraries,store,\
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_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:

store/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

store/Module_store.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,store))
+
+$(eval $(call gb_Module_add_targets,store,\
+    Library_store \
+    Package_inc \
+    Package_xml \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:

store/Package_inc.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,store_inc,$(SRCDIR)/store))
+
+$(eval $(call gb_Package_add_file,store_inc,inc/store/store.h,inc/store/store.h))
+$(eval $(call gb_Package_add_file,store_inc,inc/store/store.hxx,inc/store/store.hxx))
+$(eval $(call gb_Package_add_file,store_inc,inc/store/storedllapi.h,inc/store/storedllapi.h))
+$(eval $(call gb_Package_add_file,store_inc,inc/store/types.h,inc/store/types.h))
+
+# vim: set noet sw=4 ts=4:

store/Package_xml.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,store_xml,$(SRCDIR)/store))
+
+$(eval $(call gb_Package_add_file,store_xml,xml/store.xml,util/store.xml))
+
+# vim: set noet sw=4 ts=4:

store/inc/store/store.h

@@ -30,6 +30,7 @@
 #define _STORE_STORE_H_
 
 #include <store/types.h>
+#include <store/storedllapi.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,7 +45,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();
 
@@ -54,7 +55,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();
 
@@ -71,7 +72,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();
@@ -89,7 +90,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,
@@ -102,7 +103,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();
 
@@ -111,7 +112,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();
 
@@ -121,7 +122,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();
@@ -132,7 +133,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();
@@ -145,7 +146,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();
@@ -167,7 +168,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,
@@ -181,7 +182,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();
 
@@ -192,7 +193,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();
@@ -204,7 +205,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();
@@ -226,7 +227,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,
@@ -240,7 +241,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();
 
@@ -253,7 +254,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,
@@ -270,7 +271,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,
@@ -283,7 +284,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();
 
@@ -293,7 +294,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();
@@ -304,7 +305,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();
@@ -320,7 +321,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,
@@ -342,7 +343,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
@@ -361,7 +362,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
@@ -376,7 +377,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
@@ -389,7 +390,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

store/inc/store/storedllapi.h

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef INCLUDED_STOREDLLAPI_H
+#define INCLUDED_STOREDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(STORE_DLLIMPLEMENTATION)
+#define STORE_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define STORE_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif /* INCLUDED_STOREDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

store/prj/build.lst

 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

store/prj/d.lst

-mkdir: %_DEST%\inc\store
-..\inc\store\*.h %_DEST%\inc\store\*.h
-..\inc\store\store.hxx %_DEST%\inc\store\store.hxx
-..\inc\store\store.inl %_DEST%\inc\store\store.inl
-..\util\store.xml %_DEST%\xml\store.xml
-
-..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib
-..\%__SRC%\lib\libstore.*.* %_DEST%\lib\*
-..\%__SRC%\lib\libstore.so %_DEST%\lib\libstore.so
-..\%__SRC%\lib\libstore.a %_DEST%\lib\libstore.a
-..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll
-
-linklib: libstore.*.*

store/source/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=store
-TARGET=store
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# --- Files ---
-
-SLOFILES=	\
-    $(SLO)$/object.obj	\
-    $(SLO)$/lockbyte.obj	\
-    $(SLO)$/storbase.obj	\
-    $(SLO)$/storbios.obj	\
-    $(SLO)$/storcach.obj	\
-    $(SLO)$/stordata.obj	\
-    $(SLO)$/stordir.obj	\
-    $(SLO)$/storlckb.obj	\
-    $(SLO)$/stortree.obj	\
-    $(SLO)$/storpage.obj	\
-    $(SLO)$/store.obj
-
-.IF "$(debug)" != ""
-OBJFILES=	\
-    $(OBJ)$/object.obj	\
-    $(OBJ)$/lockbyte.obj	\
-    $(OBJ)$/storbase.obj	\
-    $(OBJ)$/storbios.obj	\
-    $(OBJ)$/storcach.obj	\
-    $(OBJ)$/stordata.obj	\
-    $(OBJ)$/stordir.obj	\
-    $(OBJ)$/storlckb.obj	\
-    $(OBJ)$/stortree.obj	\
-    $(OBJ)$/storpage.obj	\
-    $(OBJ)$/store.obj
-
-.ENDIF # debug
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-

store/util/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=store
-TARGET=store
-TARGETTYPE=CUI
-
-USE_LDUMP2=TRUE
-USE_DEFFILE=TRUE
-
-NO_DEFAULT_STL=TRUE
-
-UNIXVERSIONNAMES=UDK
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# --- Debug-Library ---
-
-.IF "$(debug)" != ""
-
-LIB1TARGET=	$(LB)$/$(TARGET)dbg.lib
-LIB1ARCHIV=	$(LB)$/lib$(TARGET)dbg.a
-LIB1FILES=	$(LB)$/store.lib
-
-.ENDIF # debug
-
-# --- Shared-Library ---
-
-SHL1TARGET= 	$(TARGET)
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB= 	istore
-.ELSE
-SHL1IMPLIB= 	store
-.ENDIF
-
-SHL1VERSIONMAP=	$(TARGET).map
-
-SHL1STDLIBS=	$(SALLIB)
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=	$(SLB)$/store.lib
-SHL1RPATH=  URELIB
-
-# --- Def-File ---
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1DES=Store
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-
-