summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basebmp/Executable_basebmp_cppunittester_all.mk70
-rw-r--r--basebmp/Module_basebmp.mk6
-rw-r--r--basegfx/Executable_basegfx_cppunittester_all.mk71
-rw-r--r--basegfx/Module_basegfx.mk6
-rw-r--r--i18npool/Executable_i18npool_cppunittester_all.mk70
-rw-r--r--i18npool/Module_i18npool.mk6
-rw-r--r--sal/inc/sal/main.h78
-rw-r--r--sax/Executable_sax_cppunittester_all.mk64
-rw-r--r--sax/Module_sax.mk6
-rw-r--r--tools/Executable_tools_cppunittester_all.mk69
-rw-r--r--tools/Module_tools.mk6
11 files changed, 1 insertions, 451 deletions
diff --git a/basebmp/Executable_basebmp_cppunittester_all.mk b/basebmp/Executable_basebmp_cppunittester_all.mk
deleted file mode 100644
index c2cd64554e5d..000000000000
--- a/basebmp/Executable_basebmp_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
-# Tor Lillqvist <tml@iki.fi>
-# 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,basebmp_cppunittester_all))
-
-$(eval $(call gb_Executable_add_defs,basebmp_cppunittester_all,\
- $(gb_OBJCXXFLAGS) \
-))
-
-$(eval $(call gb_Executable_add_linked_libs,basebmp_cppunittester_all, \
- basebmp \
- basegfx \
- cppu \
- cppunit \
- sal \
- sal_textenc \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Executable_use_externals,basebmp_cppunittester_all, \
- uikit \
- foundation \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,basebmp_cppunittester_all, \
- basebmp/test/basebmp_cppunittester_all \
- basebmp/test/basictest \
- basebmp/test/bmpmasktest \
- basebmp/test/bmptest \
- basebmp/test/cliptest \
- basebmp/test/filltest \
- basebmp/test/linetest \
- basebmp/test/masktest \
- basebmp/test/polytest \
- basebmp/test/tools \
-))
-
-$(eval $(call gb_Executable_add_api,basebmp_cppunittester_all, \
- udkapi \
- offapi \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
index b3da038c0de7..071bf32370b3 100644
--- a/basebmp/Module_basebmp.mk
+++ b/basebmp/Module_basebmp.mk
@@ -37,10 +37,4 @@ $(eval $(call gb_Module_add_check_targets,basebmp,\
CppunitTest_basebmp \
))
-ifeq ($(OS),IOS)
-$(eval $(call gb_Module_add_targets,basebmp,\
- Executable_basebmp_cppunittester_all \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/basegfx/Executable_basegfx_cppunittester_all.mk b/basegfx/Executable_basegfx_cppunittester_all.mk
deleted file mode 100644
index 3c09e8577115..000000000000
--- a/basegfx/Executable_basegfx_cppunittester_all.mk
+++ /dev/null
@@ -1,71 +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
-# Tor Lillqvist. <tml@iki.fi>
-# 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,basegfx_cppunittester_all))
-
-$(eval $(call gb_Executable_set_include,basegfx_cppunittester_all,\
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Executable_add_defs,basegfx_cppunittester_all,\
- $(gb_OBJCXXFLAGS) \
-))
-
-$(eval $(call gb_Executable_add_linked_libs,basegfx_cppunittester_all, \
- basegfx \
- cppu \
- cppunit \
- sal \
- sal_textenc \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Executable_use_externals,basegfx_cppunittester_all, \
- uikit \
- foundation \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,basegfx_cppunittester_all, \
- basegfx/test/basegfx_cppunittester_all \
- basegfx/test/basegfx1d \
- basegfx/test/basegfx2d \
- basegfx/test/basegfx3d \
- basegfx/test/boxclipper \
- basegfx/test/basegfxtools \
- basegfx/test/clipstate \
- basegfx/test/genericclipper \
-))
-
-$(eval $(call gb_Executable_add_api,basegfx_cppunittester_all, \
- udkapi \
- offapi \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basegfx/Module_basegfx.mk b/basegfx/Module_basegfx.mk
index 4c382b187452..0974b93c3f9d 100644
--- a/basegfx/Module_basegfx.mk
+++ b/basegfx/Module_basegfx.mk
@@ -43,10 +43,4 @@ $(eval $(call gb_Module_add_check_targets,basegfx,\
CppunitTest_basegfx \
))
-ifeq ($(OS),IOS)
-$(eval $(call gb_Module_add_targets,basegfx,\
- Executable_basegfx_cppunittester_all \
-))
-endif
-
# vim: set noet sw=4 ts=4:
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 <matus.kukan@gmail.com>
-# 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:
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 49c8b5de6e2d..0f68012bd057 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -41,83 +41,7 @@ extern "C" {
SAL_DLLPUBLIC void SAL_CALL sal_detail_initialize(int argc, char ** argv);
SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize();
-#ifdef IOS
-
-#include <premac.h>
-#import <UIKit/UIKit.h>
-#include <postmac.h>
-
-#define SAL_MAIN_WITH_ARGS_IMPL \
-int SAL_CALL main(int argc, char ** argv) \
-{ \
- sal_detail_initialize(argc, argv); \
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
- int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \
- [pool release]; \
- sal_detail_deinitialize(); \
- return retVal; \
-} \
- \
-static int sal_main_with_args(int argc, char **argv); \
- \
-static int \
-sal_main(void) \
-{ \
- char *argv[] = { NULL }; \
- return sal_main_with_args(0, argv); \
-}
-
-#define SAL_MAIN_IMPL \
-int SAL_CALL main(int argc, char ** argv) \
-{ \
- sal_detail_initialize(argc, argv); \
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
- int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \
- [pool release]; \
- sal_detail_deinitialize(); \
- return retVal; \
-}
-
-#define SAL_MAIN_WITH_GUI_IMPL \
-int SAL_CALL main(int argc, char ** argv) \
-{ \
- sal_detail_initialize(argc, argv); \
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
- int retVal = sal_main(); \
- [pool release]; \
- sal_detail_deinitialize(); \
- return retVal; \
-}
-
-@interface salAppDelegate : NSObject <UIApplicationDelegate> {
-}
-@property (nonatomic, retain) UIWindow *window;
-@end
-
-static int sal_main(void);
-
-@implementation salAppDelegate
-
-@synthesize window=_window;
-
-- (BOOL)application: (UIApplication *) application didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
-{
- (void) application;
- (void) launchOptions;
- UIWindow *uiw = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
- uiw.backgroundColor = [UIColor redColor];
- self.window = uiw;
- [uiw release];
-
- sal_main();
-
- [self.window makeKeyAndVisible];
- return YES;
-}
-
-@end
-
-#elif defined ANDROID
+#if defined IOS || defined ANDROID
#ifdef __cplusplus
extern "C" __attribute__ ((visibility("default"))) void lo_main(int argc, char **argv);
diff --git a/sax/Executable_sax_cppunittester_all.mk b/sax/Executable_sax_cppunittester_all.mk
deleted file mode 100644
index 0ec10a8a379d..000000000000
--- a/sax/Executable_sax_cppunittester_all.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Executable_Executable,sax_cppunittester_all))
-
-$(eval $(call gb_Executable_set_include,sax_cppunittester_all,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sax/inc \
-))
-
-$(eval $(call gb_Executable_add_defs,sax_cppunittester_all,\
- $(gb_OBJCXXFLAGS) \
-))
-
-$(eval $(call gb_Executable_add_linked_libs,sax_cppunittester_all,\
- cppu \
- cppunit \
- sal \
- sal_textenc \
- sax \
- $(gb_STDLIBS) \
- objc \
-))
-
-$(eval $(call gb_Executable_use_externals,sax_cppunittester_all,\
- uikit \
- foundation \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,sax_cppunittester_all,\
- sax/qa/cppunit/sax_cppunittester_all \
-))
-
-$(eval $(call gb_Executable_add_api,sax_cppunittester_all,\
- offapi \
- udkapi \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk
index 9276e9823fa2..c76d0c826ea4 100644
--- a/sax/Module_sax.mk
+++ b/sax/Module_sax.mk
@@ -39,10 +39,4 @@ $(eval $(call gb_Module_add_check_targets,sax,\
CppunitTest_sax \
))
-ifeq ($(OS),IOS)
-$(eval $(call gb_Module_add_targets,sax,\
- Executable_sax_cppunittester_all \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_tools_cppunittester_all.mk b/tools/Executable_tools_cppunittester_all.mk
deleted file mode 100644
index a46bfce91303..000000000000
--- a/tools/Executable_tools_cppunittester_all.mk
+++ /dev/null
@@ -1,69 +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
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# 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,tools_cppunittester_all))
-
-$(eval $(call gb_Executable_set_include,tools_cppunittester_all,\
- $$(INCLUDE) \
- -I$(SRCDIR)/tools/inc \
-))
-
-$(eval $(call gb_Executable_add_defs,tools_cppunittester_all,\
- $(gb_OBJCXXFLAGS) \
-))
-
-$(eval $(call gb_Executable_add_linked_libs,tools_cppunittester_all, \
- cppu \
- cppunit \
- sal \
- sal_textenc \
- tl \
- $(gb_STDLIBS) \
- objc \
-))
-
-$(eval $(call gb_Executable_use_externals,tools_cppunittester_all, \
- uikit \
- foundation \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,tools_cppunittester_all, \
- tools/qa/cppunit/tools_cppunittester_all \
- tools/qa/cppunit/test_reversemap \
- tools/qa/cppunit/test_pathutils \
- tools/qa/cppunit/test_stream \
-))
-
-$(eval $(call gb_Executable_add_api,tools_cppunittester_all, \
- udkapi \
- offapi \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index afd3366d663d..2feb9226e400 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -49,10 +49,4 @@ $(eval $(call gb_Module_add_targets,tools,\
))
endif
-ifeq ($(OS),IOS)
-$(eval $(call gb_Module_add_targets,tools,\
- Executable_tools_cppunittester_all \
-))
-endif
-
# vim: set noet sw=4 ts=4: