Changeset 724 for trunk/technical/common

Timestamp:

Oct 2, 2008, 6:19:22 PM (16 years ago)

Author:

joergs

Message:

in case of SOURCES, checks if tar.bz2 really has to be recreated. If not, exit 1. Removed legacy TAR creating method by Makefile, because this isn't used for quite a while

File:

• trunk/technical/common/build/svn_build_prepare.sh (modified) (5 diffs)

trunk/technical/common/build/svn_build_prepare.sh

@@ -4 +4 @@
 
 # $Id$
+
+# Exitcodes:
+#   0   normal end. Has created build directory
+#   1   build directory already up-to-date. Nothing to do.
+# 255   error
 
 BUILDUSER=$USER
@@ -25 +30 @@
 if [ -z "$PACKAGE" ]; then
     echo "nothing to build found!"
-    exit 1
+    exit 255
 fi
 
-rm -rf ${BUILDTEMP}/src/${PACKAGE}
-mkdir -p ${BUILDTEMP}/src/${PACKAGE}
 
 
@@ -40 +43 @@
         exit 1
     else
+        rm -rf ${BUILDTEMP}/src/${PACKAGE}
+        mkdir -p ${BUILDTEMP}/src/${PACKAGE}
         cp -a "$1" ${BUILDTEMP}/src/${PACKAGE}
         cd ${BUILDTEMP}/src/${PACKAGE}; rpm2cpio $1 | cpio -i
@@ -64 +69 @@
             REBUILD="yes"
         else # check if RPM has been build already
-            # TODO: this chekc is broken for OpenSUSE build service,
+            # TODO: this check is broken for OpenSUSE build service,
             #       because version is changed later on
             EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-${VERSION}-${SVN_BUILD_RELEASE}.*.rpm
@@ -115 +120 @@
     if [ -r "SOURCES" ]; then
         # create a tar file from the sources
-        printf "creating $PACKAGE-$VERSION.tar.bz2:\n"
-        tar cvjf ${BUILDTEMP}/src/${PACKAGE}/$PACKAGE-$VERSION.tar.bz2 --files-from SOURCES --exclude .svn --exclude "*~"
-    
+        printf "creating $PACKAGE-$VERSION.tar.bz2: "
+
+        if [ "$REBUILD" -o ! -r ${BUILDTEMP}/src/${PACKAGE}/$PACKAGE-$VERSION.tar.bz2 ]; then
+            rm -rf ${BUILDTEMP}/src/${PACKAGE}
+            mkdir -p ${BUILDTEMP}/src/${PACKAGE}
+            tar cvjf ${BUILDTEMP}/src/${PACKAGE}/$PACKAGE-$VERSION.tar.bz2 --files-from SOURCES --exclude .svn --exclude "*~"
+        else
+            printf "already exists. Skipped\n"
+            exit 1
+        fi
     elif [ -r "SPECSOURCES" ]; then
         # SPECSOURCES has to list the files 
         # that are referenced in the .spec file
         # these files are copied to the build environment
+        rm -rf ${BUILDTEMP}/src/${PACKAGE}
+        mkdir -p ${BUILDTEMP}/src/${PACKAGE}
         cp -av `cat SPECSOURCES` ${BUILDTEMP}/src/${PACKAGE}
     
     else 
-        # legacy method: 
-        # call the existing Makefile 
-        # to generate a tar file    
-        test -e Makefile && make
-        TARFILE=$(ls  *.tar.[gb]z*| awk '{print $1}')
-        cp -av $TARFILE ${BUILDTEMP}/src/${PACKAGE}
+        printf "error: neither SOURCES nor SPECSOURCES file found. One of these is required. Exiting\n"
+        exit 255
     fi
 fi