You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/05 18:06:17 UTC
svn commit: r1772740 - in /openoffice/trunk/main: ./ binaryurp/
binaryurp/prj/ binaryurp/qa/ binaryurp/source/ postprocess/packcomponents/
Author: damjan
Date: Mon Dec 5 18:06:17 2016
New Revision: 1772740
URL: http://svn.apache.org/viewvc?rev=1772740&view=rev
Log:
Port main/binaryurp to gbuild.
Patch by: me
Added:
openoffice/trunk/main/binaryurp/GoogleTest_cache.mk
openoffice/trunk/main/binaryurp/GoogleTest_unmarshal.mk
openoffice/trunk/main/binaryurp/Library_binaryurp.mk
openoffice/trunk/main/binaryurp/Makefile (with props)
openoffice/trunk/main/binaryurp/Module_binaryurp.mk
openoffice/trunk/main/binaryurp/prj/makefile.mk
Removed:
openoffice/trunk/main/binaryurp/qa/makefile.mk
openoffice/trunk/main/binaryurp/source/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/binaryurp/prj/build.lst
openoffice/trunk/main/binaryurp/prj/d.lst
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772740&r1=1772739&r2=1772740&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 5 18:06:17 2016
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,o
animations \
basebmp \
basegfx \
+ binaryurp \
canvas \
comphelper \
cppcanvas \
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772740&r1=1772739&r2=1772740&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Mon Dec 5 18:06:17 2016
@@ -150,6 +150,7 @@ $(eval $(call gb_Helper_register_librari
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
acceptor \
+ binaryurp \
cairocanvas \
canvasfactory \
connector \
Added: openoffice/trunk/main/binaryurp/GoogleTest_cache.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/GoogleTest_cache.mk?rev=1772740&view=auto
==============================================================================
--- openoffice/trunk/main/binaryurp/GoogleTest_cache.mk (added)
+++ openoffice/trunk/main/binaryurp/GoogleTest_cache.mk Mon Dec 5 18:06:17 2016
@@ -0,0 +1,46 @@
+#**************************************************************
+#
+# 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,binaryurp_cache))
+
+$(eval $(call gb_GoogleTest_set_include,binaryurp_cache,\
+ $$(INCLUDE) \
+))
+
+#$(eval $(call gb_GoogleTest_add_api,binaryurp_cache,\
+# offapi \
+# udkapi \
+#))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,binaryurp_cache, \
+ binaryurp/qa/main \
+ binaryurp/qa/test-cache \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,binaryurp_cache, \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/binaryurp/GoogleTest_unmarshal.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/GoogleTest_unmarshal.mk?rev=1772740&view=auto
==============================================================================
--- openoffice/trunk/main/binaryurp/GoogleTest_unmarshal.mk (added)
+++ openoffice/trunk/main/binaryurp/GoogleTest_unmarshal.mk Mon Dec 5 18:06:17 2016
@@ -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_GoogleTest_GoogleTest,binaryurp_unmarshal))
+
+$(eval $(call gb_GoogleTest_set_include,binaryurp_unmarshal,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_GoogleTest_add_api,binaryurp_unmarshal,\
+ udkapi \
+))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,binaryurp_unmarshal, \
+ binaryurp/qa/main \
+ binaryurp/qa/test-unmarshal \
+ binaryurp/source/binaryany \
+ binaryurp/source/bridge \
+ binaryurp/source/bridgefactory \
+ binaryurp/source/currentcontext \
+ binaryurp/source/incomingrequest \
+ binaryurp/source/lessoperators \
+ binaryurp/source/marshal \
+ binaryurp/source/outgoingrequests \
+ binaryurp/source/proxy \
+ binaryurp/source/reader \
+ binaryurp/source/unmarshal \
+ binaryurp/source/writer \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,binaryurp_unmarshal, \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ $(gb_STDLIBS) \
+))
+
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/binaryurp/Library_binaryurp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/Library_binaryurp.mk?rev=1772740&view=auto
==============================================================================
--- openoffice/trunk/main/binaryurp/Library_binaryurp.mk (added)
+++ openoffice/trunk/main/binaryurp/Library_binaryurp.mk Mon Dec 5 18:06:17 2016
@@ -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,binaryurp))
+
+$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
+
+$(eval $(call gb_Library_set_include,binaryurp,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,binaryurp,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,binaryurp,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,binaryurp,\
+ binaryurp/source/binaryany \
+ binaryurp/source/bridge \
+ binaryurp/source/bridgefactory \
+ binaryurp/source/currentcontext \
+ binaryurp/source/incomingrequest \
+ binaryurp/source/lessoperators \
+ binaryurp/source/marshal \
+ binaryurp/source/outgoingrequests \
+ binaryurp/source/proxy \
+ binaryurp/source/reader \
+ binaryurp/source/unmarshal \
+ binaryurp/source/writer \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/binaryurp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/Makefile?rev=1772740&view=auto
==============================================================================
--- openoffice/trunk/main/binaryurp/Makefile (added)
+++ openoffice/trunk/main/binaryurp/Makefile Mon Dec 5 18:06:17 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/binaryurp/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/binaryurp/Module_binaryurp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/Module_binaryurp.mk?rev=1772740&view=auto
==============================================================================
--- openoffice/trunk/main/binaryurp/Module_binaryurp.mk (added)
+++ openoffice/trunk/main/binaryurp/Module_binaryurp.mk Mon Dec 5 18:06:17 2016
@@ -0,0 +1,37 @@
+#**************************************************************
+#
+# 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,binaryurp))
+
+$(eval $(call gb_Module_add_targets,binaryurp,\
+ Library_binaryurp \
+))
+
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,binaryurp,\
+ GoogleTest_cache \
+ GoogleTest_unmarshal \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/binaryurp/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/prj/build.lst?rev=1772740&r1=1772739&r2=1772740&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/prj/build.lst (original)
+++ openoffice/trunk/main/binaryurp/prj/build.lst Mon Dec 5 18:06:17 2016
@@ -1,3 +1,2 @@
bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper stlport NULL
-bu binaryurp\source nmake - all bu_source NULL
-bu binaryurp\qa nmake - all bu_qa bu_source NULL
+bu binaryurp\prj nmake - all bu_prj NULL
Modified: openoffice/trunk/main/binaryurp/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/prj/d.lst?rev=1772740&r1=1772739&r2=1772740&view=diff
==============================================================================
--- openoffice/trunk/main/binaryurp/prj/d.lst (original)
+++ openoffice/trunk/main/binaryurp/prj/d.lst Mon Dec 5 18:06:17 2016
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\binaryur*.dll %_DEST%\bin%_EXT%\binaryur*.dll
-..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib%_EXT%\binaryurp.uno.dylib
-..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib%_EXT%\binaryurp.uno.so
-..\%__SRC%\misc\binaryurp.component %_DEST%\xml%_EXT%\binaryurp.component
Added: openoffice/trunk/main/binaryurp/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/prj/makefile.mk?rev=1772740&view=auto
==============================================================================
--- openoffice/trunk/main/binaryurp/prj/makefile.mk (added)
+++ openoffice/trunk/main/binaryurp/prj/makefile.mk Mon Dec 5 18:06:17 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
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772740&r1=1772739&r2=1772740&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Mon Dec 5 18:06:17 2016
@@ -35,7 +35,6 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --
.END
my_components = \
- binaryurp \
bootstrap \
introspection \
invocadapt \
@@ -61,6 +60,7 @@ my_components = \
charttools \
chartview \
component/animations/source/animcore/animcore \
+ component/binaryurp/source/binaryurp \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
component/canvas/source/vcl/vclcanvas \