ooo-build r13050 - in trunk: . bin/piece doc patches/dev300

[michael svn gnome org]

Author: michael
Date: Thu Jul  3 15:23:52 2008
New Revision: 13050
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13050&view=rev

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

        * bin/piece/*: update.
        * patches/src680/piece-checkdll.diff,
        * patches/src680/piece-build.diff,
        * apply: add 'Piece' distro & add more work.



Added:
   trunk/bin/piece/build-libs_extern   (contents, props changed)
   trunk/bin/piece/install-libs_extern   (contents, props changed)
   trunk/patches/dev300/piece-build.diff
   trunk/patches/dev300/piece-checkdll.diff
Modified:
   trunk/ChangeLog
   trunk/bin/piece/build-ure
   trunk/bin/piece/sys-setup
   trunk/doc/split.txt
   trunk/patches/dev300/apply

Added: trunk/bin/piece/build-libs_extern
==============================================================================
--- (empty file)
+++ trunk/bin/piece/build-libs_extern	Thu Jul  3 15:23:52 2008
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# build script - invoked from a spec file to build the project
+
+for a in *; do
+	if test "$a" != "applied_patches"; then
+		cd $a || exit 1;
+		perl $SOLARENV/bin/build.pl --all:$a $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+		perl $SOLARENV/bin/build.pl --all:$a --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+		cd ..
+	fi
+done

Modified: trunk/bin/piece/build-ure
==============================================================================
--- trunk/bin/piece/build-ure	(original)
+++ trunk/bin/piece/build-ure	Thu Jul  3 15:23:52 2008
@@ -5,6 +5,7 @@
 for a in *; do
 	if test "$a" != "applied_patches"; then
 		cd $a || exit 1;
+		perl $SOLARENV/bin/build.pl --all:$a $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 		perl $SOLARENV/bin/build.pl --all:$a --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 		cd ..
 	fi

Added: trunk/bin/piece/install-libs_extern
==============================================================================
--- (empty file)
+++ trunk/bin/piece/install-libs_extern	Thu Jul  3 15:23:52 2008
@@ -0,0 +1,4 @@
+SRCDIR="$SOLARVER/$INPATH"
+DEST="$OO_SOLVERDIR/solver"
+mkdir -p $DEST
+cp -R $SRCDIR/* $DEST

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Thu Jul  3 15:23:52 2008
@@ -17,6 +17,8 @@
 # create a new local solver
 export SOLARVER="$SRC_ROOT/solver/$UPD"
 export SOLARENV="$DEV_DIR/../solenv"
+export MAKEDEPEND="$DEV_DIR/bin/makedepend"
+export SYSTEM_SOLVER="$DEV_DIR"
 
 export SOLARVERSION="$SOLARVER"
 export SOLARENVINC="$SOLARENV/inc"

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Thu Jul  3 15:23:52 2008
@@ -243,4 +243,3 @@
 	+ rename each piece into it's own directory:
 		+ dev300-m22-ure [etc.]
 		+ so RPMs can build happily together in parallel on the same host.
-

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul  3 15:23:52 2008
@@ -40,6 +40,8 @@
 System : SystemBuildBits
 # Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
 Sdk : SdkFixes
+# special fragmented build patch distro
+Piece : PieceBits
 #Localize
 Localize : LocalizeLayout, LocalizeFixes
 # patches touching swext which is not in the OpenOffice2 alias yet.
@@ -2333,3 +2335,7 @@
 libwps-testing.diff
 writerperfect-testing.diff
 
+
+[ PieceBits ]
+piece-build.diff
+piece-checkdll.diff

Added: trunk/patches/dev300/piece-build.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-build.diff	Thu Jul  3 15:23:52 2008
@@ -0,0 +1,40 @@
+--- solenv/bin/build.pl
++++ solenv/bin/build.pl
+@@ -2158,21 +2189,28 @@
+     my $old_fh = select(STDOUT);
+    
+     # First try to get global depencies from solver's build.lst if such exists
++    my @search_dirs;
+     my $solver_inc_dir = "$ENV{SOLARVER}/common";
+     $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT});
+     $solver_inc_dir .= '/inc';
+     $solver_inc_dir .= $ENV{UPDMINOREXT} if (defined $ENV{UPDMINOREXT});
+     $solver_inc_dir .= "/$module";
+-    $solver_inc_dir = CorrectPath($solver_inc_dir);
+     $dead_parents{$module}++;
++    push @search_dirs, CorrectPath($solver_inc_dir);
++    if (defined $ENV{SYSTEM_SOLVER}) {
++	push (@search_dirs, CorrectPath($ENV{SYSTEM_SOLVER}."/inc/$module"));
++    }
++
++    print "Fetching dependencies for module $module from solvers @search_dirs...\n";
+-    print "Fetching dependencies for module $module from solver...";
+-    foreach (@possible_build_lists) {
+-        my $possible_build_lst = "$solver_inc_dir/$_";
+-        if (-e $possible_build_lst) {
+-            print " ok\n";
+-            select($old_fh);
+-            return $possible_build_lst;
+-        };
++    foreach my $dir (@search_dirs) {
++	foreach (@possible_build_lists) {
++	    my $possible_build_lst = "$dir/$_";
++	    if (-e $possible_build_lst) {
++		print " ok\n";
++		select($old_fh);
++		return $possible_build_lst;
++	    };
++	}
+     }
+     print " failed...\n";
+     print "Fetching from CVS... ";

Added: trunk/patches/dev300/piece-checkdll.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-checkdll.diff	Thu Jul  3 15:23:52 2008
@@ -0,0 +1,11 @@
+--- solenv/bin/checkdll.sh
++++ solenv/bin/checkdll.sh
+@@ -37,7 +37,7 @@
+     exit 1
+ }
+ 
+-checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
++checkdll=`which checkdll`
+ 
+ if [ -x $checkdll ]; then
+     while :