Port main/o3tl to gbuild.

Patch by: me

Module_ooo.mk

@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     idl \
     io \
     linguistic \
+    o3tl \
     offapi \
     oovbaapi \
     oox \

o3tl/GoogleTest_o3tl.mk

+###############################################################
+#  
+#  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_GoogleTest_GoogleTest,o3tl_test))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,o3tl_test, \
+	o3tl/qa/cow_wrapper_clients \
+	o3tl/qa/main \
+	o3tl/qa/test-cow_wrapper \
+	o3tl/qa/test-vector_pool \
+	o3tl/qa/test-heap_ptr \
+	o3tl/qa/test-range \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,o3tl_test, \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:

o3tl/Makefile

+#**************************************************************
+#  
+#  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:

o3tl/Module_o3tl.mk

+#**************************************************************
+#  
+#  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,o3tl))
+
+$(eval $(call gb_Module_add_targets,o3tl,\
+	Package_inc \
+))
+
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,o3tl,\
+        GoogleTest_o3tl \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

o3tl/Package_inc.mk

+#**************************************************************
+#  
+#  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,o3tl_inc,$(SRCDIR)/o3tl/inc))
+
+$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/cow_wrapper.hxx,o3tl/cow_wrapper.hxx))
+$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/range.hxx,o3tl/range.hxx))
+$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/vector_pool.hxx,o3tl/vector_pool.hxx))
+$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/lazy_update.hxx,o3tl/lazy_update.hxx))
+$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/heap_ptr.hxx,o3tl/heap_ptr.hxx))

o3tl/prj/build.lst

 ot	o3tl	:	sal BOOST:boost NULL
-ot	o3tl									usr1	-	all	ot_mkout NULL
-ot	o3tl\inc								get		-	all	ot_inc NULL
-ot	o3tl\prj								get		-	all	ot_prj NULL
-ot	o3tl\qa									nmake	-	all	ot_qa NULL
+ot	o3tl\prj								nmake	-	all	ot_prj	NULL

o3tl/prj/d.lst

-mkdir: %_DEST%\inc%_EXT%\o3tl
-..\inc\o3tl\*.hxx %_DEST%\inc%_EXT%\o3tl\*.hxx

o3tl/qa/makefile.mk → o3tl/prj/makefile.mk

@@ -20,48 +20,25 @@
 #**************************************************************
 
 
-PRJ=..
-PRJNAME=o3tl
-TARGET=tests
-
-ENABLE_EXCEPTIONS=TRUE
 
+PRJ=..
+TARGET=prj
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_UNIT_TESTS)" != "YES"
-all:
-    @echo unit tests are disabled. Nothing to do.
- 
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
 .ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
 
-.IF "$(L10N_framework)"==""
-# --- Common ----------------------------------------------------------
-
-# BEGIN ----------------------------------------------------------------
-APP1OBJS=  \
-    $(SLO)$/cow_wrapper_clients.obj     \
-    $(SLO)$/main.obj                    \
-    $(SLO)$/test-cow_wrapper.obj	    \
-    $(SLO)$/test-vector_pool.obj	\
-    $(SLO)$/test-heap_ptr.obj           \
-    $(SLO)$/test-range.obj
-
-APP1TARGET= tests
-APP1STDLIBS= 	$(SALLIB)		 \
-                $(GTESTLIB)
-
-APP1RPATH = NONE
-APP1TEST = enabled
-
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-.ENDIF 		# L10N_framework
-
-.INCLUDE : target.mk
-
-.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog