Changeset 734 for trunk/technical

Timestamp:

Jan 26, 2009, 4:39:46 PM (16 years ago)

Author:

joergs

Message:

cleanup

Location:

trunk/technical/common/build

Files:

• build.sh (modified) (5 diffs)
• buildscript (modified) (1 diff)

trunk/technical/common/build/build.sh

@@ -54 +54 @@
 [ -z $DEST_DIR ] && DEST_DIR="/tmp/build.$BUILDUSER"
 BUILDTEMP=$DEST_DIR/buildsrc/
-#BUILDSCRIPT=$BUILDTEMP/buildscript.$$
 BUILDVARS=$BUILDTEMP/build.vars
 
@@ -63 +62 @@
 if [ -r $CONFIG_FILE ]; then
         source $CONFIG_FILE
-    # case "$BUILD_DIST" in
-    #     "9.0-i386")   
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_9_0_i386 ;;
-    #     "sles8-i386") 
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_sles8_i386 ;;
-    #     "sles8-i386+update")  
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_sles8_i386_update ;;
-    #     "9.1-i386")   
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_9_1_i386 ;;
-    #     "sles9-i386") 
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_sles9_i386 ;;
-    #     "9.2-i386")   
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_9_2_i386 ;;
-    #     "9.3-i386")   
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_9_3_i386 ;;
-    #     "10.0-i386")
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_10_0_i386 ;;
-    #     "10.1-i386")
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_10_1_i386 ;;
-    #     "10.2-i386")
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_10_2_i386 ;;
-    #     "10.3-i386")
-    #         BUILD_RPMS_TEST=$BUILD_RPMS_10_3_i386 ;;
-    # esac
-
     MOD_BUILD_DIST=`sed "s/[-+.]/_/g" <<< $BUILD_DIST`
     echo MOD_BUILD_DIST: $MOD_BUILD_DIST
     eval BUILD_RPMS_TEST=\$BUILD_RPMS_$MOD_BUILD_DIST
-    #echo $BUILD_RPMS_TEST
 
         if [ "$BUILD_RPMS_TEST" ]; then
@@ -128 +101 @@
 
 
-rm -rf ${BUILDTEMP}/src/${PACKAGE};
+rm -rf ${BUILDTEMP}/src/${PACKAGE}
 mkdir -p ${BUILDTEMP}/src/${PACKAGE}
-# ${BUILDTEMP}/${BUILD_DIST};
+
 
 if [ "$1" ]; then
@@ -221 +194 @@
 fi
 
-# # create buildscript
-# cat > $BUILDSCRIPT <<EOF
-# #!/bin/bash
-# # local buildscript
-# export BUILD_ROOT=$BUILD_ROOT
-# export BUILD_DIST=$BUILD_DIST
-# export BUILD_RPMS=${DEST_DIR}/${BUILD_DIST}:$BUILD_RPMS
-# export BUILD_PREPARE_SPEC=$BUILD_PREPARE_SPEC
-# 
-# cd ${BUILDTEMP}/src/${PACKAGE}
-# $BUILD_CMD $BUILD_MODE
-# EOF
-# 
-# chmod a+x $BUILDSCRIPT
-# sudo /bin/su -c $BUILDSCRIPT
-# rm -f $BUILDSCRIPT
-
 # create file for buildvars (see $BUILDSCRIPT)
 cat > $BUILDVARS <<EOF
@@ -251 +207 @@
 EOF
 
+# starting Suse build (as root)
 sudo $BUILDSCRIPT $BUILDVARS
 #rm -f $BUILDVARS

trunk/technical/common/build/buildscript

@@ -18 +18 @@
         else
                 echo "File $1 not readable"
-                exit 2
+                exit 3
         fi
 else
         echo "usage: `basename $0` <file for build-definitions>"
-        exit 1
+        exit 2
 fi