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

[pmladek svn gnome org]

Author: pmladek
Date: Fri Mar  6 18:34:44 2009
New Revision: 15495
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15495&view=rev

Log:
2009-03-06  Petr Mladek  <pmladek suse cz>

	* bin/piece/file-list-libs-core: copied from file-list-libs_core
	* bin/piece/file-list-libs-extern: copied from file-list-libs_extern
	* bin/piece/file-list-libs-gui: copied from file-list-libs_gui
	* bin/piece/file-list-extras: copied from file-list-l10n-extras
	* bin/piece/build-generic, bin/piece/install-generic: update to
	  support the renamed source ooo310-m4 source tarballs



Added:
   trunk/bin/piece/file-list-extras   (props changed)
      - copied unchanged from r15491, /trunk/bin/piece/file-list-l10n
   trunk/bin/piece/file-list-libs-core   (props changed)
      - copied unchanged from r15491, /trunk/bin/piece/file-list-libs_core
   trunk/bin/piece/file-list-libs-extern   (props changed)
      - copied unchanged from r15491, /trunk/bin/piece/file-list-libs_extern
   trunk/bin/piece/file-list-libs-gui   (props changed)
      - copied unchanged from r15491, /trunk/bin/piece/file-list-libs_gui
Modified:
   trunk/ChangeLog
   trunk/bin/piece/build-generic
   trunk/bin/piece/install-generic

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Fri Mar  6 18:34:44 2009
@@ -21,7 +21,7 @@
 $OO_TOOLSDIR/install-artwork $OO_TOOLSDIR/../src `pwd`
 
 # new modules
-test "$piece" = "libs_core" && mkdir -p vbahelper
+test "$piece" = "libs-core" -o "$piece" = "libs_core" && mkdir -p vbahelper
 
 # apply flags
 builddir=`pwd`
@@ -45,7 +45,7 @@
 
 # available source dirs
 omit_dirs="-e applied_patches -e ^solver -e ooo-build"
-if test "$piece" != "libs_extern" ; then
+if test "$piece" != "libs-extern" -a "$piece" != "libs_extern" ; then
     omit_dirs="$omit_dirs -e ^external\$"
 fi
 dirs=`/bin/ls | grep -v $omit_dirs | tr '\n' ':'`
@@ -56,7 +56,7 @@
 fi
 
 # might need to build localize tool first
-if test "$piece" = "libs_gui" ; then
+if test "$piece" = "libs-gui" -o "$piece" = "libs_gui" ; then
     perl $SOLARENV/bin/build.pl --subdirs:$dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
     unset nodep
 fi

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Fri Mar  6 18:34:44 2009
@@ -56,7 +56,7 @@
 #        external is automatically taken into build dependencies even when removed from
 #        the dirs list in build-generic
 #        => the build.lst and deliver.log must be deleted in other pieces to avoid conflict of devel packages
-if test "$piece" != "libs_extern" ; then
+if test "$piece" != "libs-extern" -a "$piece" != "libs_extern" ; then
     rm -f $DEST/inc/external/build.lst
     rm -f $DEST/inc/external/deliver.log
 fi