From a1fe0a772f40c221f5d788192543352b302ac4e8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 16 Feb 2012 09:09:14 +0200 Subject: Use the same simple lo_main() on iOS as on Android Let's do the iOS specific stuff in separate main() source file(s). Don't attempt to build complete iOS programs using normal LibreOffice mechanisms, it will work for only the very lowest level unit tests anyway, because of static linking and the circularish UNO/URE/bootstrap/whatnot (run-time) dependencies between different parts of the code. We thus can't build the various iOS-specific *_cppunittester_all unit test executables any more. Corresponding unit tests (and more complex ones) for iOS will have to be done in a different way. --- i18npool/Executable_i18npool_cppunittester_all.mk | 70 ----------------------- i18npool/Module_i18npool.mk | 6 -- 2 files changed, 76 deletions(-) delete mode 100644 i18npool/Executable_i18npool_cppunittester_all.mk (limited to 'i18npool') diff --git a/i18npool/Executable_i18npool_cppunittester_all.mk b/i18npool/Executable_i18npool_cppunittester_all.mk deleted file mode 100644 index 7a2a5ae8e895..000000000000 --- a/i18npool/Executable_i18npool_cppunittester_all.mk +++ /dev/null @@ -1,70 +0,0 @@ -# -*- 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. -# -# The Initial Developer of the Original Code is -# Matúš Kukan -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# 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,i18npool_cppunittester_all)) - -$(eval $(call gb_Executable_add_defs,i18npool_cppunittester_all,\ - $(gb_OBJCXXFLAGS) \ -)) - -$(eval $(call gb_Executable_set_include,i18npool_cppunittester_all,\ - $$(INCLUDE) \ - -I$(realpath $(SRCDIR)/i18npool/inc) \ -)) - -$(eval $(call gb_Executable_add_api,i18npool_cppunittester_all,\ - udkapi \ - offapi \ -)) - -$(eval $(call gb_Executable_add_linked_libs,i18npool_cppunittester_all,\ - bootstrap \ - cppu \ - cppuhelper \ - cppunit \ - gcc3_uno \ - reg \ - sal \ - salhelper \ - sal_textenc \ - store \ - xmlreader \ - $(gb_STDLIBS) \ -)) - -$(eval $(call gb_Executable_use_externals,i18npool_cppunittester_all, \ - uikit \ - foundation \ -)) - -$(eval $(call gb_Executable_add_exception_objects,i18npool_cppunittester_all,\ - i18npool/qa/cppunit/i18npool_cppunittester_all \ - i18npool/qa/cppunit/test_breakiterator \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 022e85f80891..3cd75e3dc4f7 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -61,10 +61,4 @@ $(eval $(call gb_Module_add_check_targets,i18npool,\ CppunitTest_i18npool_test_breakiterator \ )) -ifeq ($(OS),IOS) -$(eval $(call gb_Module_add_targets,i18npool,\ - Executable_i18npool_cppunittester_all \ -)) -endif - # vim: set noet sw=4 ts=4: -- cgit v1.2.3