gbuildize cosv

Change-Id: I73eb612edaba21aa5bb07577b42bd31f8de2dd2a

17 files changed, 96 insertions, 390 deletions

diff --git a/Repository.mk b/Repository.mk
index ad2753202085..f48559360789 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -639,6 +639,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     codemaker \
     codemaker_cpp \
     codemaker_java \
+    cosv \
     dtobj \
     headless \
     libeay32 \
diff --git a/cosv/Makefile b/cosv/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/cosv/Makefile
@@ -0,0 +1,7 @@
+# -*- 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:
diff --git a/cosv/Module_cosv.mk b/cosv/Module_cosv.mk
new file mode 100644
index 000000000000..729185afd4ed
--- /dev/null
+++ b/cosv/Module_cosv.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+$(eval $(call gb_Module_Module,cosv))
+
+$(eval $(call gb_Module_add_targets,cosv,\
+    Package_inc \
+    StaticLibrary_cosv \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cosv/Package_inc.mk b/cosv/Package_inc.mk
new file mode 100644
index 000000000000..fa22956bc5ba
--- /dev/null
+++ b/cosv/Package_inc.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+$(eval $(call gb_Package_Package,cosv_inc,$(SRCDIR)/cosv/inc))
+
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_precomp.h,cosv/csv_precomp.h))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/bstream.hxx,cosv/bstream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comdline.hxx,cosv/comdline.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comfunc.hxx,cosv/comfunc.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_env.hxx,cosv/csv_env.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_ostream.hxx,cosv/csv_ostream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/dirchain.hxx,cosv/dirchain.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/file.hxx,cosv/file.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/openclose.hxx,cosv/openclose.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/persist.hxx,cosv/persist.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc_dir.hxx,cosv/ploc_dir.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc.hxx,cosv/ploc.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/plocroot.hxx,cosv/plocroot.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/std_outp.hxx,cosv/std_outp.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/streamstr.hxx,cosv/streamstr.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/stringdata.hxx,cosv/stringdata.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/string.hxx,cosv/string.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/str_types.hxx,cosv/str_types.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/x.hxx,cosv/x.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/dyn.hxx,cosv/tpl/dyn.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/processor.hxx,cosv/tpl/processor.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/swelist.hxx,cosv/tpl/swelist.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/tpltools.hxx,cosv/tpl/tpltools.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/vvector.hxx,cosv/tpl/vvector.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk
new file mode 100644
index 000000000000..32b9a053c616
--- /dev/null
+++ b/cosv/StaticLibrary_cosv.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,cosv))
+
+$(eval $(call gb_StaticLibrary_set_include,cosv,\
+    -I$(SRCDIR)/cosv/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\
+	cosv/source/comphelp/badcast \
+	cosv/source/service/comdline \
+	cosv/source/service/comfunc \
+	cosv/source/service/csv_ostream \
+    cosv/source/service/std_outp \
+    cosv/source/storage/dirchain \
+    cosv/source/storage/file \
+    cosv/source/storage/persist \
+    cosv/source/storage/ploc \
+    cosv/source/storage/ploc_dir \
+    cosv/source/storage/plocroot \
+    cosv/source/strings/streamstr \
+    cosv/source/strings/string \
+    cosv/source/strings/str_types \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cosv/prj/build.lst b/cosv/prj/build.lst
index 140c617320d7..440b8087e6e7 100644
--- a/cosv/prj/build.lst
+++ b/cosv/prj/build.lst
@@ -1,13 +1,3 @@
 cs	cosv	: sal soltools NULL
 cs	cosv								usr1	-	all	cs_mkout NULL
-cs	cosv\prj							get		-	all	cs_prj NULL
-cs	cosv\inc							get		-	all	cs_inc NULL
-cs	cosv\inc\cosv		  				get		-	all	cs_inc_cosv NULL
-cs	cosv\inc\cosv\template				get		-	all	cs_inc_templ NULL
-cs	cosv\source							get		-	all	cs_src NULL
-cs	cosv\source\inc						get		-	all	cs_src_inc NULL
-cs	cosv\source\service					nmake	-	all	cs_serv NULL
-cs	cosv\source\storage					nmake	-	all	cs_store NULL
-cs	cosv\source\strings					nmake	-	all	cs_string NULL
-cs	cosv\source\comphelp				nmake	-	all	cs_badcast NULL
-cs	cosv\util						    nmake	-	all	cs_util cs_serv cs_store cs_string cs_badcast NULL
+cs	cosv\prj							nmake		-	all	cs_prj NULL
diff --git a/cosv/prj/d.lst b/cosv/prj/d.lst
index 496506b88d3c..e69de29bb2d1 100644
--- a/cosv/prj/d.lst
+++ b/cosv/prj/d.lst
@@ -1,8 +0,0 @@
-mkdir: %_DEST%\inc\cosv
-mkdir: %_DEST%\inc\cosv\tpl
-
-..\%__SRC%\lib\cosv.lib %_DEST%\lib\cosv.lib
-..\%__SRC%\lib\libcosv.a %_DEST%\lib\libcosv.a
-..\inc\cosv\*.hxx %_DEST%\inc\cosv\*.hxx
-..\inc\cosv\*.h %_DEST%\inc\cosv\*.h
-..\inc\cosv\tpl\*.hxx %_DEST%\inc\cosv\tpl\*.hxx
diff --git a/cosv/prj/dmake b/cosv/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/cosv/prj/dmake
+++ /dev/null
diff --git a/cosv/source/comphelp/makefile.mk b/cosv/source/comphelp/makefile.mk
deleted file mode 100644
index 1c83fa9d4ad3..000000000000
--- a/cosv/source/comphelp/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_badcast_wnt
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/badcast.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/cosv/source/fullcpp.mk b/cosv/source/fullcpp.mk
deleted file mode 100644
index 3c10af2f1615..000000000000
--- a/cosv/source/fullcpp.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-
-
-# --- Settings -----------------------------------------------------
-# Has to be inlcuded AFTER settings.mk !
-
-
-.IF "$(COM)"=="MSC"
-
-# RTTI
-CFLAGS+= -GR
-
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-# RTTI
-CFLAGSCXX+= -frtti
-.ENDIF
diff --git a/cosv/source/inc/precomp.h b/cosv/source/inc/precomp.h
deleted file mode 100644
index 41cfd748e3b9..000000000000
--- a/cosv/source/inc/precomp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef CSV_PRECOMP_H
-#define CSV_PRECOMP_H
-
-
-#define CSV_USE_CSV_ASSERTIONS
-#include <cosv/csv_env.hxx>
-
-#include <cosv/comfunc.hxx>
-#include <cosv/string.hxx>
-#include <cosv/streamstr.hxx>
-#include <cosv/std_outp.hxx>
-#include <cosv/tpl/dyn.hxx>
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cosv/source/service/makefile.mk b/cosv/source/service/makefile.mk
deleted file mode 100644
index 6975ae040347..000000000000
--- a/cosv/source/service/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_service
-
-ENABLE_EXCEPTIONS=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/comdline.obj 	\
-    $(OBJ)$/comfunc.obj 	\
-    $(OBJ)$/csv_ostream.obj \
-    $(OBJ)$/std_outp.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/cosv/source/storage/makefile.mk b/cosv/source/storage/makefile.mk
deleted file mode 100644
index 3a3b03796d72..000000000000
--- a/cosv/source/storage/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_storage
-
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/dirchain.obj 	\
-    $(OBJ)$/file.obj 		\
-    $(OBJ)$/persist.obj	    \
-    $(OBJ)$/ploc.obj 	    \
-    $(OBJ)$/ploc_dir.obj    \
-    $(OBJ)$/plocroot.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/cosv/source/strings/makefile.mk b/cosv/source/strings/makefile.mk
deleted file mode 100644
index 0391a93ebe80..000000000000
--- a/cosv/source/strings/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_strings
-
-ENABLE_EXCEPTIONS=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/str_types.obj   \
-    $(OBJ)$/streamstr.obj   \
-    $(OBJ)$/string.obj      
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/cosv/source/unittest/makefile.mk b/cosv/source/unittest/makefile.mk
deleted file mode 100644
index 3389c73a6b55..000000000000
--- a/cosv/source/unittest/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..$/..
-
-PRJNAME=cosv
-TARGET=cosv_unittest
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE :  settings.mk
-.INCLUDE :  static.mk
-
-.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/file_ut.obj             \
-    $(OBJ)$/simplestring_ut.obj
-
-
-
-
-APP1TARGET=	$(TARGET)
-APP1STACK=	1000000
-APP1OBJS=   $(OBJ)$/ut_main.obj
-
-
-APP1LIBS=	$(LB)$/$(TARGET).lib $(LB)$/cosv.lib
-
-
-APP1DEPN=   $(LB)$/$(TARGET).lib $(LB)$/cosv.lib
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/cosv/util/makefile.mk b/cosv/util/makefile.mk
deleted file mode 100644
index 9ac7447641a1..000000000000
--- a/cosv/util/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   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 .
-#
-
-PRJ=..
-
-PRJNAME=cosv
-TARGET=cosv
-
-ENABLE_EXCEPTIONS=true
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-LIB1FILES= 	\
-        $(LB)$/cosv_service.lib		\
-        $(LB)$/cosv_storage.lib     	\
-        $(LB)$/cosv_strings.lib		\
-        $(LB)$/cosv_badcast_wnt.lib
-
-
-# --- Targets ------------------------------------------------------
-
-LIB1TARGET= 	$(LB)$/$(TARGET).lib
-LIB1ARCHIV= 	$(LB)$/lib$(TARGET).a
-
-
-.INCLUDE :  target.mk
-
-
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 9c1704657ed1..d01be0aef487 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -520,7 +520,7 @@ APP3RDLIB= $(LIBPRE) app.lib
 SAMPLE3RDLIB= $(LIBPRE) sample.lib
 HNJLIB*=libhnj.lib
 MYSPELLLIB= $(LIBPRE) myspell.lib
-COSVLIB= $(LIBPRE) cosv.lib
+COSVLIB=cosv.lib
 UDMLIB= $(LIBPRE) udm.lib
 ULINGULIB=$(LIBPRE) libulingu.lib
 .IF "$(SYSTEM_HUNSPELL)" == "YES"