configure.in | 4 +- io/prj/d.lst | 1 io/source/acceptor/makefile.mk | 4 ++ io/source/connector/makefile.mk | 4 ++ ios/qa/sc/filters-test.m | 2 + sal/osl/unx/process_impl.cxx | 6 --- solenv/lldb/libreoffice/LO.py | 71 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 85 insertions(+), 7 deletions(-)
New commits: commit d37b4908efae30432df98bd25f4870c7e8758033 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Mar 13 02:39:43 2012 +0200 Setenv SAL_LOG to yes for maximum logging for now diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index 19be41e..8805ed3 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -74,6 +74,8 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions setenv("SRC_ROOT", app_root, 1); setenv("OUTDIR_FOR_BUILD", app_root, 1); + setenv("SAL_LOG", "yes", 1); + CppUnitTestPlugIn *iface = cppunitTestPlugIn(); iface->initialize(&CppUnit::TestFactoryRegistry::getRegistry(), CppUnit::PlugInParameters()); commit 9a188e78b24edbca4315fc81fa1d345c14e6a57c Author: Tor Lillqvist <t...@iki.fi> Date: Tue Mar 13 02:37:31 2012 +0200 Don't usse -D_FILE_OFFSET_BITS=no diff --git a/configure.in b/configure.in index 33109ca..e4ca6a4 100644 --- a/configure.in +++ b/configure.in @@ -4052,10 +4052,10 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then dnl Check for large file support AC_SYS_LARGEFILE - if test -n "$ac_cv_sys_file_offset_bits"; then + if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" fi - if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then + if test -n "$ac_cv_sys_large_files" -a "$ac_cv_sys_large_files" != "no"; then LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES" fi else commit 2b2804b9560a436c764143dbc6b2fe451d16a131 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 12 11:03:02 2012 +0200 Use _NSGetExecutablePath also on iOS diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 168b9be..94128a2 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -77,7 +77,7 @@ extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( ) SAL_THROW_EXTERN_C(); -#if defined(MACOSX) +#if defined(MACOSX) || defined(IOS) #include <mach-o/dyld.h> oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( @@ -89,11 +89,7 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( char buffer[PATH_MAX]; size_t buflen = sizeof(buffer); -#if defined(__GNUC__) && defined(MACOSX) if (_NSGetExecutablePath (buffer, (uint32_t*)&buflen) == 0) -#else - if (_NSGetExecutablePath (buffer, &buflen) == 0) -#endif { /* Determine absolute path. */ char abspath[PATH_MAX]; commit bbe99e9c7b28b9e68e0fda5f853542cd9b07f659 Author: Tor Lillqvist <t...@iki.fi> Date: Sat Mar 10 16:21:45 2012 +0200 No inter-process UNO on iOS diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk index 2473aad..40d6c02 100644 --- a/io/source/acceptor/makefile.mk +++ b/io/source/acceptor/makefile.mk @@ -39,6 +39,8 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb DLLPRE = # ------------------------------------------------------------------ +.IF "$(OS)" != "IOS" + UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb UNOUCROUT=$(OUT)$/inc$/acceptor @@ -69,6 +71,8 @@ DEF1NAME= $(SHL1TARGET) # --- Targets ------------------------------------------------------ .ENDIF # L10N_framework +.ENDIF + .INCLUDE : target.mk ALLTAR : $(MISC)/acceptor.component diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk index c254e36..a484430 100644 --- a/io/source/connector/makefile.mk +++ b/io/source/connector/makefile.mk @@ -39,6 +39,8 @@ COMPRDB=$(SOLARBINDIR)$/udkapi.rdb DLLPRE = # ------------------------------------------------------------------ +.IF "$(OS)" != "IOS" + UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb UNOUCROUT=$(OUT)$/inc$/connector @@ -69,6 +71,8 @@ DEF1NAME= $(SHL1TARGET) # --- Targets ------------------------------------------------------ .ENDIF # L10N_framework +.ENDIF + .INCLUDE : target.mk ALLTAR : $(MISC)/connector.component commit 53baab726138aa221103cc5924a6c0316ae04c26 Author: Tor Lillqvist <t...@iki.fi> Date: Sat Mar 10 16:12:33 2012 +0200 Deliver the static libraries built for iOS diff --git a/io/prj/d.lst b/io/prj/d.lst index 40eb9ab..963dfa2 100644 --- a/io/prj/d.lst +++ b/io/prj/d.lst @@ -5,6 +5,7 @@ ..\source\stm\stm.xml %_DEST%\xml\streams.uno.xml ..\%__SRC%\lib\*.so %_DEST%\lib\* ..\%__SRC%\lib\*.dylib %_DEST%\lib\* +..\%__SRC%\lib\*.a %_DEST%\lib\* ..\%__SRC%\misc\acceptor.component %_DEST%\xml\acceptor.component ..\%__SRC%\misc\connector.component %_DEST%\xml\connector.component ..\%__SRC%\misc\streams.component %_DEST%\xml\streams.component commit bfabdcdca12eb240e772d2e33d71016283104628 Author: Tor Lillqvist <t...@iki.fi> Date: Sat Mar 10 00:57:53 2012 +0200 Initial version of pretty-printer for lldb diff --git a/solenv/lldb/libreoffice/LO.py b/solenv/lldb/libreoffice/LO.py new file mode 100644 index 0000000..8f7c247 --- /dev/null +++ b/solenv/lldb/libreoffice/LO.py @@ -0,0 +1,71 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Tor Lillqvist <t...@iki.fi> (initial developer) +# Copyright (C) 2012 SUSE Linux http://suse.com (initial developer's employer) +# +# All Rights Reserved. +# +# 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. + +# To use, add something like this to your ~/.lldbinit: + +# script sys.path[:0] = [os.path.expanduser('~/lo/ios/solenv/lldb/libreoffice')] +# script import LO +# type summary add --python-function LO.rtluString_summary rtl_uString +# type summary add --python-function LO.rtl_OUString_summary rtl::OUString + +import lldb + +def rtluString_summary(rtlustring, dict): + e = lldb.SBError() + + length = rtlustring.GetChildMemberWithName('length').GetValueAsUnsigned(0) + buffer = rtlustring.GetChildMemberWithName('buffer') + + s = '"' + i = 0 + while i < length: + c = buffer.GetPointeeData(i, 1).GetUnsignedInt16(e, 0) + if c == ord('"'): + s = s + '\\"' + elif c == ord('\\'): + s = s + '\\\\' + elif c == ord('\n'): + s = s + '\\n' + elif c == ord('\r'): + s = s + '\\r' + elif c == ord('\t'): + s = s + '\\t' + elif c < ord(' '): + s = s + '\\{:03o}'.format(c) + elif c < 127: + s = s + chr(c) + else: + s = s + '\\u{:04x}'.format(c) + i = i + 1 + s = s + '"' + + return s + +def rtl_OUString_summary(rtloustring, dict): + return rtluString_summary(rtloustring.GetChildMemberWithName('pData'), dict) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits