Author: damjan
Date: Mon Dec 5 03:54:25 2016
New Revision: 1772591
URL: http://svn.apache.org/viewvc?rev=1772591&view=rev
Log:
Port main/o3tl to gbuild.
Patch by: me
Added:
openoffice/trunk/main/o3tl/GoogleTest_o3tl.mk
openoffice/trunk/main/o3tl/Makefile (with props)
openoffice/trunk/main/o3tl/Module_o3tl.mk
openoffice/trunk/main/o3tl/Package_inc.mk
openoffice/trunk/main/o3tl/prj/makefile.mk
Removed:
openoffice/trunk/main/o3tl/qa/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/o3tl/prj/build.lst
openoffice/trunk/main/o3tl/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772591&r1=1772590&r2=1772591&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 5 03:54:25 2016
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,o
idl \
io \
linguistic \
+ o3tl \
offapi \
oovbaapi \
oox \
Added: openoffice/trunk/main/o3tl/GoogleTest_o3tl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/GoogleTest_o3tl.mk?rev=1772591&view=auto
==============================================================================
--- openoffice/trunk/main/o3tl/GoogleTest_o3tl.mk (added)
+++ openoffice/trunk/main/o3tl/GoogleTest_o3tl.mk Mon Dec 5 03:54:25 2016
@@ -0,0 +1,39 @@
+###############################################################
+#
+# 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:
Added: openoffice/trunk/main/o3tl/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/Makefile?rev=1772591&view=auto
==============================================================================
--- openoffice/trunk/main/o3tl/Makefile (added)
+++ openoffice/trunk/main/o3tl/Makefile Mon Dec 5 03:54:25 2016
@@ -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:
Propchange: openoffice/trunk/main/o3tl/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/o3tl/Module_o3tl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/Module_o3tl.mk?rev=1772591&view=auto
==============================================================================
--- openoffice/trunk/main/o3tl/Module_o3tl.mk (added)
+++ openoffice/trunk/main/o3tl/Module_o3tl.mk Mon Dec 5 03:54:25 2016
@@ -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.
+#
+#**************************************************************
+
+
+
+$(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:
Added: openoffice/trunk/main/o3tl/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/Package_inc.mk?rev=1772591&view=auto
==============================================================================
--- openoffice/trunk/main/o3tl/Package_inc.mk (added)
+++ openoffice/trunk/main/o3tl/Package_inc.mk Mon Dec 5 03:54:25 2016
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# 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))
Modified: openoffice/trunk/main/o3tl/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/prj/build.lst?rev=1772591&r1=1772590&r2=1772591&view=diff
==============================================================================
--- openoffice/trunk/main/o3tl/prj/build.lst (original)
+++ openoffice/trunk/main/o3tl/prj/build.lst Mon Dec 5 03:54:25 2016
@@ -1,5 +1,2 @@
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
Modified: openoffice/trunk/main/o3tl/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/prj/d.lst?rev=1772591&r1=1772590&r2=1772591&view=diff
==============================================================================
--- openoffice/trunk/main/o3tl/prj/d.lst (original)
+++ openoffice/trunk/main/o3tl/prj/d.lst Mon Dec 5 03:54:25 2016
@@ -1,2 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\o3tl
-..\inc\o3tl\*.hxx %_DEST%\inc%_EXT%\o3tl\*.hxx
Added: openoffice/trunk/main/o3tl/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/prj/makefile.mk?rev=1772591&view=auto
==============================================================================
--- openoffice/trunk/main/o3tl/prj/makefile.mk (added)
+++ openoffice/trunk/main/o3tl/prj/makefile.mk Mon Dec 5 03:54:25 2016
@@ -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
