[Libreoffice-commits] .: 2 commits - README.cross

[Tor Lillqvist]

 README.cross |   43 +--
 1 file changed, 21 insertions(+), 22 deletions(-)

New commits:
commit b00bd214c4ddf4a3d8ad9f0a43ce362388adb090
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jan 17 19:06:48 2012 +0200

Correct my email

diff --git a/README.cross b/README.cross
index 86d6566..d5ad353 100644
--- a/README.cross
+++ b/README.cross
@@ -431,4 +431,4 @@ That's all, thank you, and have a nice day. People with 
commit access,
 feel free to edit this document, and add yourself below. Sorry for
 writing now initially from such a personal point of view.
 
---Tor Lillqvist tlillqv...@novell.com, t...@iki.fi
+--Tor Lillqvist tlillqv...@suse.com, t...@iki.fi
commit ee4fc40f63db751fe4d20419ea0f5bc7557e2414
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jan 17 19:06:26 2012 +0200

Make it sound slightly less experimental and scary

diff --git a/README.cross b/README.cross
index 45e1888..86d6566 100644
--- a/README.cross
+++ b/README.cross
@@ -14,7 +14,7 @@ github. I am not interested in that.
 Cross-compilation of LibreOffice completely is not possible yet. Much
 work has been done, baby steps for some platforms, much more for
 others, but a lot remains. For iOS and Android this work is highly
-experimental and done mostly in my own spare time just for the hacking
+experimental, originally done in my spare time just for the hacking
 pleasure. No promise, explicit or implied, is given that it will ever
 be finished.
 
@@ -44,7 +44,7 @@ Even though the LibreOffice build mechanism is highly 
unorthodox, the
 configure script takes the normal --build and --host options like any
 GNU Autoconf -based configure script. To cross-compile, you basically
 need just to specify a suitable --host option and things should work
-out nicely. In practise, some more details might be needed. See
+out nicely. In practise, many details needed to be handled. See
 examples below.
 
 
@@ -122,8 +122,9 @@ for MinGW inside the OOo-originated code in LibreOffice 
actually
 are. What I have noticed of it seems a bit randomish, with
 copy-pasting having been preferred to factoring out differences.
 
-Most of the configuration settings are maintained in the LibreOfficeMinGW
-distro-config, so in your autogen.lastrun, you can use:
+Most of the configuration settings are maintained in the
+distro-configs/LibreOfficeMinGW.conf file, so in your autogen.lastrun,
+you can use:
 
 CC=ccache i686-w64-mingw32-gcc
 CXX=ccache i686-w64-mingw32-g++
@@ -131,8 +132,8 @@ CC_FOR_BUILD=ccache gcc
 CXX_FOR_BUILD=ccache g++
 --with-distro=LibreOfficeMinGW
 
-Alternatively, you can use something like the following; but the preferred way
-is to keep LibreOfficeMinGW distro up-to-date.
+Alternatively, you can use something like the following; but the
+preferred way is to keep the LibreOfficeMinGW.conf file up-to-date.
 
 CC=ccache i686-w64-mingw32-gcc
 CXX=ccache i686-w64-mingw32-g++
@@ -251,17 +252,15 @@ iOS
 iOS is the operating system of Apple's mobile devices. Clearly for a
 device like the iPad it would be totally unacceptable to run a normal
 LibreOffice application with a overlapping windows and mouse-oriented
-GUI widgets. No work has been done (at least publicly) to design a
-touch GUI for LibreOffice, so the work on cross-compiling LibreOffice
-for iOS is extremely experimental, and of course partly pointless;)
-But it is interesting and fun nonetheless.
-
-Obviously it will make sense to build only a part of LibreOffice's
-code for iOS. Most likely all GUI-oriented code should be left out,
-and some iOS app that eventually wants to use the remaining bits will
-handle all its GUI in a platform-dependent manner. How well it will be
-possible to do such a split remains to be seen. As I said, this is
-highly experimental and just in its baby steps phase.
+GUI widgets. No work has been done (at least publicly) by others to
+design a touch GUI for LibreOffice, so that is something that needs to
+be done.
+
+Obviously it will make sense to use only a part of LibreOffice's code
+for iOS. Most likely lots of the GUI-oriented code should be left out,
+and some iOS app(s) that eventually wants to use the remaining bits
+will handle all its GUI in a platform-dependent manner. How well it
+will be possible to do such a split remains to be seen.
 
 Technically, one important special aspect of iOS is that apps are not
 allowed to load own dynamic libraries. (System libraries are used in
@@ -310,10 +309,10 @@ or g++ won't find its headers like bits/c++config.h
 Android
 ---
 
-I don't know much about Android, but from a technical point of view it
-is a kind of Linux, of course. As far as I know it is allowed for an
-Android app to use shared objects, but if it isn't, then just the same
-approach as used on iOS will need to be used.
+From a technical point of view the core Android OS is Linux, but
+everything else is different. Unlike iOS, an Android app can use
+shared objects just fine, so that aspect of UNO doesn't 

[Libreoffice-commits] .: 2 commits - README.cross solenv/bin

[Jan Holesovsky]

 README.cross  |   26 ++
 solenv/bin/linkoo |   35 +--
 2 files changed, 47 insertions(+), 14 deletions(-)

New commits:
commit 07a7e3a76a2b64735f5c96a399d1da78a6209dd8
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Sep 27 12:02:01 2011 +0200

Add MinGW debugging hints.

diff --git a/README.cross b/README.cross
index 5325a4f..a3966da 100644
--- a/README.cross
+++ b/README.cross
@@ -172,6 +172,32 @@ CXX_FOR_BUILD=ccache g++
 --without-helppack-integration
 --without-myspell-dicts
 
+Once you have compiled it, you may want to try to run it:
+
+$ cd instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US
+$ tar xf 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
+
+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:\local\libreoffice\master-mingw32\instsetoo_native\wntgcci.pro\LibreOffice_Dev\archive\install\en-US\LibO-Dev_OOO350m1_Win_x86_install-arc_en-US\LibO-dev
 3.5\URE\bin
+to Path.
+
+Then run linkoo, so that when you rebuild something, you can directly see the
+changes the next time you run it:
+
+solenv/bin/linkoo 
'your_clone_dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev
 3.5' your_clone_dir
+
+And start debugging:
+
+$ 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.
+
 TODO:
 
 - installation
commit abc08aefee5e7e93b86fa484ddbbea0b29aa3f37
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Sep 27 11:56:58 2011 +0200

Add MinGW handling to linkoo.

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 2a43dfd..51d9351 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -69,24 +69,28 @@ my $LIBVER;
 my $OOO_BUILD;
 my $OOO_INSTALL;
 
-my $program_dir = 'basis-link/program';
+my $basis_dir = 'basis-link/program';
+my $win_basis_dir = 'Basis/program';
 my $brand_program_dir = 'program';
-my $ure_misc_dir = 'basis-link/ure-link/share/misc';
-my $ure_java_dir = 'basis-link/ure-link/share/java';
 my $ure_lib_dir = 'basis-link/ure-link/lib';
+my $win_ure_lib_dir = 'URE/bin';
 
 my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
-my $dllre = '\.so$';
-
 my %replaceable = (
-$brand_program_dir = $dllre,
-$program_dir = \\.rdb,
-$ure_lib_dir = ($dllre|\\.so\\.3\$),
-$program_dir . '/resource' = '\.res$',
-$program_dir . '/classes' = '\.jar$',
+$brand_program_dir = (\\.so|\\.dll|\\.exe|\\.bin|\\.com)\$,
+$basis_dir = \\.rdb,
+$win_basis_dir = \\.rdb,
+$ure_lib_dir = (\\.so\$|\\.so\\.3\$),
+$win_ure_lib_dir = (\\.dll|\\.exe|\\.bin|\\.com)\$,
+$basis_dir . '/resource' = '\.res$',
+$basis_dir . '/classes' = '\.jar$',
+$win_basis_dir . '/resource' = '\.res$',
+$win_basis_dir . '/classes' = '\.jar$',
 'basis-link/share/config' = '\.zip$',
-'ure/share/misc' = '\.rdb'
+'Basis/share/config' = '\.zip$',
+'ure/share/misc' = '\.rdb$',
+'URE/misc' = '\.rdb$'
 #'share/uno_packages' = '\.zip$'
 );
 
@@ -176,7 +180,7 @@ sub do_link(@)
if (!$dry_run) {
# re-write the link
unlink ($dest/$dest_name);
-   symlink ($src/$src_name, $dest/$dest_name) || die Failed 
to symlink: $!;
+   symlink ($src/$src_name, $dest/$dest_name) || die Failed 
to symlink $src/$src_name: $!;
print  [$dest_name];
} else {
print re-make link $src/$src_name = $dest/$dest_name\n;
@@ -191,7 +195,7 @@ sub do_link(@)
rename ($dest/$dest_name, $dest/linked/$dest_name) ||
defined $dont_check_link || die Failed rename of 
$dest/$dest_name: $!;
 
-   symlink ($src/$src_name, $dest/$dest_name) || die Failed to 
symlink: $!;
+   symlink ($src/$src_name, $dest/$dest_name) || die Failed to 
symlink $src/$src_name: $!;
print  $dest_name;
} else {
print move / symlink $src/$src_name = $dest/$dest_name\n;
@@ -306,6 +310,8 @@ sub evilness($)
 
 sub link_gdb_py()
 {
+return if ($TARGET eq 'wntgcci.pro');
+
 print Special gdb.py helpers case: ;
 my $dirh;
 my @basis;
@@ -337,6 +343,8 @@ sub link_gdb_py()
 
 sub link_pagein_files()
 {
+return if ($TARGET eq 'wntgcci.pro');
+
 print pagein case:;
 my $src  = $OOO_BUILD/solver/$TARGET/bin;
 my $dest = $OOO_INSTALL/ . $brand_program_dir;
@@ -380,7 +388,6 @@ substr ($OOO_BUILD, 0, 1)   eq '/' || die linkoo requires 
absolute paths ($OOO_
 -d $OOO_INSTALL || die No such directory $OOO_INSTALL;
 -w $OOO_INSTALL || die You need write access to $OOO_INSTALL;
 -d