[Libreoffice-commits] .: 4 commits - basebmp/Executable_basebmp_cppunittester_all.mk basebmp/Module_basebmp.mk basegfx/Executable_basegfx_cppunittester_all.mk basegfx/Module_basegfx.mk codemaker/source cpputools/source framework/inc framework/util i18npool/Executable_i18npool_cppunittester_all.mk i18npool/Module_i18npool.mk jvmaccess/source jvmaccess/util officecfg/registry sal/inc sax/Executable_sax_cppunittester_all.mk sax/Module_sax.mk sax/test tools/Executable_tools_cppunittester_all.mk tools/Module_tools.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Feb 16 05:26:42 PST 2012
basebmp/Executable_basebmp_cppunittester_all.mk | 70 --------
basebmp/Module_basebmp.mk | 6
basegfx/Executable_basegfx_cppunittester_all.mk | 71 ---------
basegfx/Module_basegfx.mk | 6
codemaker/source/cppumaker/makefile.mk | 4
codemaker/source/javamaker/makefile.mk | 4
cpputools/source/registercomponent/makefile.mk | 4
cpputools/source/regsingleton/makefile.mk | 4
cpputools/source/unoexe/makefile.mk | 11 +
framework/inc/services.h | 2
framework/util/fwl.component | 2
i18npool/Executable_i18npool_cppunittester_all.mk | 70 --------
i18npool/Module_i18npool.mk | 6
jvmaccess/source/makefile.mk | 4
jvmaccess/util/makefile.mk | 4
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 6
sal/inc/sal/main.h | 78 ----------
sax/Executable_sax_cppunittester_all.mk | 64 --------
sax/Module_sax.mk | 6
sax/test/makefile.mk | 4
tools/Executable_tools_cppunittester_all.mk | 69 --------
tools/Module_tools.mk | 6
22 files changed, 35 insertions(+), 466 deletions(-)
New commits:
commit a4e05e583f58f1baaf518e71cc48da78296ab5f4
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 16 13:13:31 2012 +0200
Typo fix: com.sum -> com.sun
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 232d924..982fcd0 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -209,7 +209,7 @@ namespace framework{
#define IMPLEMENTATIONNAME_URIABBREVIATION DECLARE_ASCII("com.sun.star.comp.framework.UriAbbreviation" )
#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerDispatcher" )
#define IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LangSelectionStatusbarController" )
-#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER DECLARE_ASCII("com.sum.star.comp.framework.LanguageSelectionMenuController" )
+#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LanguageSelectionMenuController" )
#define IMPLEMENTATIONNAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ImageManager" )
#define IMPLEMENTATIONNAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.comp.framework.TabWindowService" )
#define IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.comp.framework.WindowContentFactoryManager" )
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
index 5fca040..b81a9f2 100755
--- a/framework/util/fwl.component
+++ b/framework/util/fwl.component
@@ -28,7 +28,7 @@
<component loader="com.sun.star.loader.SharedLibrary" prefix="fwl"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sum.star.comp.framework.LanguageSelectionMenuController">
+ <implementation name="com.sun.star.comp.framework.LanguageSelectionMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.DispatchRecorder">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 0054c7a..32cad81 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -158,7 +158,7 @@
<value/>
</prop>
<prop oor:name="Controller">
- <value>com.sum.star.comp.framework.LanguageSelectionMenuController</value>
+ <value>com.sun.star.comp.framework.LanguageSelectionMenuController</value>
</prop>
</node>
<node oor:name="c14" oor:op="replace">
@@ -169,7 +169,7 @@
<value/>
</prop>
<prop oor:name="Controller">
- <value>com.sum.star.comp.framework.LanguageSelectionMenuController</value>
+ <value>com.sun.star.comp.framework.LanguageSelectionMenuController</value>
</prop>
</node>
<node oor:name="c15" oor:op="replace">
@@ -180,7 +180,7 @@
<value/>
</prop>
<prop oor:name="Controller">
- <value>com.sum.star.comp.framework.LanguageSelectionMenuController</value>
+ <value>com.sun.star.comp.framework.LanguageSelectionMenuController</value>
</prop>
</node>
</node>
commit 63fabb9d462907c896549c42ba7dea70a4d31ea3
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 16 13:12:37 2012 +0200
Build unoexe as a (static) library for iOS
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index e4317b0..34cd6ac 100755
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -28,7 +28,9 @@ PRJ=..$/..
PRJNAME=cpputools
TARGET=uno
+.IF "$(OS)" != "IOS"
LIBTARGET=NO
+.ENDIF
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
@@ -68,12 +70,15 @@ UNOTYPES= \
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
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += $(OBJCXXFLAGS)
.ENDIF
# Include all relevant (see ure/source/README) dynamic libraries, so that C++
commit b57a1f2f4d693902a1720b5d4e47fa60cfba7ce0
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 16 09:49:55 2012 +0200
Reduce verbiage slightly
diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk
index c05773e..25e881a 100644
--- a/codemaker/source/cppumaker/makefile.mk
+++ b/codemaker/source/cppumaker/makefile.mk
@@ -38,8 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.IF "$(OS)" == "IOS"
+
all:
- @echo No build-time tools for this platform
+# nothing
+
.ENDIF
.INCLUDE : $(PRJ)$/codemaker.pmk
diff --git a/codemaker/source/javamaker/makefile.mk b/codemaker/source/javamaker/makefile.mk
index cf8a298..314dd0f 100644
--- a/codemaker/source/javamaker/makefile.mk
+++ b/codemaker/source/javamaker/makefile.mk
@@ -39,8 +39,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.IF "$(OS)" == "IOS"
+
all:
- @echo No build-time tools for this platform
+# nothing
+
.ENDIF
.INCLUDE : $(PRJ)$/codemaker.pmk
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk
index 536d864..4b25506 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -36,8 +36,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.IF "$(OS)" == "IOS"
+
ALL:
- @echo Nothing done for $(OS)
+# nothing
+
.ENDIF
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
diff --git a/cpputools/source/regsingleton/makefile.mk b/cpputools/source/regsingleton/makefile.mk
index 9d8812c..96d629d 100644
--- a/cpputools/source/regsingleton/makefile.mk
+++ b/cpputools/source/regsingleton/makefile.mk
@@ -36,8 +36,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.IF "$(OS)" == "IOS"
+
ALL:
- @echo Nothing done for $(OS)
+# nothing
+
.ENDIF
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk
index 8c19c93..39aad37 100644
--- a/jvmaccess/source/makefile.mk
+++ b/jvmaccess/source/makefile.mk
@@ -34,8 +34,10 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
.IF "$(OS)" == "IOS"
+
ALL:
- @echo Nothing done for $(OS)
+# nothing
+
.ENDIF
SLOFILES = \
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 9553973..637efed 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -38,8 +38,10 @@ UNIXVERSIONNAMES = UDK
.INCLUDE: settings.mk
.IF "$(OS)" == "IOS"
+
ALL:
- @echo Nothing done for $(OS)
+# nothing
+
.ENDIF
.IF "$(UNIXVERSIONNAMES)" == ""
diff --git a/sax/test/makefile.mk b/sax/test/makefile.mk
index c2b2161..09f1758 100644
--- a/sax/test/makefile.mk
+++ b/sax/test/makefile.mk
@@ -40,8 +40,10 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+
ALL:
- @echo Nothing done for non-desktop OSes
+# nothing
+
.ENDIF
#
commit a1fe0a772f40c221f5d788192543352b302ac4e8
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 16 09:09:14 2012 +0200
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.
diff --git a/basebmp/Executable_basebmp_cppunittester_all.mk b/basebmp/Executable_basebmp_cppunittester_all.mk
deleted file mode 100644
index c2cd645..0000000
--- 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 at 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 b3da038..071bf32 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 3c09e85..0000000
--- 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 at 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 4c382b1..0974b93 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 7a2a5ae..0000000
--- 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 at 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 022e85f..3cd75e3 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 49c8b5d..0f68012 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; \
-}
-
- at interface salAppDelegate : NSObject <UIApplicationDelegate> {
-}
- at property (nonatomic, retain) UIWindow *window;
- at end
-
-static int sal_main(void);
-
- at implementation salAppDelegate
-
- at 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;
-}
-
- at 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 0ec10a8..0000000
--- 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 9276e98..c76d0c8 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 a46bfce..0000000
--- 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 at 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 afd3366..2feb922 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:
More information about the Libreoffice-commits
mailing list