[Libreoffice-commits] .: Makefile rdbmaker/Executable_rdbmaker.mk rdbmaker/Makefile rdbmaker/Module_rdbmaker.mk rdbmaker/prj rdbmaker/source Repository.mk RepositoryModule_ooo.mk
David Tardon
dtardon at kemper.freedesktop.org
Sun Apr 8 01:58:59 PDT 2012
Makefile | 2 -
Repository.mk | 1
RepositoryModule_ooo.mk | 1
rdbmaker/Executable_rdbmaker.mk | 58 +++++++++++++++++++++++++++++++
rdbmaker/Makefile | 7 +++
rdbmaker/Module_rdbmaker.mk | 33 +++++++++++++++++
rdbmaker/prj/build.lst | 6 ---
rdbmaker/prj/d.lst | 3 -
rdbmaker/prj/makefile.mk | 1
rdbmaker/source/codemaker/makefile.mk | 55 -----------------------------
rdbmaker/source/rdbmaker/makefile.mk | 63 ----------------------------------
11 files changed, 103 insertions(+), 127 deletions(-)
New commits:
commit f55eed29c68205f69dd263f8a9657ac407a73ee3
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Thu Apr 5 20:24:34 2012 +0200
gbuild conversion: rdbmaker module
dmake stuff removed
diff --git a/Makefile b/Makefile
index 1bfb75b..adeb637 100644
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,7 @@ psprint_config\
qadevOOo\
regexp\
reportdesign\
+rdbmaker\
ridljar\
rsc\
sal\
@@ -214,7 +215,6 @@ postgresql\
postprocess\
python\
pyuno\
-rdbmaker\
readlicense_oo\
redland\
registry\
diff --git a/Repository.mk b/Repository.mk
index 7775190..1fe0aa3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
osl_process_child \
pdf2xml \
pdfunzip \
+ rdbmaker \
rsc \
rscdep \
saxparser \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 2ad7f41..a79028c 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
package \
padmin \
psprint_config \
+ rdbmaker \
regexp \
reportdesign \
ridljar \
diff --git a/rdbmaker/Executable_rdbmaker.mk b/rdbmaker/Executable_rdbmaker.mk
new file mode 100644
index 0000000..6e46d38
--- /dev/null
+++ b/rdbmaker/Executable_rdbmaker.mk
@@ -0,0 +1,58 @@
+# -*- 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 at 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,rdbmaker))
+
+$(eval $(call gb_Executable_use_api,rdbmaker,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_set_include,rdbmaker,\
+ -I$(SRCDIR)/rdbmaker/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,rdbmaker,\
+ sal \
+ salhelper \
+ reg \
+ cppu \
+ cppuhelper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,rdbmaker,\
+ rdbmaker/source/rdbmaker/rdbmaker \
+ rdbmaker/source/rdbmaker/rdbtype \
+ rdbmaker/source/rdbmaker/rdboptions \
+ rdbmaker/source/rdbmaker/typeblop \
+ rdbmaker/source/rdbmaker/specialtypemanager \
+ rdbmaker/source/codemaker/global \
+ rdbmaker/source/codemaker/options \
+ rdbmaker/source/codemaker/typemanager \
+ rdbmaker/source/codemaker/dependency \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/rdbmaker/Makefile b/rdbmaker/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/rdbmaker/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/rdbmaker/Module_rdbmaker.mk b/rdbmaker/Module_rdbmaker.mk
new file mode 100644
index 0000000..0145b23
--- /dev/null
+++ b/rdbmaker/Module_rdbmaker.mk
@@ -0,0 +1,33 @@
+# -*- 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 at 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,rdbmaker))
+
+$(eval $(call gb_Module_add_targets,rdbmaker,\
+ Executable_rdbmaker \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/rdbmaker/prj/build.lst b/rdbmaker/prj/build.lst
index e105222..43b8f84 100644
--- a/rdbmaker/prj/build.lst
+++ b/rdbmaker/prj/build.lst
@@ -1,6 +1,2 @@
rm rdbmaker : cppuhelper NULL
-rm rdbmaker usr1 - all rm_mkout NULL
-rm rdbmaker\inc get - all rm_inc NULL
-rm rdbmaker\prj get - all rm_prj NULL
-rm rdbmaker\source\codemaker nmake - all rm_codemaker NULL
-rm rdbmaker\source\rdbmaker nmake - all rm_rdbmaker rm_codemaker NULL
+rm rdbmaker\prj nmake - all rm_prj NULL
diff --git a/rdbmaker/prj/d.lst b/rdbmaker/prj/d.lst
index 67afbfb..8b13789 100644
--- a/rdbmaker/prj/d.lst
+++ b/rdbmaker/prj/d.lst
@@ -1,4 +1 @@
-..\%__SRC%\bin\rdbmaker.exe %_DEST%\bin\rdbmaker.exe
-..\%__SRC%\bin\rdbmaker.pdb %_DEST%\bin\rdbmaker.pdb
-..\%__SRC%\bin\rdbmaker %_DEST%\bin\rdbmaker
diff --git a/rdbmaker/prj/makefile.mk b/rdbmaker/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/rdbmaker/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/rdbmaker/source/codemaker/makefile.mk b/rdbmaker/source/codemaker/makefile.mk
deleted file mode 100644
index 626b71e..0000000
--- a/rdbmaker/source/codemaker/makefile.mk
+++ /dev/null
@@ -1,55 +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=codemaker
-TARGET=$(PRJNAME)
-
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-CXXFILES= \
- global.cxx \
- options.cxx \
- typemanager.cxx \
- dependency.cxx
-
-OBJFILES= \
- $(OBJ)$/global.obj \
- $(OBJ)$/options.obj \
- $(OBJ)$/typemanager.obj \
- $(OBJ)$/dependency.obj
-
-# ------------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
deleted file mode 100644
index 8b41a93..0000000
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ /dev/null
@@ -1,63 +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=codemaker
-TARGET=rdbmaker
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-
-OBJFILES= $(OBJ)$/rdbmaker.obj \
- $(OBJ)$/rdboptions.obj \
- $(OBJ)$/typeblop.obj \
- $(OBJ)$/specialtypemanager.obj \
- $(OBJ)$/rdbtype.obj
-
-
-APP1TARGET= $(TARGET)
-
-APP1OBJS= $(OBJFILES)
-
-APP1STDLIBS=\
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(REGLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB)
-
-APP1LIBS= \
- $(LB)$/codemaker.lib
-
-APP1RPATH= NONE
-
-.INCLUDE : target.mk
More information about the Libreoffice-commits
mailing list