ooo-build r12394 - in trunk: . bin

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Apr 30 10:37:12 2008
New Revision: 12394
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12394&view=rev

Log:
2008-04-30  Rene Engelhard  <rene debian org>

        * bin/ooinstall: we don't need a extra URE installation step anymore
        * bin/package-ooo: install the new gids, fix langpack/help installs
          (Debian)


Modified:
   trunk/ChangeLog
   trunk/bin/ooinstall
   trunk/bin/package-ooo

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Wed Apr 30 10:37:12 2008
@@ -125,15 +125,6 @@
     $strip = "-dontstrip";
 }
 
-if ($setup_vars{'VENDORNAME'} eq 'Debian') {
-    print "Running URE installer\n";
-    system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " .
-	"perl -w $configure_vars{SOLARENV}/bin/make_installer.pl " .
-	"-f openoffice.lst -l en-US -p URE " .
-	"-buildid $BUILD $destdir $strip " .
-	"-simple $path/ure") && die "Failed to install: $!";
-}
-
 print "Running OOo installer\n";
 system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " .
 	"perl -w $configure_vars{SOLARENV}/bin/make_installer.pl " .

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Wed Apr 30 10:37:12 2008
@@ -792,25 +792,35 @@
 			$listfile
 	}
 
-	# URE
-	mkdir -p pkg/ure/usr/lib
-	mv $OODESTDIR/$OOINSTBASE/ure pkg/ure/usr/lib
+	create_package_directory gid_Module_Root_Ure_Hidden		pkg/ure
 
         create_package_directory gid_Module_Root                        pkg/openoffice.org-common
+        create_package_directory gid_Module_Root_Brand                  pkg/openoffice.org-common
+	create_package_directory gid_Module_Root_Files_Images           pkg/openoffice.org-common
+	create_package_directory gid_Module_Oo_Linguistic               pkg/openoffice.org-common
         create_package_directory gid_Module_Optional_Xsltfiltersamples  pkg/openoffice.org-common
 	create_package_directory gid_Module_Optional_Javafilter		pkg/openoffice.org-common
-        create_package_directory gid_Module_Prg_Calc                    pkg/openoffice.org-calc
-        create_package_directory gid_Module_Prg_Math                    pkg/openoffice.org-math	
-        create_package_directory gid_Module_Prg_Draw                    pkg/openoffice.org-draw
-        create_package_directory gid_Module_Optional_Binfilter          pkg/openoffice.org-filter-binfilter
-        create_package_directory gid_Module_Optional_Grfflt             pkg/openoffice.org-draw
-        create_package_directory gid_Module_Prg_Wrt                     pkg/openoffice.org-writer
-        create_package_directory gid_Module_Prg_Impress                 pkg/openoffice.org-impress
-        create_package_directory gid_Module_Prg_Base                    pkg/openoffice.org-base
+	if [ -f gid_Module_Optional_Binfilter ]; then 
+        	create_package_directory gid_Module_Optional_Binfilter          pkg/openoffice.org-filter-binfilter
+        fi
+	create_package_directory gid_Module_Optional_Grfflt             pkg/openoffice.org-draw
+        create_package_directory gid_Module_Prg_Calc_Bin                pkg/openoffice.org-calc
+        create_package_directory gid_Module_Prg_Math_Bin                pkg/openoffice.org-math	
+        create_package_directory gid_Module_Prg_Draw_Bin                pkg/openoffice.org-draw
+        create_package_directory gid_Module_Prg_Wrt_Bin                 pkg/openoffice.org-writer
+        create_package_directory gid_Module_Prg_Impress_Bin             pkg/openoffice.org-impress
+        create_package_directory gid_Module_Prg_Base_Bin                pkg/openoffice.org-base
+        create_package_directory gid_Module_Brand_Prg_Calc              pkg/openoffice.org-calc
+        create_package_directory gid_Module_Brand_Prg_Math              pkg/openoffice.org-math	
+        create_package_directory gid_Module_Brand_Prg_Draw              pkg/openoffice.org-draw
+        create_package_directory gid_Module_Brand_Prg_Wrt               pkg/openoffice.org-writer
+        create_package_directory gid_Module_Brand_Prg_Impress           pkg/openoffice.org-impress
+        create_package_directory gid_Module_Brand_Prg_Base              pkg/openoffice.org-base
         create_package_directory gid_Module_Optional_Pyuno		pkg/python-uno
         create_package_directory gid_Module_Optional_Pymailmerge	pkg/openoffice.org-emailmerge
         create_package_directory gid_Module_Optional_Gnome		pkg/openoffice.org-gnome
-        create_package_directory gid_Module_Optional_Headless		pkg/openoffice.org-headless
+        create_package_directory gid_Module_Optional_Kde                pkg/openoffice.org-kde
+	create_package_directory gid_Module_Optional_Headless		pkg/openoffice.org-headless
 
         if [ -f gid_Module_Optional_Mailcap ]; then
             # pre m76
@@ -822,21 +832,22 @@
             create_package_directory gid_Module_Root_Files_5                pkg/openoffice.org-common
             create_package_directory gid_Module_Root_Files_6                pkg/openoffice.org-common
             create_package_directory gid_Module_Root_Files_7                pkg/openoffice.org-common
-            create_package_directory gid_Module_Root_Files_8                pkg/openoffice.org-common
+            #create_package_directory gid_Module_Root_Files_8                pkg/openoffice.org-common
 #            create_package_directory gid_Module_Optional_Oo_English         pkg/openoffice.org-common
             create_package_directory gid_Module_Optional_Testtool           pkg/openoffice.org-common
         fi            
 
 	create_package_directory gid_Module_Root_SDK                    pkg/openoffice.org-dev
 
-	create_package_directory gid_Module_Root_$l             pkg/openoffice.org-l10n-$l
-	for l in `echo $OOO_LANGS_LIST`; do \
-		for p in Root Impress Draw Math Calc Base Writer; do \
+	for l in `echo $OOO_LANGS_LIST`; do
+		for p in Impress Draw Math Calc Base Writer; do
 			create_package_directory  gid_Module_Langpack_${p}_`echo $l | sed -e s/-/_/g`   pkg/openoffice.org-l10n-$l
 		done
+		create_package_directory gid_Module_Langpack_Basis_`echo $l | sed -e s/-/_/g`	pkg/openoffice.org-l10n-$l
+		create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g`	pkg/openoffice.org-l10n-$l
+		create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`        pkg/openoffice.org-l10n-$l
+		create_package_directory gid_Module_Langpack_Help_`echo $l | sed -e s/-/_/g`    pkg/openoffice.org-help-$l
 	done
-	create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`        pkg/openoffice.org-l10n-$l
-	create_package_directory gid_Module_Langpack_Help_`echo $l | sed -e s/-/_/g`    pkg/openoffice.org-help-$l
 
 	# move_wrappers <directory_name> <name> [...]
 	move_wrappers()