[Libreoffice-commits] .: README.cross
README.cross |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a54e92737e3e2b642c1f8564d51d985c7433bd29 Author: Miklos Vajna vmik...@suse.cz Date: Tue Nov 20 09:20:40 2012 +0100 README.cross: typo Change-Id: I92a82a29fe217faaefe7e67228d59a9fb43526d5 diff --git a/README.cross b/README.cross index e706f1d..d117c97 100644 --- a/README.cross +++ b/README.cross @@ -373,7 +373,7 @@ And here is an autogen.lastrun for Android when cross-compiling to x86 from Linu There are a couple of (more or less) interactive apps that you can run on the emulator or on a device that use LibreOffice code. Look in android/experimental. DocumentLoader is just a testbench, really for -code to load a document (just Weiter ones so far) and display one page +code to load a document (just Writer ones so far) and display one page at a time. LibreOffice4Android is what resulted from a Google Summer of Code project in 2012, a document viewer. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 3dab6fba4a53c12da0fc886cca61b9a89a311a4e Author: Miklos Vajna vmik...@suse.cz Date: Fri Nov 16 11:11:07 2012 +0100 README.cross: update Android arm configure options Change-Id: Ibcd1890f4ac82ef0548e90842604748027811b5d diff --git a/README.cross b/README.cross index d72954d..e706f1d 100644 --- a/README.cross +++ b/README.cross @@ -351,14 +351,12 @@ OS X 10.8 with Xcode 4.4.1: And here is an autogen.lastrun for Android when cross-compiling from Linux: +--with-distro=LibreOfficeAndroid +--build=x86_64-unknown-linux-gnu --with-android-ndk=/home/tml/android-ndk-r8b --with-android-ndk-toolchain-version=4.6 ---with-android-sdk=/home/tml/android-sdk-linux_x86 ---with-ant-home=/opt/apache-ant-1.8.2 ---build=x86_64-unknown-linux-gnu ---disable-zenity ---disable-python ---with-distro=LibreOfficeAndroid +--with-android-sdk=/home/tml/android-sdk-linux +--with-java-target-version=1.5 And here is an autogen.lastrun for Android when cross-compiling to x86 from Linux: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) New commits: commit 64792f61a1c67d6cd447d3a0d44188339efdd467 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 20 12:01:10 2012 +0300 Don't fake --with-system-nss any more, autodetect build platform toolchain Change-Id: I5699577ff5a754da079ca3acefd6d9a545154d44 diff --git a/README.cross b/README.cross index 6b24da2..7bba730 100644 --- a/README.cross +++ b/README.cross @@ -288,25 +288,18 @@ CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xct CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS ---with-system-nss --without-help --without-helppack-integration --without-myspell-dicts -The --with-system-nss doesn't mean that any Mozilla NSS would be used, -it's just a trick to bypass some tests in the configure script. - -For the iOS simulator, using Xcode 4.3 and clang both for the host and +For the iOS simulator, using Xcode 4.4.1 and clang both for the host and build platform: CXX=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.1.sdk -mmacosx-version-min=10.6 CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.1.sdk -mmacosx-version-min=10.6 -CC_FOR_BUILD=ccache clang -arch i386 -mmacosx-version-min=10.6 -CXX_FOR_BUILD=ccache clang++ -arch i386 -mmacosx-version-min=10.6 --enable-werror ---with-build-platform-configure-options=--with-macosx-version-min-required=10.6 --with-macosx-sdk=10.6 +--with-build-platform-configure-options=--with-macosx-version-min-required=10.6 --with-distro=LibreOfficeiOS ---with-system-nss --without-help --without-helppack-integration --without-myspell-dicts ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) New commits: commit ab236e180c63a27c61d84ac9af738cf3cb930224 Author: Tor Lillqvist t...@iki.fi Date: Thu Aug 9 12:59:08 2012 +0300 Update sample autogen.lastrun for MacOSX - Android Change-Id: I5f62540c368540ecf4e1aaedf9829f930f1591fa diff --git a/README.cross b/README.cross index c946541..3856c29 100644 --- a/README.cross +++ b/README.cross @@ -339,18 +339,25 @@ particular) and Mac OS X. The Android cross-buld tool-chain (the X. Sure, for Windows, too, but trying to cross-compile LO from Windows will probably drive you insane. -Here is an autogen.lastrun for Android, when cross-compiling from Mac OS X: +Here is an autogen.lastrun for Android, when cross-compiling from Mac +OS X 10.8 with Xcode 4.4.1: -CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 -CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 ---with-android-ndk=/Users/tml/android-ndk-r7b ---with-android-sdk=/Users/tml/android-sdk-macosx +CC_FOR_BUILD=xcrun clang -arch i386 +CXX_FOR_BUILD=xcrun clang++ -arch i386 --build=x86_64-apple-darwin11 +--disable-python --disable-zenity +--enable-debug --enable-werror ---disable-python +--with-android-ndk=/Users/tml/android-ndk-r8b +--with-android-ndk-toolchain-version=4.6 +--with-android-sdk=/Users/tml/android-sdk-macosx +--with-build-platform-configure-options=--with-macosx-sdk=10.8 --with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8 --with-distro=LibreOfficeAndroid ---with-java +--with-external-tar=/Users/tml/lo/10.4/src +--without-doxygen +--without-helppack-integration +--without-myspell-dicts And here is an autogen.lastrun for Android when cross-compiling from Linux: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |1 - 1 file changed, 1 deletion(-) New commits: commit 97febaa3e2130b92a2eadfc20688b2a37b194f45 Author: Tor Lillqvist t...@iki.fi Date: Thu Aug 9 14:08:32 2012 +0300 Drop the --with-external-tar to avoid confusion Change-Id: I8861a007b94b24d2482658ca7d78e200bcf890ea diff --git a/README.cross b/README.cross index d23dba5..891b6a5 100644 --- a/README.cross +++ b/README.cross @@ -353,7 +353,6 @@ CXX_FOR_BUILD=xcrun clang++ -arch i386 --with-android-sdk=/Users/tml/android-sdk-macosx --with-build-platform-configure-options=--with-macosx-sdk=10.8 --with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8 --with-distro=LibreOfficeAndroid ---with-external-tar=/Users/tml/lo/10.4/src --without-doxygen --without-helppack-integration --without-myspell-dicts ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |1 + 1 file changed, 1 insertion(+) New commits: commit cce51e4fd334415d4ebcd13b6da46828970897f6 Author: Jan Holesovsky ke...@suse.cz Date: Tue Jun 26 11:38:13 2012 +0200 mingw32-python is now necessary too. Change-Id: I7b7bbc555b599e411859ca00ddd3988aa52f433f diff --git a/README.cross b/README.cross index e1074ca..ee0b0f7 100644 --- a/README.cross +++ b/README.cross @@ -78,6 +78,7 @@ where your_os is one of SLE_11, SLE_11_SP1, openSUSE_11.3, openSUSE_11.4 or openSUSE_Factory. zypper in mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-python-devel \ +mingw32-python \ mingw32-libexpat-devel mingw32-libexpat mingw32-boost-devel \ mingw32-libhyphen-devel mingw32-libhyphen mingw32-hyphen-en \ mingw32-liblpsolve mingw32-liblpsolve-devel \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |6 ++ 1 file changed, 6 insertions(+) New commits: commit 538b449ed5babe025df207cfdc6ca29d321dd67a Author: Jan Holesovsky ke...@suse.cz Date: Tue Jun 19 09:22:29 2012 +0200 Add a note about MinGW debugging TODO. Change-Id: I272c06f557c1667ecb15396be71bcd38e472ef73 diff --git a/README.cross b/README.cross index 9923521..e1074ca 100644 --- a/README.cross +++ b/README.cross @@ -206,6 +206,12 @@ Wine-dbgx /50u rLibName-pData+10 TODO: +- make the debugging more convenient on (native) Windows + - check possibilities like WinGDB - http://www.wingdb.com/ + - or find / write a MSVS / WinDBG extension that can read MinGW debugging +symbols natively; more info + http://windbg.info/forum/12-symbol-and-source-files-/21-debugging-mingwgcc-built-dll-in-visual-studio.html + - installation - so far the make_installer.pl calls makecab.exe, uuidgen.exe, and others; would be best to avoid that if at all possible (using a free ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) New commits: commit 7606616cdd78d14fac485af225a220651187910d Author: Tor Lillqvist tlillqv...@suse.com Date: Thu May 17 16:37:02 2012 +0300 Mention that the android/qa/sc test has not been maintained lately Change-Id: I78108f44bad1da0143f2849aa98a2ddf1b13fc1d diff --git a/README.cross b/README.cross index 63dc9cf..7dcb03c 100644 --- a/README.cross +++ b/README.cross @@ -386,12 +386,13 @@ them... The activity used for these apps is in android/Bootstrap. See README.Android. -To build the complex unit test (for Calc functionality; invokes the -ucalc unit test code from sc) setup your environment (make cmd cmd=bash) -and cd to android/qa/sc and run a make. The Makefile here is -completely manually written, this stuff is so experimental it doesn't -make sense yet to try to integrate with the normal gbuild -mechanism. +To build the complex unit test for Calc functionality which invokes the +ucalc unit test code from sc, cd to android/qa/sc and run a make. The +Makefile here is completely manually written, this stuff is so experimental it +doesn't make sense yet to try to integrate with the normal gbuild mechanism. + +Note that lately (as of May 2012) the android/qa/sc test has not been +maintained, and might not build cleanly. Then to run the unit test, do make install followed by make run. You most likely want to have an adb logcat running in another @@ -408,6 +409,9 @@ out what is going wrong. Pass something like -e lo-strace '-tt -f -e trace=file,process,network -o /system/sc/strace.out' to the am start command line. +The Android test app which has been exercised lately is in +android/experimental/DocumentLoader. + PowerPC Mac OS X ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |9 + 1 file changed, 9 insertions(+) New commits: commit e0c17f41a59ae395e4fca928350ec3eb6d9be723 Author: Jan Holesovsky ke...@suse.cz Date: Mon Mar 19 15:27:25 2012 +0100 How to examine strings in winedbg. diff --git a/README.cross b/README.cross index 818c335..3567a69 100644 --- a/README.cross +++ b/README.cross @@ -208,6 +208,15 @@ $ winedbg soffice.bin Would be great to be able to use winedbg --gdb, but it was crashing here :-( - but maybe you'll be more lucky. +Tricks of some use with winedbg: + + +To examine OUStrings, you might want to use the following trick (prints 50 +unicode characters of rLibName OUString - the +10 is where the buffer starts): + +Wine-dbgx /50u rLibName-pData+10 +0x0909b6c8: vnd.sun.star.expand:$LO_LIB_DIR/abplo.dll + TODO: - installation ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |9 - 1 file changed, 9 deletions(-) New commits: commit 345693a06b853a11d9b8bdb64016ddb894cc8371 Author: Tor Lillqvist t...@iki.fi Date: Mon Mar 5 10:08:15 2012 +0200 Don't bother mentioning irrelevant autogen options diff --git a/README.cross b/README.cross index c610eda..818c335 100644 --- a/README.cross +++ b/README.cross @@ -155,9 +155,6 @@ CXX_FOR_BUILD=ccache g++ --disable-nss-module --disable-zenity --enable-python=system ---with-external-tar=/mnt/hemulen/ooo/git/master/src ---with-num-cpus=1 ---with-max-jobs=1 --with-system-altlinuxhyph --with-system-boost --with-system-cairo @@ -277,7 +274,6 @@ CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xct CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS ---with-external-tar=/Volumes/ooo/git/master/src --with-system-nss --without-help --without-helppack-integration @@ -289,7 +285,6 @@ CC=ccache /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.p CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS ---with-external-tar=/Volumes/ooo/git/master/src --with-system-nss --enable-debug --without-help @@ -310,7 +305,6 @@ CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --enable-werror --with-distro=LibreOfficeiOS ---with-external-tar=/Users/tml/lo/10.4/src --with-system-nss --without-help --without-helppack-integration @@ -347,7 +341,6 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --disable-zenity --enable-werror --with-distro=LibreOfficeAndroid ---with-external-tar=/Volumes/ooo/git/master/src --disable-python --without-helppack-integration --without-myspell-dicts @@ -363,7 +356,6 @@ CXX_FOR_BUILD=ccache g++ --build=x86_64-unknown-linux-gnu --disable-zenity --with-distro=LibreOfficeAndroid ---with-external-tar=/mnt/hemulen/ooo/git/master/src --disable-python --with-num-cpus=1 --with-max-jobs=1 @@ -427,4 +419,3 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 --host=powerpc-apple-darwin10 --disable-mozilla --disable-build-mozilla ---with-external-tar=/Volumes/ooo/git/master/src ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit edf0a7e36754f485aa787769f3a82ac92f548f7f Author: Miklos Vajna vmik...@frugalware.org Date: Thu Jan 26 15:28:41 2012 +0100 README.cross: LibO-dev - LOdev in the mingw section diff --git a/README.cross b/README.cross index f3c62b2..153f4b9 100644 --- a/README.cross +++ b/README.cross @@ -186,8 +186,8 @@ CXX_FOR_BUILD=ccache g++ Once you have compiled it, you may want to try to run it: $ cd /tmp -$ tar xf your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US.tar.gz -$ cd LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev\ 3.5/program +$ tar xf your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US.tar.gz +$ cd LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US/LOdev\ 3.6/program $ wine soffice.exe NB. it is important to unpack somewhere low in the hierarchy structure (like @@ -196,13 +196,13 @@ in /tmp as advised above), otherwise you'll get BerkeleyDB errors on startup. And if you are brave enough, you can even debug it. First you have to add the URE dll's to the wine's PATH using 'wine regedit' - see http://www.winehq.org/docs/wineusr-guide/environment-variables, and add -Z:\tmp\LibO-Dev_OOO350m1_Win_x86_install-arc_en-US\LibO-dev 3.5\URE\bin +Z:\tmp\LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US\LOdev 3.6\URE\bin to Path in My Computer-HKEY_CURRENT_USER-Environment. Then run linkoo, so that when you rebuild something, you can directly see the changes the next time you run it: -solenv/bin/linkoo '/tmp/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev 3.5' your_clone_dir +solenv/bin/linkoo '/tmp/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US/LOdev 3.6' your_clone_dir And start debugging: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |1 + 1 file changed, 1 insertion(+) New commits: commit 4a4edda5fab3f01ae83e10d43e90f26ec0219530 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Jan 20 13:28:28 2012 +0200 Add --with-android-sdk to the sample autogen.lastrun diff --git a/README.cross b/README.cross index 31bcbf3..67fb1d4 100644 --- a/README.cross +++ b/README.cross @@ -327,6 +327,7 @@ Here is my autogen.lastrun for Android, when cross-compiling from Mac OS X: CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-android-ndk=/Users/tml/android-ndk-r7 +--with-android-sdk=/Users/tml/android-sdk-macosx --build=x86_64-apple-darwin11 --disable-zenity --enable-werror ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross | 42 +- 1 file changed, 29 insertions(+), 13 deletions(-) New commits: commit 3ef7293919e417c2fb2fce414fb64b1f5b4c244b Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Jan 3 13:48:29 2012 +0200 More Android notes diff --git a/README.cross b/README.cross index ebd08b7..709838b 100644 --- a/README.cross +++ b/README.cross @@ -367,11 +367,20 @@ CXX_FOR_BUILD=ccache g++ --without-helppack-integration --without-myspell-dicts -There is no app you could run yet that would use LibreOffice code, -but you can build some non-interactive unit tests and run them on the -emulator (or, presumably, on a device, although I haven't tested that -as I don't have any Android device...) The simple unit tests will -succeed, the complex one still fails. +There is no interactive end-user app you could run yet that would +use LibreOffice code, but you can build some non-interactive unit +tests and run them on the emulator (or, presumably, +on a device, although I haven't tested that as I don't have any +Android device...) The simple unit tests will succeed, the complex +one still fails. + +These unit tests *are* proper apps from Android'd point of view, but +they don't have any GUI and thus don't take part in the normal Android +message passing and Android thinks they are stuck and offers to kill +them... + +The activity used for these apps is in android/Bootstrap. See +README.Android. To build the complex unit test (for Calc functionality; invokes the ucalc unit test code from sc) source the environment (. Env.Host.sh) @@ -380,11 +389,11 @@ completely manually written, this stuff is so experimental it doesn't make sense yet to try to integrate with the normal gbuild mechanism. -Then to run it, make install followed by make run. You most likely -want to have an adb logcat running in another window, and you -probably also want to have set the stdout and stderr of app processes -to be redirected to logcat (adb shell stop; adb shell setprop -log.redirect-stdio true; adb shell start). +Then to run the unit test, do make install followed by make +run. You most likely want to have an adb logcat running in another +window, and you probably also want to have set the stdout and stderr +of app processes to be redirected to logcat (adb shell stop; adb +shell setprop log.redirect-stdio true; adb shell start). Unfortunately you might notice that the command line passed to adb shell am start is too long (actually, not command line as such, but @@ -392,9 +401,11 @@ the length of the so-called extra arguments passed to the action, or something like that, see Android bug http://code.google.com/p/android/issues/detail?id=23351 , so you need to shorten it somehow... for instance by creating a symlink to -/data/data/org.libreoffice.android.qa.sc in /system and using that -shorter path snippet in all places instead of the longer one on the -adb shell am start command line then... +/data/data/org.libreoffice.android.qa.sc in /system: adb remount; adb +shell ln -s /data/data/org.libreoffice.android.qa.sc /system/sc and +then use that shorter path /system/sc snippet in all places instead of +the longer /data/data/org.libreoffice.android.qa.sc on the adb shell +am start command line. To debug, do manually what make run would do, adding args -e lo-main-delay 20 to the command line, and when the app has started, @@ -402,6 +413,11 @@ run ndk-gdb. Unfortunately the gdb in NDK r7 is broken, use the one in the NDK build with newer versions of gcc and gdb from http://code.google.com/p/mingw-and-ndk/ instead. +Running strace on the unit test in progress is often useful to find +out what is going wrong. Pass something like -e lo-strace '-tt -f -e +trace=file,process,network -o /system/sc/strace.out' to the am start +command line. + PowerPC Mac OS X ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross solenv/gbuild solenv/inc
README.cross |4 ++-- solenv/gbuild/platform/android.mk |7 +-- solenv/inc/unxandr.mk | 15 ++- 3 files changed, 17 insertions(+), 9 deletions(-) New commits: commit 3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Nov 8 10:04:58 2011 +0200 Just put the Android ARM compiler options in the mk files diff --git a/README.cross b/README.cross index 7e8c184..6327ea8 100644 --- a/README.cross +++ b/README.cross @@ -318,8 +318,8 @@ Windows will probably drive you insane.) Here is my autogen.lastrun for Android: SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm -CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti +CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm +CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 03f85ec..ba51109 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -31,11 +31,14 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_CPUDEFS += -DARM32 gb_COMPILERDEFAULTOPTFLAGS := -Os -gb_CXXFLAGS += -fno-omit-frame-pointer -gb_CFLAGS += -fno-omit-frame-pointer include $(GBUILDDIR)/platform/unxgcc.mk +# See ndk/docs/STANDALONE-TOOLCHAIN.html +gb_LinkTarget_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer +gb_LinkTarget_CXXFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer +gb_LinkTarget_LDFLAGS += -Wl,--fix-cortex-a8 + # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk index 56ed49d..fdf9b6d 100644 --- a/solenv/inc/unxandr.mk +++ b/solenv/inc/unxandr.mk @@ -29,10 +29,18 @@ CDEFAULTOPT=-Os .INCLUDE : unxgcc.mk + +# Amend some macros set by unxgcc.mk + CDEFS+=-DARM32 -CFLAGS+=-fno-omit-frame-pointer +CFLAGS+=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer + +LINKFLAGS+=-Wl,--fix-cortex-a8 -# Override some macros set by unxgcc.mk +STDLIBGUIMT+=-llog -landroid +STDLIBCUIMT+=-llog -landroid + +# Completely override some others # We don't build any tool style programs for non-desktop OSes like # Android. Just unit tests and GUI programs. (Well, that is in @@ -45,6 +53,3 @@ CFLAGS+=-fno-omit-frame-pointer LINKFLAGSAPPGUI=-shared LINKFLAGSAPPCUI=-shared -STDLIBGUIMT+=-llog -landroid -STDLIBCUIMT+=-llog -landroid - ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) New commits: commit 06fa2d5a4a9b68a173a09df6000756dce47f7b3d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Oct 20 13:27:08 2011 +0200 Make the README.cross a bit more copypaste proof diff --git a/README.cross b/README.cross index e92e82a..6aec90b 100644 --- a/README.cross +++ b/README.cross @@ -88,20 +88,24 @@ Build Service, running on openSUSE: http://download.opensuse.org/repositories/windows:/mingw:/win32/ -For example, you can install it on SLE 11 SP1 like this: +For example, you can install it like this: + +zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/your_os/windows:mingw:win32.repo + +where your_os is one of SLE_11, SLE_11_SP1, openSUSE_11.3, openSUSE_11.4 or +openSUSE_Factory. -zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/windows:mingw:win32.repo zypper in mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-python-devel \ mingw32-libexpat-devel mingw32-libexpat mingw32-boost-devel \ mingw32-libhyphen-devel mingw32-libhyphen mingw32-hyphen-en \ mingw32-liblpsolve mingw32-liblpsolve-devel \ mingw32-libxml2-devel mingw32-libxslt-devel mingw32-libicu \ mingw32-libicu-devel mingw32-libgraphite2 mingw32-libgraphite2-devel \ -mingw32-cairo mingw32-cairo-devel mingw32-librsvg mingw32-librsvg-devel \ +mingw32-libcairo2 mingw32-cairo-devel mingw32-librsvg mingw32-librsvg-devel \ mingw32-hunspell mingw32-hunspell-devel mingw32-libcurl \ mingw32-libcurl-devel mingw32-libneon mingw32-libneon-devel \ -mingw32-libopenssl mingw32-libopenssl-devel mingw32-libtextcat \ -mingw32-libtextcat-devel mingw32-libdb mingw32-libdb-devel \ +mingw32-libopenssl mingw32-libopenssl-devel mingw32-libexttextcat \ +mingw32-libexttextcat-devel mingw32-libdb mingw32-libdb-devel \ mingw32-cross-pkg-config mingw32-pkg-config mingw32-libcppunit \ mingw32-libcppunit-devel mingw32-libredland mingw32-libredland-devel \ mingw32-libmythes mingw32-libmythes-devel ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |2 ++ 1 file changed, 2 insertions(+) New commits: commit c2ccc32df9787c4c32eb37fae4d639b82af80037 Author: Jan Holesovsky ke...@suse.cz Date: Tue Oct 18 14:34:15 2011 +0200 Add --disable-nss-module to the README.cross. diff --git a/README.cross b/README.cross index 7040685..04d208b 100644 --- a/README.cross +++ b/README.cross @@ -141,6 +141,7 @@ CXX_FOR_BUILD=ccache g++ --disable-ext-wiki-publisher --disable-ext-wiki-publisher --disable-mozilla +--disable-nss-module --disable-zenity --enable-python=system --with-external-tar=/mnt/hemulen/ooo/git/master/src @@ -186,6 +187,7 @@ CXX_FOR_BUILD=ccache g++ --disable-binfilter --disable-build-mozilla --disable-mozilla +--disable-nss-module --with-system-altlinuxhyph --with-system-boost --with-system-cairo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |1 - 1 file changed, 1 deletion(-) New commits: commit abe151e5dcb60d27552275d89f9e3f7e42821c65 Author: Jan Holesovsky ke...@suse.cz Date: Tue Oct 4 14:17:56 2011 +0200 No need to copy the .dlls to the installation any more. diff --git a/README.cross b/README.cross index 9f7b6e1..7040685 100644 --- a/README.cross +++ b/README.cross @@ -215,7 +215,6 @@ Once you have compiled it, you may want to try to run it: $ cd /tmp $ tar xf your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US.tar.gz $ cd LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev\ 3.5/program -$ cp /usr/i686-w64-mingw32/sys-root/mingw/bin/* ./ $ wine soffice.exe NB. it is important to unpack somewhere low in the hierarchy structure (like ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |1 - 1 file changed, 1 deletion(-) New commits: commit d717c18c5b62583ba4fc770ff51ceebd9f21be83 Author: Jan Holesovsky ke...@suse.cz Date: Thu Sep 29 18:02:06 2011 +0200 Don't recommend --enable-symbols, it makes it huge. diff --git a/README.cross b/README.cross index 1aaf88c..9f7b6e1 100644 --- a/README.cross +++ b/README.cross @@ -209,7 +209,6 @@ CXX_FOR_BUILD=ccache g++ --disable-directx --disable-activex --disable-extension-integration ---enable-symbols Once you have compiled it, you may want to try to run it: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
