Changeset 695

Timestamp:

Nov 21, 2004, 11:01:59 PM (19 years ago)

Author:

joergs

Message:

optimized: skip building rpms that do already exist in the current version

Location:

trunk/technical/common/build

Files:

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

trunk/technical/common/build/build.sh

@@ -24 +24 @@
 # %users  ALL=(ALL)       NOPASSWD: /bin/su
 # for automatic building
+#
+# return codes:
+# 0: success
+# 1: skipped (current RPM already in dest dir)
+# >1: error
+
 
 CONFIG_FILE=/usr/local/etc/build
@@ -98 +104 @@
 
 if [ "$1" ]; then
-        cp -a "$1" ${BUILDTEMP}/src/${PACKAGE}
-        cd ${BUILDTEMP}/src/${PACKAGE}; rpm2cpio $1 | cpio -i
+        EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/`echo $1 | sed 's/\.src\./.*./'`
+        if [ -f $EXPECTED_DEST_RPM_FILENAME ]; then
+                echo
+                echo "Build of \"${PACKAGE}\" unnecessary. Current RPM already at " $EXPECTED_DEST_RPM_FILENAME
+                echo
+                exit 1
+        else
+                cp -a "$1" ${BUILDTEMP}/src/${PACKAGE}
+                cd ${BUILDTEMP}/src/${PACKAGE}; rpm2cpio $1 | cpio -i
+        fi
 else
         cp -a $SPECFILE ${BUILDTEMP}/src/${PACKAGE}
@@ -111 +125 @@
                 # in case of local modification a "m" is added to the release number
                 SVN_BUILD_MODIFIED=$(svn status -v | grep "^ *M" | wc -l)
-                if [ $SVN_BUILD_MODIFIED -gt 0 ]; then
+                # checks if a file is commited, 
+                # but update on its directory is not performed
+                SVN_LAST_MODIFICATION=$(svn status -v | sed -n 's/^ *[0-9]* *\([0-9]*\) .*/\1/p' | sort -n | tail -1)
+                if [ $SVN_BUILD_MODIFIED -gt 0 ]; then  
                         SVN_BUILD_RELEASE=${SVN_BUILD_RELEASE}m
+                elif [ $SVN_LAST_MODIFICATION -ne $SVN_BUILD_RELEASE ]; then
+                        SVN_BUILD_RELEASE=${SVN_BUILD_RELEASE}p
                 else # check if RPM has been build already
                         EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-${VERSION}-${SVN_BUILD_RELEASE}.*.rpm
@@ -118 +137 @@
                                 echo
                                 echo "Build of \"${PACKAGE}\" unnecessary. Current RPM already at " $EXPECTED_DEST_RPM_FILENAME
-                                echo "verify if 'svn update' has been performed on the source directory"
                                 echo
-                                exit
+                                exit 1
                         fi                      
                 fi
@@ -174 +192 @@
 #!/bin/bash
 # local buildscript
-#. /work/src/bin/.profile
 export BUILD_ROOT=$BUILD_ROOT
 export BUILD_DIST=$BUILD_DIST
@@ -190 +207 @@
 mkdir -p ${DEST_DIR}/src
 # delete all old versions of this package
-rm -f ${DEST_DIR}/src/${PACKAGE}-*.src.rpm
+for i in ${DEST_DIR}/src/${PACKAGE}-*.src.rpm; do
+        if [ -f $i -a ${PACKAGE} = "`rpm -qp --qf "%{NAME}\n" $i`" ]; then
+                rm $i
+        fi
+done
+#rm -f ${DEST_DIR}/src/${PACKAGE}-*.src.rpm
 
 if !(cp -a ${BUILD_ROOT}/usr/src/packages/SRPMS/${PACKAGE}-${VERSION}-*.src.rpm ${DEST_DIR}/src 2> /dev/null); then 
-        ERROR=1
+        ERROR=4
 fi
 
 mkdir -p ${DEST_DIR}/${BUILD_DIST}
 # delete all old versions of this package
-rm -f ${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-*.rpm
+for i in ${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-*.rpm; do
+        if [ -f $i -a ${PACKAGE} = "`rpm -qp --qf "%{NAME}\n" $i`" ]; then
+                rm $i
+        fi
+done
+#rm -f ${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-*.rpm
 
 if !(cp -a ${BUILD_ROOT}/usr/src/packages/RPMS/*/${PACKAGE}*${VERSION}-*.*.rpm ${DEST_DIR}/${BUILD_DIST} ); then 
-        ERROR=2
+        ERROR=8
 fi
 

trunk/technical/common/build/buildall.pl

@@ -40 +40 @@
 getopts('xb:d:');
 
-
+my $skipped_last = 0;
 
 if (!$opt_b && !$opt_d)  {
@@ -105 +105 @@
   $mypath = $src_root.$ArrayofBuilds[$i][0];
 
-  if ($ArrayofBuilds[$i][2])
+  if( $ArrayofBuilds[$i][2] && !$skipped_last )
     {
       $ENV{'BUILD_MODE'}=$ArrayofBuilds[$i][2];
@@ -111 +111 @@
   else 
     {
-      $ENV{'BUILD_MODE'}="--clean";
+      $ENV{'BUILD_MODE'}="--verify";
     }
   $ENV{'BUILD_DIST'}=$ArrayofBuilds[$i][1];
@@ -160 +160 @@
         print LOG_FD if $do_log;
   }
-  close PIPE; my $retval=$?;
+  close PIPE; my $retval=$?>>8;
   close LOG_FD if $do_log;
   
-  if ( $retval == 0 )
-   {
+  if ( $retval == 0 ) {
      $ArrayofBuilds[$i][3] = "OK";
      print"******                                                      ******\n";
      print"******   building of $ArrayofBuilds[$i][0]: OK                    \n" ;
      print"******                                                      ******\n";
-   }
-  else
-   {
+  } elsif ( $retval == 1 ) {
+        $ArrayofBuilds[$i][3] = "skipped";
+        $skipped_last = 1;
+  } else {
      $ArrayofBuilds[$i][3] = "*FAILED*";
      print"******                                                      ******\n";