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

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Sat May 24 08:50:24 2008
New Revision: 12659
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12659&view=rev

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

        * patches/dev300/apply: Fixed to apply on m12 again.

        * patches/dev300/linkoo-dev300.diff,
          bin/ooinstall: 3 layer OOo is gone, we have 2 layer now - URE and
          the rest.


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	Sat May 24 08:50:24 2008
@@ -34,7 +34,7 @@
 sub wanted {
     -f $_ 
 	&& /.*\.oxt$/
-	&& system ( "LD_LIBRARY_PATH='' $path/openoffice.org3/program/unopkg add -v --shared $File::Find::name" )
+	&& system ( "LD_LIBRARY_PATH='' $path/program/unopkg add -v --shared $File::Find::name" )
 	&& die "Cannot install $_ extension!";
 }
 
@@ -169,27 +169,32 @@
 print "Installer finished\n";
 
 print "Fixing permissions...\n";
-system("cd $setup_vars{OOINSTDIR}; find . -exec chmod u+w \{\} \\;");
+system("cd $path ; find . -exec chmod u+w \{\} \\;");
 
-print "Merging layers and move to $setup_vars{OOINSTBASE}...\n";
-system("cd $setup_vars{OOINSTDIR} && cp -ra openoffice.org/* .");
-system("cd $setup_vars{OOINSTDIR} && cp -ra openoffice.org3/* .");
-system("cd $setup_vars{OOINSTDIR} && rm -rf openoffice.org openoffice.org3");
-system("cd $setup_vars{OOINSTDIR} && ln -sf basis$setup_vars{VERSION} basis-link");
-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,$setup_vars{OOINSTBASE},g;
-               push @new, $_;
-       }
-       close(F);
-       foreach my $l (@new) { print FN "$l"; }
-       close (FN);
-       rename("$f.new", "$f");
+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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat May 24 08:50:24 2008
@@ -764,13 +764,13 @@
 # able to paste it elsewhere (similar to Insert Cut Cells in Excel)
 sc-delete-rows-columns-remembers-content.diff, i#71921, jholesov
 
-[ CalcFixes < dev300-m12 ]
+[ CalcFixes <= dev300-m12 ]
 # load, store and save the sheet protection options from and to an Excel file,
 # and use that information to constrain cell cursor movement when the sheet is
 # protected.
 sc-sheet-protection-options.diff, i#71468, kohei
 
-[ CalcFixes >= dev300-m12 ]
+[ CalcFixes > dev300-m12 ]
 cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei  
 cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei  
 cws-scsheetprotection02-svx.diff,  i#60305, i#71468, i#84766, kohei   

Modified: trunk/patches/dev300/linkoo-dev300.diff
==============================================================================
--- trunk/patches/dev300/linkoo-dev300.diff	(original)
+++ trunk/patches/dev300/linkoo-dev300.diff	Sat May 24 08:50:24 2008
@@ -24,9 +24,9 @@
  
 -$program_dir = 'program';
 -$program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
-+$program_dir = 'openoffice.org/basis3.0/program';
-+$brand_program_dir = 'openoffice.org3/program';
-+$ure_misc_dir = 'openoffice.org/ure/share/misc';
++$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 = 'openoffice.org/basis3.0/MacOS' if ($ENV{OS} eq 'MACOSX');