ooo-build r12442 - in trunk: . bin distro-configs patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri May  2 19:01:59 2008
New Revision: 12442
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12442&view=rev

Log:
	* bin/ooinstall: now installs all oxt extensions it finds into OOo
	* distro-configs/Common.conf.in: disabling pdfimport extension,
	until pdfimportfix lands, this does not install
	* patches/dev300/apply: added upstream issue id to Impress zoom fix



Modified:
   trunk/ChangeLog
   trunk/bin/ooinstall
   trunk/distro-configs/Common.conf.in
   trunk/patches/dev300/apply

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Fri May  2 19:01:59 2008
@@ -7,9 +7,14 @@
 #    bin/ooinstall -l /opt/FooLinked
 # 3. When packaging (called from package-ooo), to install to DESTDIR
 
+use File::Find;
+
 %setup_vars = ();
 %configure_vars = ();
 
+$path = '';
+$do_link = 0;
+
 sub suck_setup($)
 {
     my $file = shift;
@@ -26,6 +31,13 @@
     return 0;
 }
 
+sub wanted {
+    -f $_ 
+	&& /.*\.oxt$/
+	&& system ( "LD_LIBRARY_PATH='' $path/openoffice.org3/program/unopkg add -v --shared $File::Find::name" )
+	&& die "Cannot install $_ extension!";
+}
+
 ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
 
 suck_setup ("./setup") || suck_setup ("bin/setup") || die "can't find bin/setup";
@@ -62,9 +74,6 @@
 # Workaround for the Python
 $configure_vars{'PYTHONPATH'} = "$setup_vars{'OOBUILDDIR'}/instsetoo_native/$configure_vars{'INPATH'}/bin:$configure_vars{'SOLARVERSION'}/$configure_vars{'INPATH'}/lib";
 
-my $path = '';
-my $do_link = 0;
-
 for $arg (@ARGV) {
     if ($arg eq '-l') {
 	$do_link = 1;
@@ -159,6 +168,13 @@
 }
 print "Installer finished\n";
 
+# FIXME: needs a way to package extensions - this here is dev
+# build-only
+if ( !defined $setup_vars{OODESTDIR} || $setup_vars{OODESTDIR} eq "") {
+	print "Installing extensions...\n";
+	&find(\&wanted, "$setup_vars{OOBUILDDIR}/solver/");
+}
+
 if ($do_link) {
     `$configure_vars{SOLARENV}/bin/linkoo $path $configure_vars{SRC_ROOT}`;
 }

Modified: trunk/distro-configs/Common.conf.in
==============================================================================
--- trunk/distro-configs/Common.conf.in	(original)
+++ trunk/distro-configs/Common.conf.in	Fri May  2 19:01:59 2008
@@ -4,3 +4,4 @@
 --with-use-shell=bash
 --without-gpc
 --without-agg
+--disable-pdfimport

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri May  2 19:01:59 2008
@@ -2157,7 +2157,7 @@
 cairocanvas-fix-image-cache.diff, rodo
 vcl-limited-bmp-subset-fix.diff, i#88818, thorsten
 
-sd-view-zoom-fix.diff, n#380013, thorsten
+sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
 
 [ InternalMesaHeaders ]
 internal-mesa-headers-config_office.diff, fridrich