Hi,
this patch convert cpputools module to gbuild
I updated
https://wiki.documentfoundation.org/Development/Build_System/Module_status
accordingly,
David
From 20d59baaf72e18bbdc3d400e708cb1f5c70a671c 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 1/2] gbuild conversion: cpputools module
dmake stuff removed
---
Makefile | 2 +-
Repository.mk | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index d29f244..ffe3740 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ configmgr\
cppcanvas\
cppu\
cppuhelper\
+cpputools\
cui\
dbaccess\
desktop\
@@ -151,7 +152,6 @@ codemaker\
connectivity\
cosv\
cppunit\
-cpputools\
crashrep\
ct2n\
curl\
diff --git a/Repository.mk b/Repository.mk
index 74452fd..4e2d40e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -40,12 +40,16 @@ $(eval $(call gb_Helper_register_executables,NONE, \
osl_process_child \
pdf2xml \
pdfunzip \
+ regcomp \
+ regsingleton \
rsc \
rscdep \
saxparser \
so_checksum \
+ sp2bv \
svidl \
typesconfig \
+ uno \
xml2cmp \
xpdfimport \
))
--
1.7.5.4
From f44e44974d14be4482f1676600b8b3c407f60684 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Sun, 1 Apr 2012 16:24:31 +0200
Subject: [PATCH 2/2] gbuild conversion: cpputools module
dmake stuff removed
---
cpputools/Executable_regcomp.mk | 46 ++++++++++++++++++++++++++++++++++
cpputools/Executable_regsingleton.mk | 46 ++++++++++++++++++++++++++++++++++
cpputools/Executable_sp2bv.mk | 46 ++++++++++++++++++++++++++++++++++
cpputools/Executable_uno.mk | 46 ++++++++++++++++++++++++++++++++++
cpputools/Makefile | 7 +++++
cpputools/Module_cpputools.mk | 35 +++++++++++++++++++++++++
6 files changed, 226 insertions(+), 0 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
diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
new file mode 100644
index 0000000..d34c5b0
--- /dev/null
+++ b/cpputools/Executable_regcomp.mk
@@ -0,0 +1,46 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (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_add_api,regcomp,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,regcomp,\
+ basegfx \
+ comphelper \
+ 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..ae8b78c
--- /dev/null
+++ b/cpputools/Executable_regsingleton.mk
@@ -0,0 +1,46 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (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_add_api,regsingleton,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,regsingleton,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regsingleton,\
+ cpputools/source/regsingleton/regsingleton \
+))
+
+# 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..47ff679
--- /dev/null
+++ b/cpputools/Executable_sp2bv.mk
@@ -0,0 +1,46 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (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_add_api,sp2bv,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,sp2bv,\
+ basegfx \
+ comphelper \
+ 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..400bae8
--- /dev/null
+++ b/cpputools/Executable_uno.mk
@@ -0,0 +1,46 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (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_add_api,uno,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,uno,\
+ basegfx \
+ comphelper \
+ 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..da9b9b7
--- /dev/null
+++ b/cpputools/Module_cpputools.mk
@@ -0,0 +1,35 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (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))
+
+$(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))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
--
1.7.5.4
Context
- [PATCH][REVIEW] gbuild conversion: module cpputools · David Ostrovsky
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.