[Libreoffice-commits] .: solenv/bin

[Michael Meeks]

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

New commits:
commit 6d6dd296ff655d41599eeb74b8d315977db397e5
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Dec 3 16:57:17 2010 +0000

    link pagein files

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 517600b..c6929e6 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -60,7 +60,7 @@ $program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FI
 my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
 %replaceable = (
-	$program_dir => '\.so',
+    $program_dir => '\.so',
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
     'basis-link/share/config' => '\.zip$',
@@ -78,12 +78,12 @@ sub sniff_target($)
 {
     my $build_dir = shift;
     my ($dirhandle, $fname);
-    my ($target, $libver, $lang) = ( 'unxlngi4.pro', '680', 'en-US' ); # defaults
-    
+    my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); # defaults
+
     opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
     while ($fname = readdir ($dirhandle)) {
 	$fname =~ /Set.sh$/ || next;
-	
+
 	my $file;
 	open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
 	while (<$file>) {
@@ -184,7 +184,7 @@ sub scan_and_link_files($$$)
     my $build_path = shift;
     my $installed_files = shift;
     my $target = shift;
-    
+
     my @modules = ();
     my $dirh_toplevel;
     opendir ($dirh_toplevel, $build_path) || die "Can't open '$build_path': $!";
@@ -231,7 +231,7 @@ sub scan_and_link_files($$$)
     for my $file (keys %build_files) {
 	my $src = $build_files{$file};
 	my $dest = $installed_files->{$file};
-	
+
 	do_link ($src, $dest, $file, $file);
     }
     print "\n";
@@ -284,6 +284,7 @@ sub link_oovbaapi_rdb()
     do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
     print "\n";
 }
+
 sub link_types_rdb()
 {
     print "Types.rdb case:";
@@ -293,6 +294,17 @@ sub link_types_rdb()
     print "\n";
 }
 
+sub link_pagein_files()
+{
+    print "pagein case:";
+    my $src  = "$OOO_BUILD/desktop/$TARGET/misc";
+    my $dest = "$OOO_INSTALL/" . $program_dir;
+    for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
+	do_link ($src, $dest, "pagein-$c", "pagein-$c");
+    }
+    print "\n";
+}
+
 # link installed files back into src tree:
 sub link_soffice_bin_files()
 {
@@ -359,6 +371,7 @@ scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
 link_iso_res();
 link_types_rdb();
 link_oovbaapi_rdb();
+link_pagein_files();
 link_soffice_bin_files();
 
 if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {