[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cpputools/Executable_regcomp.mk cpputools/Executable_regsingleton.mk cpputools/Executable_sp2bv.mk cpputools/Executable_uno.mk cpputools/Makefile cpputools/Module_cpputools.mk cpputools/Package_bin.mk cpputools/prj

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jan 9 03:08:23 UTC 2019


 cpputools/Executable_regcomp.mk      |   51 ----------------------------
 cpputools/Executable_regsingleton.mk |   54 ------------------------------
 cpputools/Executable_sp2bv.mk        |   36 --------------------
 cpputools/Executable_uno.mk          |   63 -----------------------------------
 cpputools/Makefile                   |   32 -----------------
 cpputools/Module_cpputools.mk        |   42 -----------------------
 cpputools/Package_bin.mk             |   27 ---------------
 cpputools/prj/build.lst              |    7 +++
 cpputools/prj/d.lst                  |   10 +++++
 cpputools/prj/makefile.mk            |   44 ------------------------
 10 files changed, 16 insertions(+), 350 deletions(-)

New commits:
commit 562339ffebf2bef1be04c98b45e7f67445a27d84
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Wed Jan 9 01:26:47 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Wed Jan 9 01:26:47 2019 +0000

    And remove the added files

diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/cpputools/Makefile b/cpputools/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
deleted file mode 100644
index ccde29c8d44e..000000000000
--- a/cpputools/Module_cpputools.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#**************************************************************
-#  
-#  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)
-else ifeq ($(GUIBASE),OS2)
-else
-$(eval $(call gb_Module_add_targets,cpputools,\
-	Package_bin \
-))
-endif
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
deleted file mode 100644
index e69de29bb2d1..000000000000
commit 6eabe2919eed2b052c5ee2c1d791ad14f6984f69
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Wed Jan 9 01:26:27 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Wed Jan 9 01:26:27 2019 +0000

    Revert -r 1838934 which breaks macOS. Porting this to gbuild isn't needed so this is basically a safe no-op

diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
index 3222f5d9cfd0..e69de29bb2d1 100644
--- a/cpputools/Executable_regcomp.mk
+++ b/cpputools/Executable_regcomp.mk
@@ -1,51 +0,0 @@
-#**************************************************************
-#  
-#  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:
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
index 747a01a94ea5..e69de29bb2d1 100644
--- a/cpputools/Executable_regsingleton.mk
+++ b/cpputools/Executable_regsingleton.mk
@@ -1,54 +0,0 @@
-#**************************************************************
-#  
-#  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:
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
index 17f4294ce336..e69de29bb2d1 100644
--- a/cpputools/Executable_sp2bv.mk
+++ b/cpputools/Executable_sp2bv.mk
@@ -1,36 +0,0 @@
-#**************************************************************
-#  
-#  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:
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
index ddf995bcac59..e69de29bb2d1 100644
--- a/cpputools/Executable_uno.mk
+++ b/cpputools/Executable_uno.mk
@@ -1,63 +0,0 @@
-#**************************************************************
-#  
-#  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:
diff --git a/cpputools/Makefile b/cpputools/Makefile
index c1d144cbd4c9..e69de29bb2d1 100644
--- a/cpputools/Makefile
+++ b/cpputools/Makefile
@@ -1,32 +0,0 @@
-#**************************************************************
-#  
-#  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:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
index ad5e6706313a..e69de29bb2d1 100644
--- a/cpputools/Package_bin.mk
+++ b/cpputools/Package_bin.mk
@@ -1,27 +0,0 @@
-#**************************************************************
-#  
-#  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))
diff --git a/cpputools/prj/build.lst b/cpputools/prj/build.lst
index f37ae4c749ef..72aed9e6609e 100644
--- a/cpputools/prj/build.lst
+++ b/cpputools/prj/build.lst
@@ -1,2 +1,7 @@
 pt	cpputools	:	cppuhelper offapi LIBXML2:libxml2 NULL
-pt	cpputools\prj							nmake		-	all	pt_prj 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
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index e69de29bb2d1..14de5e78af75 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -0,0 +1,10 @@
+..\%__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
diff --git a/cpputools/prj/makefile.mk b/cpputools/prj/makefile.mk
index c62c6a657d16..e69de29bb2d1 100644
--- a/cpputools/prj/makefile.mk
+++ b/cpputools/prj/makefile.mk
@@ -1,44 +0,0 @@
-#**************************************************************
-#  
-#  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


More information about the Libreoffice-commits mailing list