ooo-build r12664 - in trunk: . bin patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon May 26 11:47:41 2008
New Revision: 12664
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12664&view=rev

Log:
2008-05-26  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/scp2-3layer-nicer-paths.diff,
          patches/dev300/linkoo-dev300.diff,
          patches/dev300/apply,
          bin/ooinstall: Re-introduce basis3.0, keep the more flat structure,
          but do it using patching scp2 instead of copying files and
          rewriting file lists.


Added:
   trunk/patches/dev300/scp2-3layer-nicer-paths.diff
Modified:
   trunk/ChangeLog
   trunk/bin/ooinstall
   trunk/patches/dev300/apply
   trunk/patches/dev300/linkoo-dev300.diff

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Mon May 26 11:47:41 2008
@@ -168,35 +168,6 @@
 }
 print "Installer finished\n";
 
-print "Fixing permissions...\n";
-system("cd $path ; find . -exec chmod u+w \{\} \\;");
-
-print "Merging layers and move to $path...\n";
-system("cd $path && cp -ra openoffice.org/basis$setup_vars{VERSION}/* .");
-system("cd $path && cp -ra openoffice.org/ure .");
-system("cd $path && cp -ra openoffice.org3/* .");
-system("cd $path && rm -rf openoffice.org openoffice.org3");
-system("cd $path && ln -sf . basis-link");
-system("cd $path && ln -sf ure ure-link");
-if ( defined $setup_vars{OODESTDIR} && $setup_vars{OODESTDIR} ne "") {
-    chdir("$setup_vars{OODESTDIR}");
-    foreach my $f ( <gid_*> ) {
-        open(F, "$f");
-        open(FN, ">$f.new");
-        my @new;
-        while (<F>) {
-            $_ =~ s,$setup_vars{OOINSTBASE}/openoffice.org3,$setup_vars{OOINSTBASE},g;
-            $_ =~ s,$setup_vars{OOINSTBASE}/openoffice.org/basis$setup_vars{VERSION},$setup_vars{OOINSTBASE},g;
-            $_ =~ s,$setup_vars{OOINSTBASE}/openoffice.org/ure,$setup_vars{OOINSTBASE}/ure,g;
-            push @new, $_;
-        }
-        close(F);
-        foreach my $l (@new) { print FN "$l"; }
-        close (FN);
-        rename("$f.new", "$f");
-    }
-}
-
 # FIXME: needs a way to package extensions - this here is dev
 # build-only
 if ( !defined $setup_vars{OODESTDIR} || $setup_vars{OODESTDIR} eq "") {

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon May 26 11:47:41 2008
@@ -342,6 +342,9 @@
 # make menu layout prettier
 vcl-menu-fixes.diff, i#67123, michael
 
+# flatten the structure of the 3 layer OOo a bit
+scp2-3layer-nicer-paths.diff, jholesov
+
 # Tell the desktop we support the VFS
 [ FixesNotForUpstream < dev300-m13 ]
 uses-vfs-m12.diff, i#43504, michael

Modified: trunk/patches/dev300/linkoo-dev300.diff
==============================================================================
--- trunk/patches/dev300/linkoo-dev300.diff	(original)
+++ trunk/patches/dev300/linkoo-dev300.diff	Mon May 26 11:47:41 2008
@@ -7,14 +7,14 @@
  ( $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
  $env_script = '
 -java_path=`./javaldx`
-+java_path=`../basis-link/ure-link/bin/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 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
++export STAR_RESOURCEPATH=`pwd`/basis-link/program/resource
  # debugging assistance
  export OOO_FORCE_SYSALLOC=1
  export MALLOC_CHECK_=2
@@ -24,11 +24,11 @@
  
 -$program_dir = 'program';
 -$program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
-+$program_dir = 'program';         # 'openoffice.org/basis3.0/program';
-+$brand_program_dir = 'program';   # 'openoffice.org3/program';
-+$ure_misc_dir = 'ure/share/misc'; # 'openoffice.org/ure/share/misc';
++$program_dir = 'basis-link/program';
++$brand_program_dir = 'program';
++$ure_misc_dir = 'basis-link/ure-link/share/misc';
 +
-+$program_dir = 'openoffice.org/basis3.0/MacOS' if ($ENV{OS} eq 'MACOSX');
++$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
  
  my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' );
  
@@ -37,7 +37,7 @@
      $program_dir . '/resource' => '\.res$',
      $program_dir . '/classes' => '\.jar$',
 -    'share/config' => '\.zip$',
-+    'openoffice.org/basis3.0/share/config' => '\.zip$',
++    'basis-link/share/config' => '\.zip$',
  #    'share/uno_packages' => '\.zip$'
  );
  

Added: trunk/patches/dev300/scp2-3layer-nicer-paths.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/scp2-3layer-nicer-paths.diff	Mon May 26 11:47:41 2008
@@ -0,0 +1,39 @@
+diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
+index 5e29ab3..8d268c1 100644
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
+@@ -323,7 +323,7 @@ Unixlink gid_Brand_Unixlink_BasisLink
+     // Styles = (LAYERLINK);
+     Name = "basis-link";
+     Dir = gid_Dir_Brand_Root;
+-    Target = "../openoffice.org/basis${OOOBASEVERSION}";
++    Target = "basis${OOOBASEVERSION}";
+ End
+ #endif
+ 
+diff --git scp2/source/ooo/directory_ooo.scp scp2/source/ooo/directory_ooo.scp
+index 354f8c0..95f4c17 100644
+--- scp2/source/ooo/directory_ooo.scp
++++ scp2/source/ooo/directory_ooo.scp
+@@ -93,7 +93,7 @@ Directory gid_Dir_Ooo_Openofficeorg
+   #ifdef WNT
+     HostName = "OpenOffice.org";
+   #else
+-    HostName = "openoffice.org";
++    HostName = ".";
+   #endif
+ End
+ #endif
+diff --git scp2/source/ooo/ooo_brand.scp scp2/source/ooo/ooo_brand.scp
+index 663ce28..ecc87d2 100644
+--- scp2/source/ooo/ooo_brand.scp
++++ scp2/source/ooo/ooo_brand.scp
+@@ -36,7 +36,7 @@ Directory gid_Dir_Brand_Root
+   #ifdef WNT
+     HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
+   #else
+-    HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
++    HostName = ".";
+   #endif
+     Styles = (OFFICEDIRECTORY);
+ End