openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1838934 - in /openoffice/trunk/main: ./ cpputools/ cpputools/prj/
Date Fri, 24 Aug 2018 18:58:00 GMT
Author: damjan
Date: Fri Aug 24 18:58:00 2018
New Revision: 1838934

URL: http://svn.apache.org/viewvc?rev=1838934&view=rev
Log:
Port main/cpputools to gbuild.

Patch by: me


Added:
    openoffice/trunk/main/cpputools/Executable_regcomp.mk
    openoffice/trunk/main/cpputools/Executable_regsingleton.mk
    openoffice/trunk/main/cpputools/Executable_sp2bv.mk
    openoffice/trunk/main/cpputools/Executable_uno.mk
    openoffice/trunk/main/cpputools/Makefile   (with props)
    openoffice/trunk/main/cpputools/Module_cputools.mk
    openoffice/trunk/main/cpputools/Package_bin.mk
    openoffice/trunk/main/cpputools/prj/makefile.mk
Modified:
    openoffice/trunk/main/Repository.mk
    openoffice/trunk/main/cpputools/prj/build.lst
    openoffice/trunk/main/cpputools/prj/d.lst

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1838934&r1=1838933&r2=1838934&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Fri Aug 24 18:58:00 2018
@@ -41,6 +41,8 @@ $(eval $(call gb_Helper_register_executa
 ))
 
 $(eval $(call gb_Helper_register_executables,OOO, \
+	regsingleton \
+	sp2bv \
     spadmin.bin \
 ))
 
@@ -54,8 +56,10 @@ $(eval $(call gb_Helper_register_executa
 
 $(eval $(call gb_Helper_register_executables,UREBIN, \
 	javaldx \
+	regcomp \
 	regmerge \
 	regview \
+	uno \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \

Added: openoffice/trunk/main/cpputools/Executable_regcomp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Executable_regcomp.mk?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/Executable_regcomp.mk (added)
+++ openoffice/trunk/main/cpputools/Executable_regcomp.mk Fri Aug 24 18:58:00 2018
@@ -0,0 +1,51 @@
+#**************************************************************
+#  
+#  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_Executable_Executable,regcomp))
+
+$(eval $(call gb_Executable_add_linked_libs,regcomp,\
+	cppu \
+	cppuhelper \
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_set_private_extract_of_public_api,regcomp,$(OUTDIR)/bin/udkapi.rdb,\
+	com.sun.star.uno.TypeClass \
+	com.sun.star.lang.XMultiServiceFactory \
+	com.sun.star.lang.XSingleServiceFactory \
+	com.sun.star.lang.XMultiComponentFactory \
+	com.sun.star.lang.XSingleComponentFactory \
+	com.sun.star.lang.XComponent \
+	com.sun.star.container.XContentEnumerationAccess \
+	com.sun.star.container.XSet \
+	com.sun.star.loader.CannotActivateFactoryException \
+	com.sun.star.registry.XImplementationRegistration2 \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regcomp,\
+	cpputools/source/registercomponent/registercomponent \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/cpputools/Executable_regsingleton.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Executable_regsingleton.mk?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/Executable_regsingleton.mk (added)
+++ openoffice/trunk/main/cpputools/Executable_regsingleton.mk Fri Aug 24 18:58:00 2018
@@ -0,0 +1,54 @@
+#**************************************************************
+#  
+#  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_Executable_Executable,regsingleton))
+
+$(eval $(call gb_Executable_add_linked_libs,regsingleton,\
+	cppu \
+	cppuhelper \
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_set_private_extract_of_public_api,regsingleton,$(OUTDIR)/bin/udkapi.rdb,\
+ 	com.sun.star.uno.TypeClass \
+ 	com.sun.star.uno.XAggregation \
+ 	com.sun.star.uno.XWeak \
+ 	com.sun.star.uno.XComponentContext \
+ 	com.sun.star.lang.XTypeProvider \
+ 	com.sun.star.lang.XComponent \
+ 	com.sun.star.lang.XSingleServiceFactory \
+ 	com.sun.star.lang.XSingleComponentFactory \
+ 	com.sun.star.lang.XMultiServiceFactory \
+ 	com.sun.star.lang.XMultiComponentFactory \
+ 	com.sun.star.container.XHierarchicalNameAccess \
+	com.sun.star.registry.XSimpleRegistry \
+	com.sun.star.registry.XRegistryKey \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regsingleton,\
+	cpputools/source/regsingleton/regsingleton \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/cpputools/Executable_sp2bv.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Executable_sp2bv.mk?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/Executable_sp2bv.mk (added)
+++ openoffice/trunk/main/cpputools/Executable_sp2bv.mk Fri Aug 24 18:58:00 2018
@@ -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_Executable_Executable,sp2bv))
+
+$(eval $(call gb_Executable_add_linked_libs,sp2bv,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,sp2bv,\
+	cpputools/source/sp2bv/sp2bv \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/cpputools/Executable_uno.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Executable_uno.mk?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/Executable_uno.mk (added)
+++ openoffice/trunk/main/cpputools/Executable_uno.mk Fri Aug 24 18:58:00 2018
@@ -0,0 +1,63 @@
+#**************************************************************
+#  
+#  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_Executable_Executable,uno))
+
+$(eval $(call gb_Executable_add_linked_libs,uno,\
+	cppu \
+	cppuhelper \
+	sal \
+	salhelper \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_set_private_extract_of_public_api,uno,$(OUTDIR)/bin/udkapi.rdb,\
+ 	com.sun.star.uno.TypeClass \
+ 	com.sun.star.uno.XAggregation \
+ 	com.sun.star.uno.XWeak \
+ 	com.sun.star.uno.XComponentContext \
+ 	com.sun.star.lang.XTypeProvider \
+	com.sun.star.lang.XMain \
+ 	com.sun.star.lang.XInitialization \
+ 	com.sun.star.lang.XComponent \
+ 	com.sun.star.lang.XSingleServiceFactory \
+ 	com.sun.star.lang.XSingleComponentFactory \
+ 	com.sun.star.lang.XMultiServiceFactory \
+ 	com.sun.star.lang.XMultiComponentFactory \
+ 	com.sun.star.container.XSet \
+ 	com.sun.star.container.XHierarchicalNameAccess \
+	com.sun.star.loader.XImplementationLoader \
+	com.sun.star.registry.XSimpleRegistry \
+	com.sun.star.registry.XRegistryKey \
+	com.sun.star.connection.XAcceptor \
+	com.sun.star.connection.XConnection \
+	com.sun.star.bridge.XBridgeFactory \
+	com.sun.star.bridge.XBridge \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,uno,\
+	cpputools/source/unoexe/unoexe \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/cpputools/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Makefile?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/Makefile (added)
+++ openoffice/trunk/main/cpputools/Makefile Fri Aug 24 18:58:00 2018
@@ -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/cpputools/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/cpputools/Module_cputools.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Module_cputools.mk?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/Module_cputools.mk (added)
+++ openoffice/trunk/main/cpputools/Module_cputools.mk Fri Aug 24 18:58:00 2018
@@ -0,0 +1,42 @@
+#**************************************************************
+#  
+#  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,cpputools))
+
+$(eval $(call gb_Module_add_targets,cpputools,\
+	Executable_regcomp \
+	Executable_regsingleton \
+	Executable_sp2bv \
+	Executable_uno \
+))
+
+ifeq ($(GUIBASE),WIN)
+elif ($(GUIBASE),OS2)
+else
+$(eval $(call gb_Module_add_targets,cpputools,\
+	Package_bin \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/cpputools/Package_bin.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Package_bin.mk?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/Package_bin.mk (added)
+++ openoffice/trunk/main/cpputools/Package_bin.mk Fri Aug 24 18:58:00 2018
@@ -0,0 +1,27 @@
+#**************************************************************
+#  
+#  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,cpputools_bin,$(WORKDIR)/LinkTarget/Executable))
+
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/regcomp.bin,regcomp))
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno))

Modified: openoffice/trunk/main/cpputools/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/prj/build.lst?rev=1838934&r1=1838933&r2=1838934&view=diff
==============================================================================
--- openoffice/trunk/main/cpputools/prj/build.lst (original)
+++ openoffice/trunk/main/cpputools/prj/build.lst Fri Aug 24 18:58:00 2018
@@ -1,7 +1,2 @@
 pt	cpputools	:	cppuhelper offapi LIBXML2:libxml2 NULL
-pt	cpputools								usr1	-	all	pt_mkout NULL
-pt	cpputools\prj							get		-	all	pt_prj NULL
-pt	cpputools\source\registercomponent		nmake	-	all	pt_regcomp NULL
-pt	cpputools\source\regsingleton				nmake	-	all	pt_regsingleton NULL
-pt	cpputools\source\unoexe					nmake	-	all	pt_unoexe NULL
-pt	cpputools\source\sp2bv					nmake	-	all	pt_sp2bv NULL
+pt	cpputools\prj							nmake		-	all	pt_prj NULL

Modified: openoffice/trunk/main/cpputools/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/prj/d.lst?rev=1838934&r1=1838933&r2=1838934&view=diff
==============================================================================
--- openoffice/trunk/main/cpputools/prj/d.lst (original)
+++ openoffice/trunk/main/cpputools/prj/d.lst Fri Aug 24 18:58:00 2018
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp.bin
-..\%__SRC%\bin\uno.exe %_DEST%\bin%_EXT%\uno.exe
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno.bin
-..\%__SRC%\bin\regsingleton.exe %_DEST%\bin%_EXT%\regsingleton.exe
-..\%__SRC%\bin\regsingleton %_DEST%\bin%_EXT%\regsingleton
-..\%__SRC%\bin\sp2bv.exe %_DEST%\bin%_EXT%\sp2bv.exe
-..\%__SRC%\bin\sp2bv %_DEST%\bin%_EXT%\sp2bv

Added: openoffice/trunk/main/cpputools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/prj/makefile.mk?rev=1838934&view=auto
==============================================================================
--- openoffice/trunk/main/cpputools/prj/makefile.mk (added)
+++ openoffice/trunk/main/cpputools/prj/makefile.mk Fri Aug 24 18:58:00 2018
@@ -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



Mime
View raw message