[PATCH] gbuild conversion: unodevtools module
David Ostrovsky
David.Ostrovsky at gmx.de
Fri Apr 13 13:33:35 PDT 2012
---
Makefile | 2 +-
Repository.mk | 1 +
RepositoryModule_ooo.mk | 1 +
unodevtools/Executable_skeletonmaker.mk | 64 ++++++++++++++++++++++++++
unodevtools/Makefile | 7 +++
unodevtools/Module_unodevtools.mk | 33 +++++++++++++
unodevtools/prj/build.lst | 8 +--
unodevtools/prj/d.lst | 5 --
unodevtools/prj/makefile.mk | 1 +
unodevtools/source/skeletonmaker/makefile.mk | 63 -------------------------
unodevtools/source/unodevtools/makefile.mk | 52 ---------------------
11 files changed, 110 insertions(+), 127 deletions(-)
create mode 100644 unodevtools/Executable_skeletonmaker.mk
create mode 100644 unodevtools/Makefile
create mode 100644 unodevtools/Module_unodevtools.mk
create mode 100644 unodevtools/prj/makefile.mk
delete mode 100644 unodevtools/source/skeletonmaker/makefile.mk
delete mode 100644 unodevtools/source/unodevtools/makefile.mk
diff --git a/Makefile b/Makefile
index 498e028..79f39aa 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,7 @@ ucb\
ucbhelper\
udkapi\
unixODBC\
+unodevtools\
unoil\
unotest\
unotools\
@@ -234,7 +235,6 @@ sysui\
testtools\
tomcat\
udm\
-unodevtools\
vigra\
x11_extensions\
xpdf\
diff --git a/Repository.mk b/Repository.mk
index 6821d1f..bc229c9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -63,6 +63,7 @@ ifneq ($(OS),IOS)
$(eval $(call gb_Helper_register_executables,SDK, \
javamaker \
cppumaker \
+ uno-skeletonmaker \
))
endif
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 1eadf41..af0900e 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -123,6 +123,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
udkapi \
unixODBC \
UnoControls \
+ unodevtools \
unoil \
unotest \
unotools \
diff --git a/unodevtools/Executable_skeletonmaker.mk b/unodevtools/Executable_skeletonmaker.mk
new file mode 100644
index 0000000..ee1909a
--- /dev/null
+++ b/unodevtools/Executable_skeletonmaker.mk
@@ -0,0 +1,64 @@
+# -*- 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,uno-skeletonmaker))
+
+$(eval $(call gb_Executable_use_api,uno-skeletonmaker,\
+ udkapi \
+))
+
+$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\
+ -I$(SRCDIR)/unodevtools/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,uno-skeletonmaker,\
+ reg \
+ sal \
+ salhelper \
+ cppu \
+ cppuhelper \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\
+ codemaker \
+ commoncpp \
+ commonjava \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,uno-skeletonmaker,\
+ unodevtools/source/unodevtools/options \
+ unodevtools/source/unodevtools/typeblob \
+ unodevtools/source/unodevtools/typemanager \
+ unodevtools/source/skeletonmaker/skeletonmaker \
+ unodevtools/source/skeletonmaker/skeletoncommon \
+ unodevtools/source/skeletonmaker/javatypemaker \
+ unodevtools/source/skeletonmaker/cpptypemaker \
+ unodevtools/source/skeletonmaker/javacompskeleton \
+ unodevtools/source/skeletonmaker/cppcompskeleton \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unodevtools/Makefile b/unodevtools/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/unodevtools/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/unodevtools/Module_unodevtools.mk b/unodevtools/Module_unodevtools.mk
new file mode 100644
index 0000000..9819bfd
--- /dev/null
+++ b/unodevtools/Module_unodevtools.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,unodevtools))
+
+$(eval $(call gb_Module_add_targets,unodevtools,\
+ Executable_skeletonmaker \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unodevtools/prj/build.lst b/unodevtools/prj/build.lst
index 37f2ef3..c8aef47 100644
--- a/unodevtools/prj/build.lst
+++ b/unodevtools/prj/build.lst
@@ -1,8 +1,4 @@
udt unodevtools : DESKTOP:codemaker cppuhelper NULL
-udt unodevtools usr1 - all udt_mkout NULL
-udt unodevtools\inc get - all udt_inc NULL
-udt unodevtools\prj get - all udt_prj NULL
-udt unodevtools\source\unodevtools nmake - all udt_unodevtools NULL
-udt unodevtools\source\skeletonmaker nmake - all udt_skeletonmaker udt_unodevtools NULL
-
+udt unodevtools usr1 - all udt_mkout NULL
+udt unodevtools\prj nmake - all udt_prj NULL
diff --git a/unodevtools/prj/d.lst b/unodevtools/prj/d.lst
index f4be609..e69de29 100644
--- a/unodevtools/prj/d.lst
+++ b/unodevtools/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin\uno-skeletonmaker.exe
-..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin\uno-skeletonmaker.pdb
-
-..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin\uno-skeletonmaker
-
diff --git a/unodevtools/prj/makefile.mk b/unodevtools/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/unodevtools/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/unodevtools/source/skeletonmaker/makefile.mk b/unodevtools/source/skeletonmaker/makefile.mk
deleted file mode 100644
index 0a6bfde..0000000
--- a/unodevtools/source/skeletonmaker/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 := unodevtools
-
-TARGET := uno-skeletonmaker
-TARGETTYPE := CUI
-LIBTARGET := NO
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-.IF "$(OS)" == "IOS"
-all:
- @echo No point in build-time executables for this platform
-.ENDIF
-
-.INCLUDE : $(PRJ)$/unodevtools.pmk
-
-APP1TARGET = $(TARGET)
-APP1RPATH=SDKBIN
-
-APP1OBJS = $(OBJ)$/skeletonmaker.obj \
- $(OBJ)$/skeletoncommon.obj \
- $(OBJ)$/javatypemaker.obj \
- $(OBJ)$/cpptypemaker.obj \
- $(OBJ)$/javacompskeleton.obj \
- $(OBJ)$/cppcompskeleton.obj
-
-APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
- $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
-APP1STDLIBS = $(UNODEVTOOLSLIBST) $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
- $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
-
-OBJFILES = $(APP1OBJS)
-
-.INCLUDE: target.mk
diff --git a/unodevtools/source/unodevtools/makefile.mk b/unodevtools/source/unodevtools/makefile.mk
deleted file mode 100644
index d8f0920..0000000
--- a/unodevtools/source/unodevtools/makefile.mk
+++ /dev/null
@@ -1,52 +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=unodevtools
-TARGET=unodevtools
-
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/typemanager.obj \
- $(SLO)$/typeblob.obj \
- $(SLO)$/options.obj
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-
-# ------------------------------------------------------------------
-
-.INCLUDE : target.mk
-
--
1.7.5.4
--------------050805010505070802030201--
More information about the LibreOffice
mailing list