ooo-build r13006 - in trunk: . bin bin/piece

[michael svn gnome org]

Author: michael
Date: Tue Jul  1 11:18:16 2008
New Revision: 13006
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13006&view=rev

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

        * bin/src-pack2, bin/unpack: rename extensions -> components.



Modified:
   trunk/ChangeLog
   trunk/bin/piece/build-ure
   trunk/bin/src-pack2
   trunk/bin/unpack

Modified: trunk/bin/piece/build-ure
==============================================================================
--- trunk/bin/piece/build-ure	(original)
+++ trunk/bin/piece/build-ure	Tue Jul  1 11:18:16 2008
@@ -3,8 +3,10 @@
 # build script - invoked from a spec file to build the project
 
 for a in *; do
-	cd $a || exit 1;
-	perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
-	perl $SOLARENV/bin/build.pl --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
-	cd ..
+	if test "$a" != "applied_patches"; then
+		cd $a || exit 1;
+		perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+		perl $SOLARENV/bin/build.pl --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+		cd ..
+	fi
 done

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Tue Jul  1 11:18:16 2008
@@ -40,7 +40,7 @@
 		       'np_sdk', 'rhino', 'sane', 'twain', 'lpsolve', 'icc',
 		       'openssl', 'unixODBC', 'vigra', 'x11_extensions',
 		       'xpdf', 'hyphen', 'libwpd' ],
-    'extensions' => [ 'accessibility', 'automation', 'basctl', 'bean',
+    'components' => [ 'accessibility', 'automation', 'basctl', 'bean',
 		      'crashrep', 'embedserv', 'extensions', 'forms',
 		      'javainstaller2', 'lingucomponent', 'MathMLDTD',
 		      'package', 'setup_native', 'UnoControls', 'wizards',

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Jul  1 11:18:16 2008
@@ -57,7 +57,7 @@
 	if test "z$PIECE" != "z"; then
 		CORE_PKGS=$PIECE
 	else
-		CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern extensions postprocess"
+		CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern components postprocess"
 	fi
 	for pkg in $CORE_PKGS; do
 		check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"