ooo-build r13067 - in trunk: . bin scratch/split



Author: michael
Date: Fri Jul  4 12:01:09 2008
New Revision: 13067
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13067&view=rev

Log:
2008-07-04  Michael Meeks  <michael meeks novell com>

        * bin/unpack: link piece to old build name for
        bootstrapping.
        * bin/src-pack2: pack inside different sub-dirs,
        and rename sub-dirs for consistency to use an '_'



Modified:
   trunk/ChangeLog
   trunk/bin/src-pack2
   trunk/bin/unpack
   trunk/scratch/split/ooo3_bootstrap.spec
   trunk/scratch/split/ooo3_libs_core.spec
   trunk/scratch/split/ooo3_libs_extern.spec
   trunk/scratch/split/ooo3_libs_gui.spec
   trunk/scratch/split/ooo3_ure.spec

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Fri Jul  4 12:01:09 2008
@@ -51,15 +51,17 @@
 			   'python', 'zlib', 'xalan', 'boost', 'curl',
 			   'dictionaries', 'cairo', 'hunspell' ]
 );
+my $force = 0;
 
 my $src;
 my $dest;
 
 sub print_help_and_exit()
 {
-    print "src-package: <src-directory-name> [<destination-directory>]\n";
+    print "src-package: <src-directory-name> [<destination-directory>] [--force]\n";
     print "   the src will be un-packed into several archives\n";
     print "   prefixed by the last path element\n";
+    print "   --force: ignore missing modules\n";
     exit 0;
 }
 
@@ -91,7 +93,11 @@
 	for my $module (@{$module_map->{$section}}) {
 	    if (!defined $modules->{$module}) {
 		print "\n\nError: section '$section' contains non-existent module '$module'\n\n";
-		$failed = 1;
+		if ($force) {
+		    delete $module_map->{$section};
+		} else {
+		    $failed = 1;
+		}
 	    }
 	    delete $modules->{$module};
 	}
@@ -109,6 +115,8 @@
 for my $arg (@ARGV) {
     if ($arg eq "--help" || $arg eq '-h') {
 	print_help_and_exit();
+    } elsif ($arg eq '--force') {
+	$force = 1;
     } elsif (!defined $src) {
 	$src = $arg;
     } elsif (!defined $dest) {

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Fri Jul  4 12:01:09 2008
@@ -167,6 +167,9 @@
 		echo "	unpacking $pkg..."
 		($OOO_DECOMPRESS_CMD "$SRCDIR/$OOO_SPLIT_PREFIX$pkg.tar.bz2" | $GNUTAR xpf - ) || exit 1
 	done
+	if test "z$PIECE" != "z"; then
+		ln -s "$BUILDDIR/$CVSTAG-$PIECE" $OOBUILDDIR 
+	fi
 fi
 
 # -system source
@@ -208,6 +211,7 @@
 
 # workaround for i#56622, n#210797
 
+if test "z$PIECE" == "z"; then
 case "$OOO_LANGS" in
 *\ hu\ *|*\ hu|hu\ *|hu)
     echo "Fixing Hungarian strings: OOo vs. SO"
@@ -222,7 +226,6 @@
 # copy in unowinreg.dll if we need to
 # it is necessary in ODK
 # it can be built even on linux by mingw32, though
-if test "z$PIECE" == "z"; then
 if test "$USE_PREBUILD_UNOWINREG_DLL" = "YES" ; then
     $GNUCP -f $SRCDIR/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
 fi

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Fri Jul  4 12:01:09 2008
@@ -127,11 +127,11 @@
 %define	      ooo_home		ooo-3
 %define	      ooo_build_dir	build
 %define	      ooo_build_version 2.99.21
-%define	      ooo_build_tag     dev300-m22
+%define	      ooo_build_tag     dev300-m21
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        3
+Release:        4
 AutoReqProv:    on
 PreReq:         coreutils /usr/bin/update-mime-database
 PreReq:         %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Fri Jul  4 12:01:09 2008
@@ -15,15 +15,15 @@
 BuildRequires:  ooo3_bootstrap-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m22
+%define	      ooo_build_tag     dev300-m21
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        3
+Release:        4
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
-Source:         %ooo_build_tag-libs-core.tar.bz2
+Source:         %ooo_build_tag-%piece.tar.bz2
 
 %description
 ure

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Fri Jul  4 12:01:09 2008
@@ -15,15 +15,15 @@
 BuildRequires:  ooo3_bootstrap-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m22
+%define	      ooo_build_tag     dev300-m21
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        3
+Release:        4
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
-Source:         %ooo_build_tag-libs-extern.tar.bz2
+Source:         %ooo_build_tag-%piece.tar.bz2
 
 %description
 ure

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Fri Jul  4 12:01:09 2008
@@ -12,18 +12,18 @@
 
 %define         piece      libs_gui
 Name:           ooo3_%piece
-BuildRequires:  ooo3_bootstrap-devel
+BuildRequires:  ooo3_bootstrap-devel ooo3_libs_extern-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m22
+%define	      ooo_build_tag     dev300-m21
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        3
+Release:        4
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
-Source:         %ooo_build_tag-libs-gui.tar.bz2
+Source:         %ooo_build_tag-%piece.tar.bz2
 
 %description
 ure

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Fri Jul  4 12:01:09 2008
@@ -15,15 +15,15 @@
 BuildRequires:  ooo3_bootstrap-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m22
+%define	      ooo_build_tag     dev300-m21
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        3
+Release:        4
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
-Source:         %ooo_build_tag-ure.tar.bz2
+Source:         %ooo_build_tag-%piece.tar.bz2
 
 %description
 ure



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]