ooo-build r12263 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon Apr 21 18:51:40 2008
New Revision: 12263
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12263&view=rev

Log:
2008-04-21  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/linkoo-dev300.diff: First cut of dev300 support,
          untested, and so not enabled in the apply file yet.


Added:
   trunk/patches/dev300/linkoo-dev300.diff
Modified:
   trunk/ChangeLog

Added: trunk/patches/dev300/linkoo-dev300.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/linkoo-dev300.diff	Mon Apr 21 18:51:40 2008
@@ -0,0 +1,85 @@
+diff --git solenv/bin/linkoo solenv/bin/linkoo
+index fab6f23..40db374 100755
+--- solenv/bin/linkoo
++++ solenv/bin/linkoo
+@@ -46,12 +46,12 @@
+ # ends up in program/ooenv
+ ( $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
+ $env_script = '
+-java_path=`./javaldx`
++java_path=`../basis-link/ure-link/bin/javaldx`
+ export LD_LIBRARY_PATH=".:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
+ ulimit -c unlimited
+-export PATH=".:$PATH"
++export PATH=".:../basis-link/program:../basis-link/ure-link/bin:$PATH"
+ export GNOME_DISABLE_CRASH_DIALOG=1
+-export STAR_RESOURCEPATH=`pwd`/resource
++export STAR_RESOURCEPATH=`pwd`/../basis-link/program/resource
+ # debugging assistance
+ export OOO_FORCE_SYSALLOC=1
+ export MALLOC_CHECK_=2
+@@ -59,8 +59,11 @@ export OOO_DISABLE_RECOVERY=1
+ export SAL_ALLOW_LINKOO_SYMLINKS=1
+ ';
+ 
+-$program_dir = 'program';
+-$program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
++$program_dir = 'openoffice.org/basis3.0/program';
++$brand_program_dir = 'openoffice.org3.0/program';
++$ure_misc_dir = 'ure/share/misc';
++
++$program_dir = 'openoffice.org/basis3.0/MacOS' if ($ENV{OS} eq 'MACOSX');
+ 
+ my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' );
+ 
+@@ -68,7 +71,7 @@ my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' );
+ 	$program_dir => '\.so',
+     $program_dir . '/resource' => '\.res$',
+     $program_dir . '/classes' => '\.jar$',
+-    'share/config' => '\.zip$',
++    'openoffice.org3.0/share/config' => '\.zip$',
+ #    'share/uno_packages' => '\.zip$'
+ );
+ 
+@@ -266,8 +269,8 @@ sub evilness($)
+ sub link_iso_res()
+ {
+     print "Special iso.res case: ";
+-    my $ooo_res="$OOO_INSTALL/" . $program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
+-    my $star_res="$OOO_INSTALL/" . $program_dir . "/resource/iso".$LIBVER.$LANG.".res";
++    my $ooo_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
++    my $star_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/iso".$LIBVER.$LANG.".res";
+     if (-l $ooo_res && -l $star_res) {
+ 	if ($dry_run) {
+ 	    print "link $ooo_res to $star_res";
+@@ -293,7 +296,7 @@ sub link_types_rdb()
+ {
+     print "Types.rdb case:";
+     my $src  = "$OOO_BUILD/offapi/$TARGET/ucr";
+-    my $dest = "$OOO_INSTALL/" . $program_dir;
++    my $dest = "$OOO_INSTALL/" . $ure_misc_dir;
+     do_link ($src, $dest, 'types.db', 'types.rdb');
+     print "\n";
+ }
+@@ -302,7 +305,7 @@ sub link_types_rdb()
+ sub link_soffice_bin_files()
+ {
+     my $dest;
+-    my $src = "$OOO_INSTALL/" . $program_dir;
++    my $src = "$OOO_INSTALL/" . $brand_program_dir;
+ 
+     print "soffice files";
+     $dest = "$OOO_BUILD/desktop/$TARGET/bin";
+@@ -369,9 +372,9 @@ link_types_rdb();
+ link_oovbaapi_rdb();
+ link_soffice_bin_files();
+ 
+-if (!-f "$OOO_INSTALL/" . $program_dir . "/ooenv") {
+-    print "Creating '$OOO_INSTALL/", $program_dir, "/ooenv'\n";
+-    open ($ooenv, ">$OOO_INSTALL/" . $program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $program_dir . "/ooenv: $!";
++if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
++    print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n";
++    open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!";
+     print $ooenv $env_script;
+     close ($ooenv);
+ }