Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools

David Ostrovsky <david.ostrovsky -AT- gmx.de>
Wed, 11 Apr 2012 01:05:52 +0200

Hi David,

thank you for your comments. Here is another try.

See also my comments bellow. If there still any issues, just let me know...

and I will give it another try ;-)

David

On 08.04.2012 10:29, David Tardon wrote:

On Wed, Apr 04, 2012 at 06:33:44AM +0200, David Tardon wrote:

On Wed, Apr 04, 2012 at 12:50:47AM +0200, David Ostrovsky wrote:

Hi David,

thank you for your comments. Here is another try.

Hi,

I looked at the patch and there are still some problems to correct. I
could easily do it myself, but I think that you can learn more this way.
So:

1. registercomponent sets APP1RPATH=UREBIN. That means the executable
    should be registered in UREBIN layer, instead of NONE, in gbuild.
    (Not knowing that is not your fault--I doubt this is documented
    anywhere...)

done.


2. The executables should not be built for IOS.

done.

3. unoexe is actually built on IOS, but as a static library.

done. I don't have mac out there to try.

But I commented MACOSX condition out and tried to built it on my Linuxmachine.

Then I saw, that Repository.mk should be updated.
With staticLibrary I'm using

$(eval $(call gb_StaticLibrary_use_api,uno,\
    udkapi \
))

and not this:
$(eval $(call gb_StaticLibrary_use_internal_comprehensive_api,uno,\
    udkapi \
))

4. regsingleton sets an additional compiler flag for MSC. You can use
    gb_Executable_add_cxxflags to do that in gbuild land.

done,
actually there are two conditions:
1. without debug
2. with MSC compiler
I hope i cathed the right one, please correct me, if I'm wrong.

5. re gb_Executable_add_api: you should use
    gb_Executable_use_internal_comprehensive_api for these
    executables/libraries that have NO_OFFUH=TRUE in makefile.mk .

done,
only sp2bv and staticLibrary use the old version.

Note that Michael pushed a stylistic change (that I really like) to
gbuild meanwhile, so some functions changed name. You will know which
ones, because you will get an error when trying to use them :-)

done, this one was obvious.

If you have any doubt, catch me on IRC.

D.

From aa6a7f3812a98bc78dd10d72be9fc1a4b14732c1 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Sun, 1 Apr 2012 16:07:41 +0200
Subject: [PATCH] gbuild conversion: cpputools module

dmake stuff removed
---
 Makefile                                       |    2 +-
 Repository.mk                                  |    7 ++
 cpputools/Executable_regcomp.mk                |   43 +++++++++++
 cpputools/Executable_regsingleton.mk           |   53 +++++++++++++
 cpputools/Executable_sp2bv.mk                  |   43 +++++++++++
 cpputools/Executable_uno.mk                    |   43 +++++++++++
 cpputools/Makefile                             |    7 ++
 cpputools/Module_cpputools.mk                  |   38 +++++++++
 cpputools/StaticLibrary_uno.mk                 |   38 +++++++++
 cpputools/prj/build.lst                        |    7 +--
 cpputools/prj/d.lst                            |   10 ---
 cpputools/prj/makefile.mk                      |    1 +
 cpputools/source/registercomponent/makefile.mk |   82 --------------------
 cpputools/source/regsingleton/makefile.mk      |   86 ---------------------
 cpputools/source/sp2bv/makefile.mk             |   56 --------------
 cpputools/source/unoexe/makefile.mk            |   97 ------------------------
 16 files changed, 275 insertions(+), 338 deletions(-)
 create mode 100644 cpputools/Executable_regcomp.mk
 create mode 100644 cpputools/Executable_regsingleton.mk
 create mode 100644 cpputools/Executable_sp2bv.mk
 create mode 100644 cpputools/Executable_uno.mk
 create mode 100644 cpputools/Makefile
 create mode 100644 cpputools/Module_cpputools.mk
 create mode 100644 cpputools/StaticLibrary_uno.mk
 create mode 100644 cpputools/prj/makefile.mk
 delete mode 100644 cpputools/source/registercomponent/makefile.mk
 delete mode 100644 cpputools/source/regsingleton/makefile.mk
 delete mode 100644 cpputools/source/sp2bv/makefile.mk
 delete mode 100644 cpputools/source/unoexe/makefile.mk

diff --git a/Makefile b/Makefile
index e660c36..709332a 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ configmgr\
 cppcanvas\
 cppu\
 cppuhelper\
+cpputools\
 cui\
 dbaccess\
 desktop\
@@ -155,7 +156,6 @@ codemaker\
 connectivity\
 cosv\
 cppunit\
-cpputools\
 crashrep\
 ct2n\
 curl\
diff --git a/Repository.mk b/Repository.mk
index 1fe0aa3..5c55b09 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -41,12 +41,15 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     pdf2xml \
     pdfunzip \
     rdbmaker \
+    regsingleton \
     rsc \
     rscdep \
     saxparser \
     so_checksum \
+    sp2bv \
     svidl \
     typesconfig \
+    uno \
     xml2cmp \
     xpdfimport \
 ))
@@ -130,6 +133,7 @@ ifneq ($(OS),MACOSX)
 
 $(eval $(call gb_Helper_register_executables,UREBIN,\
        javaldx \
+       regcomp \
 ))
 
 endif
@@ -550,6 +554,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     $(if $(filter $(OS),WNT), \
         odma_lib \
     ) \
+    $(if $(filter $(OS),MACOSX), \
+        uno \
+    ) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
new file mode 100644
index 0000000..1c0dc12
--- /dev/null
+++ b/cpputools/Executable_regcomp.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,regcomp))
+
+$(eval $(call gb_Executable_use_internal_comprehensive_api,regcomp,\
+    udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,regcomp,\
+    cppu \
+    cppuhelper \
+    sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regcomp,\
+    cpputools/source/registercomponent/registercomponent \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
new file mode 100644
index 0000000..5870616
--- /dev/null
+++ b/cpputools/Executable_regsingleton.mk
@@ -0,0 +1,53 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,regsingleton))
+
+$(eval $(call gb_Executable_use_internal_comprehensive_api,regsingleton,\
+    udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,regsingleton,\
+    cppu \
+    cppuhelper \
+    sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regsingleton,\
+    cpputools/source/regsingleton/regsingleton \
+))
+
+ifneq ($(gb_DEBUGLEVEL),0)
+ifeq ($(COM),MSC)
+# regsingleton sets an additional compiler flag for MSC.
+$(eval $(call gb_Executable_add_cxxflags,regsingleton,\
+       -Ob0 \
+))
+endif
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
new file mode 100644
index 0000000..7b12f9a
--- /dev/null
+++ b/cpputools/Executable_sp2bv.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,sp2bv))
+
+$(eval $(call gb_Executable_use_api,sp2bv,\
+    udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,sp2bv,\
+    cppu \
+    cppuhelper \
+    sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,sp2bv,\
+    cpputools/source/sp2bv/sp2bv \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
new file mode 100644
index 0000000..2151d0a
--- /dev/null
+++ b/cpputools/Executable_uno.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,uno))
+
+$(eval $(call gb_Executable_use_internal_comprehensive_api,uno,\
+    udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,uno,\
+    cppu \
+    cppuhelper \
+    sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,uno,\
+    cpputools/source/unoexe/unoexe \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Makefile b/cpputools/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/cpputools/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
new file mode 100644
index 0000000..c522772
--- /dev/null
+++ b/cpputools/Module_cpputools.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,cpputools))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,cpputools,StaticLibrary_uno))
+else
+$(eval $(call gb_Module_add_targets,cpputools,Executable_regcomp))
+$(eval $(call gb_Module_add_targets,cpputools,Executable_regsingleton))
+$(eval $(call gb_Module_add_targets,cpputools,Executable_sp2bv))
+$(eval $(call gb_Module_add_targets,cpputools,Executable_uno))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/StaticLibrary_uno.mk b/cpputools/StaticLibrary_uno.mk
new file mode 100644
index 0000000..bc144b0
--- /dev/null
+++ b/cpputools/StaticLibrary_uno.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,uno))
+
+$(eval $(call gb_StaticLibrary_use_api,uno,\
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,uno,\
+    cpputools/source/unoexe/unoexe \
+))
+
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/prj/build.lst b/cpputools/prj/build.lst
index 72aed9e..f91c57d 100644
--- a/cpputools/prj/build.lst
+++ b/cpputools/prj/build.lst
@@ -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
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index de4f3e5..e69de29 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\regcomp.exe %_DEST%\bin\regcomp.exe
-..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp
-..\%__SRC%\bin\regcomp %_DEST%\bin\regcomp.bin
-..\%__SRC%\bin\uno.exe %_DEST%\bin\uno.exe
-..\%__SRC%\bin\uno %_DEST%\bin\uno
-..\%__SRC%\bin\uno %_DEST%\bin\uno.bin
-..\%__SRC%\bin\regsingleton.exe %_DEST%\bin\regsingleton.exe
-..\%__SRC%\bin\regsingleton %_DEST%\bin\regsingleton
-..\%__SRC%\bin\sp2bv.exe %_DEST%\bin\sp2bv.exe
-..\%__SRC%\bin\sp2bv %_DEST%\bin\sp2bv
diff --git a/cpputools/prj/makefile.mk b/cpputools/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/cpputools/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/cpputools/source/registercomponent/makefile.mk 
b/cpputools/source/registercomponent/makefile.mk
deleted file mode 100644
index 4b25506..0000000
--- a/cpputools/source/registercomponent/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=cpputools
-TARGET=regcomp
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-.IF "$(OS)" == "IOS"
-
-ALL:
-# nothing
-
-.ENDIF
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS += -C
-
-UNOTYPES=\
-             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
-
-# --- Files --------------------------------------------------------
-
-DEPOBJFILES=   $(OBJ)$/registercomponent.obj 
-
-APP1TARGET= $(TARGET)
-APP1OBJS=$(DEPOBJFILES)  
-APP1RPATH=UREBIN
-
-APP1STDLIBS=\
-            $(SALLIB) \
-            $(CPPULIB) \
-            $(CPPUHELPERLIB)
-
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS+= \
-            $(LIBCMT)
-.ENDIF
-
-
-.INCLUDE :  target.mk
diff --git a/cpputools/source/regsingleton/makefile.mk b/cpputools/source/regsingleton/makefile.mk
deleted file mode 100644
index 96d629d..0000000
--- a/cpputools/source/regsingleton/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=cpputools
-TARGET=regsingleton
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)" == "IOS"
-
-ALL:
-# nothing
-
-.ENDIF
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS+= -C
-
-UNOTYPES= \
-     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
-
-# --- Files --------------------------------------------------------
-
-DEPOBJFILES= \
-    $(OBJ)$/regsingleton.obj 
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(DEPOBJFILES)  
-
-APP1STDLIBS= \
-    $(SALLIB)          \
-    $(CPPULIB)         \
-    $(CPPUHELPERLIB)
-
-.IF "$(debug)" != ""
-.IF "$(COM)" == "MSC"
-CFLAGS += -Ob0
-.ENDIF
-.ENDIF
-
-.INCLUDE :  target.mk
-
diff --git a/cpputools/source/sp2bv/makefile.mk b/cpputools/source/sp2bv/makefile.mk
deleted file mode 100644
index a8040a1..0000000
--- a/cpputools/source/sp2bv/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=cpputools
-TARGET=sp2bv
-TARGETTYPE=CUI
-.IF "$(OS)" != "MACOSX"
-# hack to get stdc++ linked
-NO_DEFAULT_STL=TRUE
-.ENDIF
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(OBJ)$/sp2bv.obj
-
-APP1TARGET=sp2bv
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS=$(SALLIB) 
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
deleted file mode 100644
index 34cd6ac..0000000
--- a/cpputools/source/unoexe/makefile.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=cpputools
-TARGET=uno
-.IF "$(OS)" != "IOS"
-LIBTARGET=NO
-.ENDIF
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS+= -C
-
-UNOTYPES= \
-     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
-
-# --- Files --------------------------------------------------------
-
-DEPOBJFILES=$(OBJ)$/unoexe.obj
-
-.IF "$(OS)" == "IOS"
-LIB1TARGET=$(LB)/$(TARGET).lib
-LIB1ARCHIV=$(LB)/lib$(TARGET).a
-LIB1OBJFILES=$(DEPOBJFILES)
-CFLAGSCXX += $(OBJCXXFLAGS)
-.ELSE
-APP1TARGET=$(TARGET)
-APP1OBJS=$(DEPOBJFILES)  
-APP1RPATH=UREBIN
-.ENDIF
-
-# Include all relevant (see ure/source/README) dynamic libraries, so that C++
-# UNO components running in the uno executable have a defined environment
-# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
-# included via APP1STDLIB, unxlngi6 libgcc_s.so.1 and wntmsci10 msvcr71.dll and
-# msvcp71.dll are magic---TODO):
-APP1STDLIBS= \
-    $(SALLIB)          \
-    $(SALHELPERLIB) \
-    $(CPPULIB)         \
-    $(CPPUHELPERLIB)\
-    $(LIBXML2LIB)
-
-.INCLUDE :  target.mk
-
-- 
1.7.5.4

Context

[PATCH][REVIEW] gbuild conversion: module cpputools · David Ostrovsky
- Re: [PATCH][REVIEW] gbuild conversion: module cpputools · David Tardon
  - Re: [PATCH][REVIEW] gbuild conversion: module cpputools · David Ostrovsky
    - Fwd: Re: [PATCH][REVIEW] gbuild conversion: module cpputools · David Ostrovsky
      - Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools · David Tardon
        
        Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools · David Tardon
        
        Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools · David Ostrovsky
        
        Re: [PATCH][PUSHED] gbuild conversion: module cpputools · David Tardon
        
        Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools · David Ostrovsky
        
        Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools · Matúš Kukan
        
        Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools · Michael Stahl
        Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools · Caolán McNamara
- Re: [PATCH][REVIEW] gbuild conversion: module cpputools · Matúš Kukan

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.