[Libreoffice-commits] .: 15 commits - basctl/Module_basctl.mk basic/Module_basic.mk configure.in desktop/Library_sofficeapp.mk desktop/Module_desktop.mk idl/Module_idl.mk neon/prj officecfg/Module_officecfg.mk RepositoryFixes.mk Repository.mk sal/osl sc/Module_sc.mk scripting/Module_scripting.mk sw/Module_sw.mk unotest/prj vbahelper/Module_vbahelper.mk vcl/inc vcl/ios vcl/Library_vcl.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jan 27 12:47:33 PST 2012
Repository.mk | 12 ++++++++++++
RepositoryFixes.mk | 7 +++++++
basctl/Module_basctl.mk | 4 ++++
basic/Module_basic.mk | 9 ++++++++-
configure.in | 6 ++++++
desktop/Library_sofficeapp.mk | 6 ++++++
desktop/Module_desktop.mk | 2 +-
idl/Module_idl.mk | 4 ++++
neon/prj/d.lst | 1 -
officecfg/Module_officecfg.mk | 3 +++
sal/osl/unx/module.c | 1 +
sc/Module_sc.mk | 9 ++++++++-
scripting/Module_scripting.mk | 4 ++++
sw/Module_sw.mk | 9 ++++++++-
unotest/prj/d.lst | 1 +
vbahelper/Module_vbahelper.mk | 9 ++++++++-
vcl/Library_vcl.mk | 7 ++++++-
vcl/inc/ios/salframe.h | 6 +++---
vcl/inc/ios/salgdi.h | 2 +-
vcl/inc/ios/salinst.h | 2 +-
vcl/inc/ios/salprn.h | 2 +-
vcl/inc/ios/salsys.h | 4 ++--
vcl/ios/source/app/salinst.cxx | 14 +++++++-------
vcl/ios/source/app/salsys.cxx | 4 ++--
vcl/ios/source/gdi/salgdi.cxx | 2 +-
vcl/ios/source/window/salframe.cxx | 6 +++---
26 files changed, 108 insertions(+), 28 deletions(-)
New commits:
commit 87842e4aa43ed66edfc400053ffac751f2e56bf7
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 22:40:53 2012 +0200
Skip Executable_soffice.bin for non-desktop OSes, hmm
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 2765cc9..705a282 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
AllLangResTarget_deployment \
AllLangResTarget_deploymentgui \
AllLangResTarget_dkt \
- Executable_soffice.bin \
Library_deployment \
Library_deploymentmisc \
Library_offacc \
@@ -54,6 +53,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
+ Executable_soffice.bin \
Executable_unopkg.bin \
Library_deploymentgui \
Library_migrationoo2 \
commit 659894f19a7e926415393958cb8b880dc20edfed
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 22:39:30 2012 +0200
Thanks to sal/main.h need to compile main.c as Objective-C for iOS
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 759f40f..ae078a7 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -68,6 +68,12 @@ $(eval $(call gb_Library_add_linked_libs,sofficeapp,\
$(gb_STDLIBS) \
))
+ifeq ($(GUIBASE),cocoatouch)
+$(eval $(call gb_Library_add_cflags,sofficeapp,\
+ $(gb_OBJCFLAGS) \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/app/app \
desktop/source/app/appfirststart \
commit a261b5e664a7cf88ac2f3fe21e2bfd0c292ee431
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 22:37:33 2012 +0200
Skip Library_vbaswobj for iOS
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index e750e86..7f48bc3 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -34,12 +34,19 @@ $(eval $(call gb_Module_add_targets,sw,\
Library_sw \
Library_swd \
Library_swui \
- Library_vbaswobj \
Package_misc \
Package_uiconfig \
Package_xml \
))
+ifneq (IOS,$(OS))
+
+$(eval $(call gb_Module_add_targets,sw,\
+ Library_vbaswobj \
+))
+
+endif
+
$(eval $(call gb_Module_add_check_targets,sw,\
CppunitTest_sw_filters_test \
CppunitTest_sw_macros_test \
commit ed639fbb39007684c7d47d379871f2367ec18416
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 22:36:31 2012 +0200
No thanks for non-desktop OSes
diff --git a/idl/Module_idl.mk b/idl/Module_idl.mk
index e96ac00..d6a2297 100644
--- a/idl/Module_idl.mk
+++ b/idl/Module_idl.mk
@@ -29,8 +29,12 @@
$(eval $(call gb_Module_Module,idl))
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
$(eval $(call gb_Module_add_targets,idl,\
Executable_svidl \
))
+endif
+
# vim: set noet sw=4 ts=4:
commit a925b72db35cd55a20c76e1207c2749c2281cad4
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 22:33:57 2012 +0200
Do deliver headers also for iOS even if we don't build the libs
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index a04f9f3..7e749d0 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -33,7 +33,6 @@ ifneq (IOS,$(OS))
$(eval $(call gb_Module_add_targets,basic,\
AllLangResTarget_sb \
Library_sb \
- Package_inc \
))
$(eval $(call gb_Module_add_check_targets,basic,\
@@ -42,4 +41,8 @@ $(eval $(call gb_Module_add_check_targets,basic,\
endif
+$(eval $(call gb_Module_add_targets,basic,\
+ Package_inc \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk
index fcf046e..28f710f 100644
--- a/vbahelper/Module_vbahelper.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -34,7 +34,6 @@ ifneq (IOS,$(OS))
$(eval $(call gb_Module_add_targets,vbahelper,\
Library_vbahelper \
Library_msforms \
- Package_inc \
))
# add any runtime tests (unit tests) here
@@ -48,4 +47,8 @@ $(eval $(call gb_Module_add_targets,vbahelper,\
endif
+$(eval $(call gb_Module_add_targets,vbahelper,\
+ Package_inc \
+))
+
# vim: set noet sw=4 ts=4:
commit 5cf4a008eff7e3acfa49838e81b45884d97b2733
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 22:30:27 2012 +0200
For iOS, filter out the sb and vbahelper libs that we don't build
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 70ff3a7..336c312 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -127,4 +127,11 @@ endif # ifeq ($(COM),GCC)
endif # ifeq ($(OS),WNT)
+ifeq ($(OS),IOS)
+
+gb_Library_FILENAMES := $(patsubst sb:libsb%,,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES))
+
+endif
+
# vim: set noet sw=4 ts=4:
commit 98ed7409fc1f97a92365b8d78050caa9ea0cb118
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 22:23:20 2012 +0200
Deliver the static libneon built for iOS
Actually libneon probably can't be used in an app distributed through
the App Store thanks to its LGPL licensing, so eventually we either
need a replacement, like AOO, or need to bypass code that uses neon
for iOS. But for now let's keep building it...
diff --git a/neon/prj/d.lst b/neon/prj/d.lst
index 0914f57..437c56e 100644
--- a/neon/prj/d.lst
+++ b/neon/prj/d.lst
@@ -5,4 +5,5 @@ mkdir: %_DEST%\inc\external\neon
..\%__SRC%\lib\ineon.lib %_DEST%\lib\ineon.lib
..\%__SRC%\bin\neon*.dll %_DEST%\bin\neon*.dll
..\%__SRC%\lib\libneon*.so %_DEST%\lib\libneon*.so
-..\%__SRC%\lib\libneon*.dylib %_DEST%\lib\libneon*.dylib
\ No newline at end of file
+..\%__SRC%\lib\libneon*.dylib %_DEST%\lib\libneon*.dylib
+..\%__SRC%\lib\libneon*.a %_DEST%\lib\libneon*.a
commit fa580e345c7deaf22a4552502182088fc9a9bbbb
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 27 11:38:37 2012 +0200
WaE: Unused parameter
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 2889a77..bddf390 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -178,6 +178,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR
return ((oslModule)(pLib));
#else /* NO_DL_FUNCTIONS */
+ (void) nRtldMode;
printf("No DL Functions\n");
#endif /* NO_DL_FUNCTIONS */
}
commit bcc6126098013832c35f6ba8487028051ba5a2d6
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jan 24 16:00:31 2012 +0200
Deliver the static libunotest.a built for iOS
diff --git a/unotest/prj/d.lst b/unotest/prj/d.lst
index c333491..5bf1589 100644
--- a/unotest/prj/d.lst
+++ b/unotest/prj/d.lst
@@ -6,6 +6,7 @@ mkdir: %_DEST%\inc\unotest\detail
..\%__SRC%\lib\libunotest.dylib %_DEST%\lib\libunotest.dylib
..\%__SRC%\lib\libunotest.so %_DEST%\lib\libunotest.so
..\%__SRC%\lib\libunotest.dll.a %_DEST%\lib\libunotest.dll.a
+..\%__SRC%\lib\libunotest.a %_DEST%\lib\libunotest.a
..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib
..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so
..\%__SRC%\lib\libunoexceptionprotector.so %_DEST%\lib\libunoexceptionprotector.so
commit d088fd397f7c61a517255fac1fc470b28e4e5798
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jan 24 14:59:03 2012 +0200
Fix bit-rot in the iOS "code"
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fa6093e..424197a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -74,12 +74,17 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
i18nisolang1 \
i18npaper \
i18nutil \
- jvmaccess \
cppu \
sal \
$(gb_STDLIBS) \
))
+ifneq ($(OS),IOS)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+ jvmaccess \
+))
+endif
+
$(eval $(call gb_Library_use_externals,vcl,\
icule \
icuuc \
diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h
index c6dc691..7b779e0 100644
--- a/vcl/inc/ios/salframe.h
+++ b/vcl/inc/ios/salframe.h
@@ -112,7 +112,7 @@ public:
virtual SalGraphics* GetGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual sal_Bool PostEvent( void* pData );
- virtual void SetTitle( const XubString& rTitle );
+ virtual void SetTitle( const rtl::OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
virtual void SetRepresentedURL( const rtl::OUString& );
virtual void SetMenu( SalMenu* pSalMenu );
@@ -139,8 +139,8 @@ public:
virtual void Sync();
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
- virtual String GetKeyName( sal_uInt16 nKeyCode );
- virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
+ virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
+ virtual rtl::OUString GetSymbolKeyName( const rtl::OUString& rFontName, sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual SalBitmap* SnapShot();
diff --git a/vcl/inc/ios/salgdi.h b/vcl/inc/ios/salgdi.h
index 5874675..5773f3e 100644
--- a/vcl/inc/ios/salgdi.h
+++ b/vcl/inc/ios/salgdi.h
@@ -284,7 +284,7 @@ public:
// graphics should call ImplAddDevFontSubstitute on supplied
// OutputDevice for all its device specific preferred font substitutions
virtual void GetDevFontSubstList( OutputDevice* );
- virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
+ virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
// returns TRUE if creation of subset was successfull
diff --git a/vcl/inc/ios/salinst.h b/vcl/inc/ios/salinst.h
index 9983804..aa465f0 100644
--- a/vcl/inc/ios/salinst.h
+++ b/vcl/inc/ios/salinst.h
@@ -128,7 +128,7 @@ public:
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList );
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
- virtual String GetDefaultPrinter();
+ virtual rtl::OUString GetDefaultPrinter();
virtual SalTimer* CreateSalTimer();
virtual SalI18NImeStatus* CreateI18NImeStatus();
virtual SalSystem* CreateSalSystem();
diff --git a/vcl/inc/ios/salprn.h b/vcl/inc/ios/salprn.h
index cd90a0f..869c2c3 100644
--- a/vcl/inc/ios/salprn.h
+++ b/vcl/inc/ios/salprn.h
@@ -90,7 +90,7 @@ class IosSalInfoPrinter : public SalInfoPrinter
long& o_rPageWidth, long& o_rPageHeight );
virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType );
virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData );
- virtual String GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
+ virtual rtl::OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData );
virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
diff --git a/vcl/inc/ios/salsys.h b/vcl/inc/ios/salsys.h
index 48ccfab..2184d2b 100644
--- a/vcl/inc/ios/salsys.h
+++ b/vcl/inc/ios/salsys.h
@@ -43,8 +43,8 @@ public:
virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
- virtual int ShowNativeMessageBox( const String& rTitle,
- const String& rMessage,
+ virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
+ const rtl::OUString& rMessage,
int nButtonCombination,
int nDefaultButton);
};
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index 76bec37..b47c168 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -140,13 +140,13 @@ sal_Bool ImplSVMainHook( int * pnInit )
// =======================================================================
-void SalAbort( const XubString& rErrorText, bool bDumpCore )
+void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
{
- if( !rErrorText.Len() )
+ if( rErrorText.isEmpty() )
fprintf( stderr, "Application Error " );
else
fprintf( stderr, "%s ",
- ByteString( rErrorText, osl_getThreadTextEncoding() ).GetBuffer() );
+ rtl::OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() );
if( bDumpCore )
abort();
else
@@ -197,7 +197,7 @@ void InitSalMain()
if ( aCmdPath.Len() ) {
DirEntry aCmdDirEntry( aCmdPath );
aCmdDirEntry.ToAbs();
- aCmdPath = ByteString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
+ aCmdPath = rtl::OUStringToOString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
}
// Assign to PATH environment variable
if ( aCmdPath.Len() )
@@ -205,7 +205,7 @@ void InitSalMain()
aTmpPath = ByteString( "PATH=" );
aTmpPath += aCmdPath;
if ( aPath.Len() )
- aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+ aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aPath;
putenv( (char*)aTmpPath.GetBuffer() );
}
@@ -215,7 +215,7 @@ void InitSalMain()
aTmpPath = ByteString( "STAR_RESOURCEPATH=" );
aTmpPath += aCmdPath;
if ( aResPath.Len() )
- aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+ aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aResPath;
putenv( (char*)aTmpPath.GetBuffer() );
}
@@ -624,7 +624,7 @@ void IosSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
// -----------------------------------------------------------------------
-XubString IosSalInstance::GetDefaultPrinter()
+rtl::OUString IosSalInstance::GetDefaultPrinter()
{
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index 3a517ba..02cd644 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -147,8 +147,8 @@ static NSString* getStandardString( int nButtonId )
}
@end
-int IosSalSystem::ShowNativeMessageBox( const String& rTitle,
- const String& rMessage,
+int IosSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle,
+ const rtl::OUString& rMessage,
int nButtonCombination,
int nDefaultButton)
{
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx
index f6ffbaa..7f9e5b4 100644
--- a/vcl/ios/source/gdi/salgdi.cxx
+++ b/vcl/ios/source/gdi/salgdi.cxx
@@ -1511,7 +1511,7 @@ void IosSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
// -----------------------------------------------------------------------
bool IosSalGraphics::AddTempDevFont( ImplDevFontList*,
- const String& rFontFileURL, const String& /*rFontName*/ )
+ const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ )
{
::rtl::OUString aUSytemPath;
OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx
index b1464a6..baed581 100644
--- a/vcl/ios/source/window/salframe.cxx
+++ b/vcl/ios/source/window/salframe.cxx
@@ -240,7 +240,7 @@ sal_Bool IosSalFrame::PostEvent( void *pData )
}
// -----------------------------------------------------------------------
-void IosSalFrame::SetTitle(const XubString& /* rTitle */)
+void IosSalFrame::SetTitle(const rtl::OUString& /* rTitle */)
{
}
@@ -617,7 +617,7 @@ void IosSalFrame::EndExtTextInput( sal_uInt16 )
// -----------------------------------------------------------------------
-XubString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
+rtl::OUString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
static std::map< sal_uInt16, rtl::OUString > aKeyMap;
if( aKeyMap.empty() )
@@ -704,7 +704,7 @@ XubString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
// -----------------------------------------------------------------------
-XubString IosSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode )
+rtl::OUString IosSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode )
{
return GetKeyName( nKeyCode );
}
commit adb9a3e60ede9105187e9dee73446d3d44b529ec
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jan 24 12:30:12 2012 +0200
CppunitTests go in gb_Module_add_check_targets
diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk
index 22b8158..7621ecd 100644
--- a/officecfg/Module_officecfg.mk
+++ b/officecfg/Module_officecfg.mk
@@ -24,6 +24,9 @@ $(eval $(call gb_Module_add_targets,officecfg,\
Package_misc \
Package_tools \
Configuration_officecfg \
+))
+
+$(eval $(call gb_Module_add_check_targets,officecfg,\
CppunitTest_officecfg_cppheader_test \
))
commit 8f819c743b8a275939a7efff4edcb4670a4ebd05
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jan 24 12:18:58 2012 +0200
Bypass libwp? for iOS
diff --git a/configure.in b/configure.in
index 9a348e3..6ab110d 100644
--- a/configure.in
+++ b/configure.in
@@ -5484,6 +5484,8 @@ if test "$with_system_libwpd" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPD=YES
PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 )
+elif test $_os = IOS; then
+ AC_MSG_RESULT([none])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPD=NO
@@ -5535,6 +5537,8 @@ if test "$with_system_libwps" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPS=YES
PKG_CHECK_MODULES( WPS, libwps-0.2 )
+elif test $_os = IOS; then
+ AC_MSG_RESULT([none])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPS=NO
@@ -5552,6 +5556,8 @@ if test "$with_system_libwpg" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPG=YES
PKG_CHECK_MODULES( WPG, libwpg-0.2 )
+elif test $_os = IOS; then
+ AC_MSG_RESULT([none])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPG=NO
commit 06eba7d7515aeb7cf78fd6dff021f6b16d9ec5a9
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 20 17:57:46 2012 +0200
One more
diff --git a/Repository.mk b/Repository.mk
index 3cf90fe..1dd70fe 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
basebmp_cppunittester_all \
i18npool_cppunittester_all \
sax_cppunittester_all \
+ tools_cppunittester_all \
))
endif
commit 81cf9f5099ca159d703ecc9ed8882bd3d3d1b1e6
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 20 17:20:11 2012 +0200
Bypass building BASIC and scripting related modules for iOS
Any LO-based app distributed through the App Store can't have
scripting or extendability anyway.
Sure, this will break the build elsewhere because of missing headers.
No big deal, I will take care of that eventually. It isn't as if there
would anybody else building for iOS anyway, as far as I know. If there
is, please make yourself heard.
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 7ff2a7e..22bf325 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -28,10 +28,14 @@
$(eval $(call gb_Module_Module,basctl))
+ifneq (IOS,$(OS))
+
$(eval $(call gb_Module_add_targets,basctl,\
AllLangResTarget_basctl \
Library_basctl \
Package_xml \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index 0fafc6c..a04f9f3 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -28,6 +28,8 @@
$(eval $(call gb_Module_Module,basic))
+ifneq (IOS,$(OS))
+
$(eval $(call gb_Module_add_targets,basic,\
AllLangResTarget_sb \
Library_sb \
@@ -38,4 +40,6 @@ $(eval $(call gb_Module_add_check_targets,basic,\
CppunitTest_basic_scanner \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index d7d28ef..112fa40 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -29,11 +29,18 @@ $(eval $(call gb_Module_add_targets,sc,\
Library_scd \
Library_scfilt \
Library_scui \
- Library_vbaobj \
Package_uiconfig \
Package_xml \
))
+ifneq (IOS,$(OS))
+
+$(eval $(call gb_Module_add_targets,sc,\
+ Library_vbaobj \
+))
+
+endif
+
$(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_ucalc \
CppunitTest_sc_filters_test \
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 252a1df..3b61667 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -28,6 +28,8 @@
$(eval $(call gb_Module_Module,scripting))
+ifneq (IOS,$(OS))
+
$(eval $(call gb_Module_add_targets,scripting,\
$(if $(SOLAR_JAVA),\
Jar_HelloWorld \
@@ -56,4 +58,6 @@ $(eval $(call gb_Module_add_targets,scripting,\
Zip_ScriptsPython \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk
index d272fb1..fcf046e 100644
--- a/vbahelper/Module_vbahelper.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -28,6 +28,8 @@
$(eval $(call gb_Module_Module,vbahelper))
+ifneq (IOS,$(OS))
+
# the targets to be inserted are their file names without .mk extension
$(eval $(call gb_Module_add_targets,vbahelper,\
Library_vbahelper \
@@ -44,4 +46,6 @@ $(eval $(call gb_Module_add_targets,vbahelper,\
#$(eval $(call gb_Module_add_subsequentcheck_targets,vbahelper,\
#))
+endif
+
# vim: set noet sw=4 ts=4:
commit 4178cb981a373354c0fce853b6f15a71d93a89ae
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jan 20 16:43:43 2012 +0200
Add the "all" cppunittesters for iOS
Not that I recall exactly what that each one of these unit tests do
any more, and how interesting they are. But they need to be mentioned
here.
diff --git a/Repository.mk b/Repository.mk
index ffa6167..3cf90fe 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -102,6 +102,17 @@ endif
endif
+ifeq ($(OS),IOS)
+
+$(eval $(call gb_Helper_register_executables,OOO,\
+ basegfx_cppunittester_all \
+ basebmp_cppunittester_all \
+ i18npool_cppunittester_all \
+ sax_cppunittester_all \
+))
+
+endif
+
ifeq ($(WITH_MOZILLA),YES)
$(eval $(call gb_Helper_register_executables,OOO,\
pluginapp.bin \
More information about the Libreoffice-commits
mailing list