gbuild conversion: cpputools module

dmake stuff removed
This commit is contained in:
David Ostrovsky 2012-04-01 16:07:41 +02:00 committed by David Tardon
parent 6135a5f540
commit 5342bc073b
16 changed files with 293 additions and 338 deletions

View file

@ -45,6 +45,7 @@ configmgr\
cppcanvas\
cppu\
cppuhelper\
cpputools\
cui\
dbaccess\
desktop\
@ -155,7 +156,6 @@ codemaker\
connectivity\
cosv\
cppunit\
cpputools\
crashrep\
ct2n\
curl\

View file

@ -41,10 +41,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \
pdf2xml \
pdfunzip \
rdbmaker \
regsingleton \
rsc \
rscdep \
saxparser \
so_checksum \
sp2bv \
svidl \
typesconfig \
xml2cmp \
@ -126,6 +128,15 @@ $(eval $(call gb_Helper_register_executables,OOO,\
endif
ifneq ($(OS),IOS)
$(eval $(call gb_Helper_register_executables,UREBIN,\
regcomp \
uno \
))
endif
ifneq ($(OS),MACOSX)
$(eval $(call gb_Helper_register_executables,UREBIN,\
@ -547,6 +558,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
ulingu \
vclmain \
writerperfect \
$(if $(filter $(OS),IOS), \
uno \
) \
$(if $(filter $(OS),WNT), \
odma_lib \
) \

View file

@ -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:

View file

@ -0,0 +1,52 @@
# -*- 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)
$(eval $(call gb_Executable_add_cxxflags,regsingleton,\
-Ob0 \
))
endif
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:

View file

@ -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:

View file

@ -0,0 +1,48 @@
# -*- 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 \
salhelper \
))
$(eval $(call gb_Executable_use_externals,uno,\
libxml2 \
))
$(eval $(call gb_Executable_add_exception_objects,uno,\
cpputools/source/unoexe/unoexe \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:

7
cpputools/Makefile Normal file
View file

@ -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:

View file

@ -0,0 +1,45 @@
# -*- 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))
$(eval $(call gb_Module_add_targets,cpputools,\
Executable_sp2bv \
))
ifeq ($(OS),IOS)
$(eval $(call gb_Module_add_targets,cpputools,\
StaticLibrary_uno \
))
else
$(eval $(call gb_Module_add_targets,cpputools,\
Executable_regcomp \
Executable_regsingleton \
Executable_uno \
))
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:

View file

@ -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_internal_comprehensive_api,uno,\
udkapi \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,uno,\
cpputools/source/unoexe/unoexe \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:

View file

@ -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

View file

@ -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

View file

@ -0,0 +1 @@
.INCLUDE : gbuildbridge.mk

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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