[Libreoffice-commits] .: solenv/bin

[David Tardon]

 solenv/bin/linkoo |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

New commits:
commit f3b8ccfb67c806265582b410a74c65bda6a4473f
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 20 10:48:08 2011 +0200

    this does not apply now that IDL files are processed by gnumake

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index b1fdc6e..2113c76 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -79,6 +79,8 @@ my %replaceable = (
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
     'basis-link/share/config' => '\.zip$',
+    $program_dir => '\.rdb',
+    'ure/share/misc' => '\.rdb'
 #    'share/uno_packages' => '\.zip$'
 );
 
@@ -303,25 +305,6 @@ sub link_iso_res()
     print "\n";
 }
 
-# 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_dir;
-    do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
-    print "\n";
-}
-
-sub link_types_rdb()
-{
-    print "Types.rdb case:";
-    my $src  = "$OOO_BUILD/offapi/$TARGET/ucr";
-    my $dest = "$OOO_INSTALL/" . $ure_misc_dir;
-    do_link ($src, $dest, 'types.db', 'types.rdb');
-    print "\n";
-}
-
 sub link_pagein_files()
 {
     print "pagein case:";
@@ -377,8 +360,6 @@ 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_pagein_files();
 
 if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {