[ooo-build-commit] .: 2 commits - solenv/bin

[Jan Holesovsky]

 solenv/bin/linkoo |   38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

New commits:
commit 53d62c4a76f04c2f6a0e581e676149f39f6bb269
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Aug 24 14:40:58 2010 +0200

    linkoo-dev300.diff: Update linkoo for dev300.

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 7075529..7e974b0 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -38,12 +38,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
@@ -51,8 +51,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 = 'basis-link/program';
+$brand_program_dir = 'program';
+$ure_misc_dir = 'basis-link/ure-link/share/misc';
+
+$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
 
 my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
@@ -60,7 +63,7 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 	$program_dir => '\.so',
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
-    'share/config' => '\.zip$',
+    'basis-link/share/config' => '\.zip$',
 #    'share/uno_packages' => '\.zip$'
 );
 
@@ -258,8 +261,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";
@@ -277,7 +280,7 @@ sub link_oovbaapi_rdb()
 {
     print "oovbaapi.rdb case:";
     my $src  = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
-    my $dest = "$OOO_INSTALL/program";
+    my $dest = "$OOO_INSTALL/" . $program_dir;
     do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
     print "\n";
 }
@@ -285,7 +288,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";
 }
@@ -294,7 +297,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";
@@ -358,9 +361,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);
 }
commit 4cfd9bb5666cf57d4d1f68dcc66fd7d4f55cf8df
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Aug 24 14:33:48 2010 +0200

    linkoo-type.diff: Make oovbaapi as a link.

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 137c0b0..7075529 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -273,6 +273,14 @@ sub link_iso_res()
 }
 
 # Hack for (renamed) types.rdb (types.db)
+sub link_oovbaapi_rdb()
+{
+    print "oovbaapi.rdb case:";
+    my $src  = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
+    my $dest = "$OOO_INSTALL/program";
+    do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
+    print "\n";
+}
 sub link_types_rdb()
 {
     print "Types.rdb case:";
@@ -347,6 +355,7 @@ my $installed_files = build_installed_list ($OOO_INSTALL);
 scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
 link_iso_res();
 link_types_rdb();
+link_oovbaapi_rdb();
 link_soffice_bin_files();
 
 if (!-f "$OOO_INSTALL/" . $program_dir . "/ooenv") {