Changeset 619 for trunk

Timestamp:

Oct 10, 2002, 5:01:08 PM (22 years ago)

Author:

joergs

Message:

Bugfixing: Pfade, return code, Anpassungen an 8.1

Location:

trunk/technical/common/build

Files:

• build.sh (modified) (5 diffs)
• buildall.pl (modified) (4 diffs)

trunk/technical/common/build/build.sh

@@ -1 +1 @@
 #!/bin/bash
 # Remote build script (iboernig@suse.de)
-# $Id: build.sh,v 1.10 2002/10/08 16:30:28 joergs Exp $
+# $Id: build.sh,v 1.11 2002/10/10 15:01:08 joergs Exp $
 #
 # Kurze Featuritis:
@@ -26 +26 @@
 BUILDTEMP=abuildtmp
 BUILDUSER=$USER
-# setzen der Zielarchtitektur. Wird bei Bedarf durch noarch überschrieben.
-ARCH=i386
-OS_TYPE=sles
-OS_VER=7
 
-[ -z "$BUILD_MODE" ] && BUILD_MODE="--clean"
-[ -z "$BUILD_DIST" ] && BUILD_DIST="${OS_TYPE}${OS_VER}-$ARCH"
+[ -z "$BUILD_MODE" ] && BUILD_MODE="--verify"
+[ -z "$BUILD_DIST" ] && BUILD_DIST="sles7-i386+update"
 [ -z "$BUILD_ROOT" ] && BUILD_ROOT="/abuild/buildsystem.$BUILDHOST.$USER.$BUILD_DIST.smartclient"
 [ -z "$BUILD_PREPARE_SPEC" ] && BUILD_PREPARE_SPEC="no"
 
-[ -z $DEST_DIR ] && DEST_DIR="/tmp/smartclient_build/$BUILD_DIST"
+[ -z $DEST_DIR ] && DEST_DIR="/tmp/smartclient_build/"
 
 # Hier gehts los:
@@ -52 +48 @@
 VERSION=$(awk '/^Version:/ {print $2}' <$SPECFILE)
 
-BUILDARCH=$(awk '/^BuildArch:/ {print $2}' <$SPECFILE)
-[ -z "$BUILDARCH" ] && BUILDARCH=$ARCH
+ERROR=0
 
-echo $PACKAGE $VERSION $ARCH $BUILDARCH
+echo $PACKAGE $VERSION $BUILD_DIST
 
 # Cleaning up and install tempdir
 ssh -${SSH_VERSION} ${FQBUILDHOST} "rm -r ${BUILDTEMP}/src/${PACKAGE}-${VERSION}; \
-                        mkdir -p ${BUILDTEMP}/src/${PACKAGE}-${VERSION}\
-                        mkdir -p ${BUILDTEMP}/${ARCH}/${OS_TYPE}/${OS_VER}";
+mkdir -p ${BUILDTEMP}/src/${PACKAGE}-${VERSION} ${BUILDTEMP}/${BUILD_DIST}";
 
 scp -oProtocol=$SSH_VERSION $TARFILE $SPECFILE $DIFFILES $PATCHFILES $RESTFILES ${FQBUILDHOST}:${BUILDTEMP}/src/${PACKAGE}-${VERSION}
@@ -78 +72 @@
 
 cd ~${BUILDUSER}/${BUILDTEMP}/src/${PACKAGE}-${VERSION}
-build $BUILD_MODE       --prefer-rpms ~${BUILDUSER}/${BUILDTEMP}/$ARCH/$OS_TYPE/$OS_VER 
+build $BUILD_MODE --prefer-rpms ~${BUILDUSER}/${BUILDTEMP}/${BUILD_DIST}
 EOF
 
@@ -90 +84 @@
         . ~$BUILDUSER/${BUILDTEMP}/src/${PACKAGE}-${VERSION}/buildscript
 ssh -oProtocol=$SSH_VERSION ${FQBUILDHOST} \
-        cp ${BUILD_ROOT}/usr/src/packages/RPMS/${BUILDARCH}/${PACKAGE}-${VERSION}-*.${BUILDARCH}.rpm ${BUILDTEMP}/$ARCH/$OS_TYPE/$OS_VER/
+        cp ${BUILD_ROOT}/usr/src/packages/RPMS/*/${PACKAGE}-${VERSION}-*.*.rpm ${BUILDTEMP}/${BUILD_DIST}/
 
 mkdir -p ${DEST_DIR}/src
-
-if !(scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/SRPMS/${PACKAGE}-${VERSION}-*.src.rpm ${DEST_DIR}/src;)
-    then 
-    echo "ERROR while building packet $PACKAGE";
-    echo "";sleep 1;echo "";sleep 1;echo "";sleep 1;echo "";sleep 1;echo "";sleep 1;
-    sleep 10;
+if !(scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/SRPMS/${PACKAGE}-${VERSION}-*.src.rpm ${DEST_DIR}/src ); then 
+        ERROR=1
 fi
 
-mkdir -p ${DEST_DIR}/$ARCH/$OS_TYPE/$OS_VER
-if !(scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/RPMS/${BUILDARCH}/${PACKAGE}-${VERSION}-*.${BUILDARCH}.rpm ${DEST_DIR}/$ARCH/$OS_TYPE/$OS_VER;)
-    then 
-    echo "ERROR while building packet $PACKAGE";
-    echo "";sleep 1;echo "";sleep 1;echo "";sleep 1;echo "";sleep 1;echo "";sleep 1;
-    sleep 10;
-    exit 1;
+mkdir -p ${DEST_DIR}/${BUILD_DIST}
+if !(scp -oProtocol=$SSH_VERSION root@${FQBUILDHOST}:${BUILD_ROOT}/usr/src/packages/RPMS/*/${PACKAGE}-${VERSION}-*.*.rpm ${DEST_DIR}/${BUILD_DIST} ); then 
+        ERROR=2
 fi
 
-echo "Build of ${PACKAGE} completed!"
-echo "Packages can be found in ${DEST_DIR}"
+if [ $ERROR -ne 0 ]; then
+    echo "ERROR while building packet $PACKAGE";
+        for i in `seq 5`; do
+                echo -n ""; sleep 1;
+        done
+else
+        echo "Build of ${PACKAGE} completed!"
+        echo "Packages can be found in ${DEST_DIR}"
+fi
+
+exit $ERROR

trunk/technical/common/build/buildall.pl

@@ -2 +2 @@
 # automatisches buildskript fuer smartclient
 # liest die konfiguration aus der mit -b übergebenen Datei
-# $Id: buildall.pl,v 1.13 2002/10/08 10:20:39 ahuck Exp $
+# $Id: buildall.pl,v 1.14 2002/10/10 15:01:08 joergs Exp $
 # Philipp Storz, SuSE Linux AG 
 # pstorz@suse.de
@@ -83 +83 @@
 
   
-#  system "./test.sh";
   $_=$ArrayofBuilds[$i][0];
   print "$_ \n";
@@ -104 +103 @@
   system "xterm -T \"build log for PACKET: $mypath    ARCH:$ArrayofBuilds[$i][1] \" -e less +F $workdir/$mypath/$logfilename &";
   print "++++++++++++++++++++++++++++++++++++++++++\n";
-  $retval = system "cd $mypath; $build >$logfilename 2>&1;";
+  $retval = system "cd $mypath && $build >$logfilename 2>&1";
   }
   else
   {
-    $retval = system "cd $mypath; $build |tee $logfilename";
+    $retval = system "cd $mypath && $build | tee $logfilename";
   }
-
-
-
-#  system "xterm -T \"build log for PACKET: $mypath    ARCH:$ArrayofBuilds[$i][1] \" -e less +F $workdir/$mypath/$logfilename &";
-#  print "++++++++++++++++++++++++++++++++++++++++++\n";
-#  $retval = system "cd $mypath; $build >$logfilename 2>&1;";
-# $retval = system "./exit.sh 2>&1 > $logfilename;";
 
 
  if ($retval == 0)
    {
-     $ArrayofBuilds[$i][3]= "SUCESS $ArrayofBuilds[$i][0]: OK";
+     $ArrayofBuilds[$i][3]= "SUCCESS $ArrayofBuilds[$i][0]: OK";
      print"******                                                      ******\n";
      print"******   building of $ArrayofBuilds[$i][0]: OK                    \n" ;
@@ -150 +142 @@
     $~="TABELLE";
     write;
-#    print("$ArrayofBuilds[$i][0]:Result: $ArrayofBuilds[$i][3]");
+        # print("$ArrayofBuilds[$i][0]:Result: $ArrayofBuilds[$i][3]");
   }