applied_patches/0024-linkoo-dev300.diff

   1 diff --git solenv/bin/linkoo solenv/bin/linkoo
   2 index fab6f23..40db374 100755
   3 --- solenv/bin/linkoo
   4 +++ solenv/bin/linkoo
   5 @@ -46,12 +46,12 @@
   6  # ends up in program/ooenv
   7  ( $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
   8  $env_script = '
   9 -java_path=`./javaldx`
  10 +java_path=`../basis-link/ure-link/bin/javaldx`
  11  export LD_LIBRARY_PATH=".:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
  12  ulimit -c unlimited
  13 -export PATH=".:$PATH"
  14 +export PATH=".:../basis-link/program:../basis-link/ure-link/bin:$PATH"
  15  export GNOME_DISABLE_CRASH_DIALOG=1
  16 -export STAR_RESOURCEPATH=`pwd`/resource
  17 +export STAR_RESOURCEPATH=`pwd`/../basis-link/program/resource
  18  # debugging assistance
  19  export OOO_FORCE_SYSALLOC=1
  20  export MALLOC_CHECK_=2
  21 @@ -59,8 +59,11 @@ export OOO_DISABLE_RECOVERY=1
  22  export SAL_ALLOW_LINKOO_SYMLINKS=1
  23  ';
  24
  25 -$program_dir = 'program';
  26 -$program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
  27 +$program_dir = 'basis-link/program';
  28 +$brand_program_dir = 'program';
  29 +$ure_misc_dir = 'basis-link/ure-link/share/misc';
  30 +
  31 +$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
  32
  33  my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' );
  34
  35 @@ -68,7 +71,7 @@ my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' );
  36         $program_dir => '\.so',
  37      $program_dir . '/resource' => '\.res$',
  38      $program_dir . '/classes' => '\.jar$',
  39 -    'share/config' => '\.zip$',
  40 +    'basis-link/share/config' => '\.zip$',
  41  #    'share/uno_packages' => '\.zip$'
  42  );
  43
  44 @@ -266,8 +269,8 @@ sub evilness($)
  45  sub link_iso_res()
  46  {
  47      print "Special iso.res case: ";
  48 -    my $ooo_res="$OOO_INSTALL/" . $program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
  49 -    my $star_res="$OOO_INSTALL/" . $program_dir . "/resource/iso".$LIBVER.$LANG.".res";
  50 +    my $ooo_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
  51 +    my $star_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/iso".$LIBVER.$LANG.".res";
  52      if (-l $ooo_res && -l $star_res) {
  53         if ($dry_run) {
  54             print "link $ooo_res to $star_res";
  55 @@ -285,7 +285,7 @@ sub link_types_rdb()
  56  {
  57      print "oovbaapi.rdb case:";
  58      my $src  = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
  59 -    my $dest = "$OOO_INSTALL/program";
  60 +    my $dest = "$OOO_INSTALL/" . $program_dir;
  61      do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
  62      print "\n";
  63  }
  64 @@ -293,7 +296,7 @@ sub link_types_rdb()
  65  {
  66      print "Types.rdb case:";
  67      my $src  = "$OOO_BUILD/offapi/$TARGET/ucr";
  68 -    my $dest = "$OOO_INSTALL/" . $program_dir;
  69 +    my $dest = "$OOO_INSTALL/" . $ure_misc_dir;
  70      do_link ($src, $dest, 'types.db', 'types.rdb');
  71      print "\n";
  72  }
  73 @@ -302,7 +305,7 @@ sub link_types_rdb()
  74  sub link_soffice_bin_files()
  75  {
  76      my $dest;
  77 -    my $src = "$OOO_INSTALL/" . $program_dir;
  78 +    my $src = "$OOO_INSTALL/" . $brand_program_dir;
  79
  80      print "soffice files";
  81      $dest = "$OOO_BUILD/desktop/$TARGET/bin";
  82 @@ -369,9 +372,9 @@ link_types_rdb();
  83  link_oovbaapi_rdb();
  84  link_soffice_bin_files();
  85
  86 -if (!-f "$OOO_INSTALL/" . $program_dir . "/ooenv") {
  87 -    print "Creating '$OOO_INSTALL/", $program_dir, "/ooenv'\n";
  88 -    open ($ooenv, ">$OOO_INSTALL/" . $program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $program_dir . "/ooenv: $!";
  89 +if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
  90 +    print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n";
  91 +    open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!";
  92      print $ooenv $env_script;
  93      close ($ooenv);
  94  }