Author: benm
Date: 2005-04-10 16:17:03 -0400 (Sun, 10 Apr 2005)
New Revision: 42766

Modified:
   trunk/release/packaging/build
   trunk/release/packaging/defs/libgdiplus
   trunk/release/packaging/defs/mono-1.1
   trunk/release/packaging/do-build
   trunk/release/packaging/multi-build
Log:
some cleanup

Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build       2005-04-10 20:07:36 UTC (rev 42765)
+++ trunk/release/packaging/build       2005-04-10 20:17:03 UTC (rev 42766)
@@ -11,32 +11,43 @@
 #
 #
 
+distro=$1
+package=$2
+
 usage()
 {
        echo "Usage is: build configuration package"
 }
 
-if test x$2 = x; then
+if test x$package = x; then
     usage
     exit 1;
 fi
 
-if test -f status/$1; then
+if test -f status/$distro; then
    echo There is already a build in progress on $1
    exit 1
 fi
 
 . conf/$1
-package=$2
 
 scp do-build $target_host:$jaildir/tmp 
 remote_cmd="$chroot $jaildir sh -x /tmp/do-build $package"
-(echo > status/$1; ssh $target_host "sudo $remote_cmd" >& logs/$package-$1; rm 
status/$1)
-scp $target_host:$jaildir/tmp/status /tmp/status-$1-$2
-if grep -q failure /tmp/status-$1-$2; then
-   echo Build failed, see log in logs/$1 for details
+(echo > status/$distro; ssh $target_host "sudo $remote_cmd" >& 
logs/$package-$distro; rm status/$distro)
+scp $target_host:$jaildir/tmp/status /tmp/status-$distro-$package
+if grep -q failure /tmp/status-$distro-$package; then
+   echo Build failed, see log in logs/$package-$distro for details
    exit 1;
 fi
 
-mkdir -p packages/$1/$2
-scp $target_host:$jaildir/tmp/root/built-packages/* packages/$1/$2
+. defs/$package
+
+get_destroot $distro
+
+mkdir -p packages/$DEST_ROOT/$package
+scp $target_host:$jaildir/tmp/root/built-packages/* 
packages/$DEST_ROOT/$package
+
+one_rpm=`ls -1 packages/$DEST_ROOT/$package/*.rpm | head -n1`
+ver=`rpm -qp --queryformat '%{VERSION}' $one_rpm 2>/dev/null`
+mkdir -p packages/$DEST_ROOT/$package/$ver
+mv packages/$DEST_ROOT/$package/*.rpm packages/$DEST_ROOT/$package/$ver
\ No newline at end of file

Modified: trunk/release/packaging/defs/libgdiplus
===================================================================
--- trunk/release/packaging/defs/libgdiplus     2005-04-10 20:07:36 UTC (rev 
42765)
+++ trunk/release/packaging/defs/libgdiplus     2005-04-10 20:17:03 UTC (rev 
42766)
@@ -1,13 +1,16 @@
-# 
-# Build Buddy Package: mono-1.1
-#
-nld-9-x86_64
-fedora-3-i386
-sles-9-x86_64
-redhat-9-i386
-sles-9-i586
-rhel-3-i386
-suse-90-i586
-rhel-4-i386
-suse-91-i586
-suse-92-i586
+BUILD_HOSTS=(
+        fedora-3-i386
+        nld-9-x86_64
+        redhat-9-i386
+        rhel-3-i386
+        rhel-4-i386
+        sles-9-i586
+        sles-9-x86_64
+        suse-90-i586
+        suse-91-i586
+        suse-92-i586
+)
+
+get_destroot () {
+       DEST_ROOT=$1
+}
\ No newline at end of file

Modified: trunk/release/packaging/defs/mono-1.1
===================================================================
--- trunk/release/packaging/defs/mono-1.1       2005-04-10 20:07:36 UTC (rev 
42765)
+++ trunk/release/packaging/defs/mono-1.1       2005-04-10 20:17:03 UTC (rev 
42766)
@@ -1,14 +1,11 @@
-# 
-# Build Buddy Package: mono-1.1
-#
-nld-9-x86_64
-fedora-3-i386
-sles-8-i386
-sles-9-x86_64
-redhat-9-i386
-sles-9-i586
-rhel-3-i386
-suse-90-i586
-rhel-4-i386
-suse-91-i586
-suse-92-i586
+BUILD_HOSTS=(
+        redhat-9-i386
+        sles-9-x86_64
+)
+
+get_destroot () {
+       case "$1" in
+               *-i[35]86) DEST_ROOT=x86 ;;
+                *-x86_64) DEST_ROOT=x86_64 ;;
+       esac
+}
\ No newline at end of file

Modified: trunk/release/packaging/do-build
===================================================================
--- trunk/release/packaging/do-build    2005-04-10 20:07:36 UTC (rev 42765)
+++ trunk/release/packaging/do-build    2005-04-10 20:17:03 UTC (rev 42766)
@@ -16,4 +16,7 @@
 cvs co mono-conf || exit 1
 cd mono-conf/$1 || exit 1
 bb_redo || exit 1
+
+rpm -rf /tmp/root/built-packages/*.src.rpm
+
 echo success > /tmp/status
\ No newline at end of file

Modified: trunk/release/packaging/multi-build
===================================================================
--- trunk/release/packaging/multi-build 2005-04-10 20:07:36 UTC (rev 42765)
+++ trunk/release/packaging/multi-build 2005-04-10 20:17:03 UTC (rev 42766)
@@ -1,16 +1,19 @@
 #!/bin/sh
 
 rm -f bscripts/*
-for i in $*; do
-       for def in `cat defs/$i | grep -v '^#'`; do
-               . conf/$def
-               echo sh build $def $i >> bscripts/$target_host
-               if echo $hosts | grep -v $target_host > /dev/null;  then
+for product in $*; do
+       . defs/$product 
+       
+       for target_distro in [EMAIL PROTECTED]; do
+               . conf/$target_distro
+               
+               echo sh build $target_distro $product >> bscripts/$target_host
+               if echo $hosts | grep -qv $target_host;  then
                        hosts="$hosts $target_host";
                fi
        done
 done
-echo Hosts to run on: 
+
 count=0
 for i in `echo $hosts`; do
        mv bscripts/$i bscripts/$count

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to