diff options
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/JunitTest_unotools_complex.mk | 69 | ||||
| -rw-r--r-- | unotools/Library_utl.mk | 21 | ||||
| -rw-r--r-- | unotools/Module_unotools.mk | 5 |
3 files changed, 55 insertions, 40 deletions
diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk index cc968c7f49c9..3f23994c9d91 100644 --- a/unotools/JunitTest_unotools_complex.mk +++ b/unotools/JunitTest_unotools_complex.mk @@ -1,50 +1,55 @@ -# 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/ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# 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. +# OpenOffice.org - a multi-platform office productivity suite # -# The Initial Developer of the Original Code is -# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. +# This file is part of OpenOffice.org. # -# Major Contributor(s): +# 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. # -# For minor contributions see the git repository. +# 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). # -# 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. +# 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. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,unotools_complex,SRCDIR)) -$(eval $(call gb_JunitTest_JunitTest,unotools_complex)) +$(eval $(call gb_JunitTest_set_defs,unotools_complex,\ + $$(DEFS) \ +)) $(eval $(call gb_JunitTest_add_jars,unotools_complex,\ - $(OUTDIR)/bin/OOoRunner.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/test.jar \ - $(OUTDIR)/bin/unoil.jar \ - $(OUTDIR)/bin/jurt.jar \ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/test-tools.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ )) $(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\ - unotools/qa/complex/tempfile/TempFileUnitTest \ - unotools/qa/complex/tempfile/Test01 \ - unotools/qa/complex/tempfile/Test02 \ - unotools/qa/complex/tempfile/TempFileTest \ - unotools/qa/complex/tempfile/TestHelper \ + unotools/qa/complex/tempfile/TempFileTest \ + unotools/qa/complex/tempfile/TempFileUnitTest \ + unotools/qa/complex/tempfile/Test01 \ + unotools/qa/complex/tempfile/Test02 \ + unotools/qa/complex/tempfile/TestHelper \ )) $(eval $(call gb_JunitTest_add_classes,unotools_complex,\ - complex.tempfile.TempFileUnitTest \ + complex.tempfile.TempFileUnitTest \ )) # vim: set noet sw=4 ts=4: diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 1a86c469996c..70647da701ca 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -25,12 +25,22 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +# declare a library +# utl is the name of the library as it is found in Repository.mk $(eval $(call gb_Library_Library,utl)) +# declare packages that will be delivered before compilation of utl +# learn more about TYPE in the Package.mk template $(eval $(call gb_Library_add_package_headers,utl,unotools_inc)) +# for platforms supporting PCH: declare the location of the pch file +# this is the name of the cxx file (without extension) $(eval $(call gb_Library_add_precompiled_header,utl,$(SRCDIR)/unotools/inc/pch/precompiled_unotools)) +# in case UNO services are exported: declare location of component file +$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl)) + +# add any additional include paths for this library here $(eval $(call gb_Library_set_include,utl,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/unotools/inc/pch) \ @@ -38,11 +48,14 @@ $(eval $(call gb_Library_set_include,utl,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,utl,\ - $$(DEFS) \ +# add any additional definitions to be set for compilation here +# (e.g. -DLIB_DLLIMPLEMENTATION) +$(eval $(call gb_Library_add_defs,utl,\ -DUNOTOOLS_DLLIMPLEMENTATION \ )) +# add libraries to be linked to utl; again these names need to be given as +# specified in Repository.mk $(eval $(call gb_Library_add_linked_libs,utl,\ comphelper \ cppu \ @@ -55,8 +68,8 @@ $(eval $(call gb_Library_add_linked_libs,utl,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl)) - +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/accessibility/accessiblerelationsethelper \ unotools/source/accessibility/accessiblestatesethelper \ diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk index 849767cfe636..948b5b1f624c 100644 --- a/unotools/Module_unotools.mk +++ b/unotools/Module_unotools.mk @@ -1,9 +1,6 @@ # 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/ +# OpenOffice.org - a multi-platform office productivity suite # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |