Changeset 723 for trunk

Timestamp:

Oct 2, 2008, 5:51:33 PM (16 years ago)

Author:

joergs

Message:

trying to avoid new version for the build server, when nothing has changed. Unfortunally, transfering data to the build server (tar.bz2) changes the file, resulting in a new commit every time the script is called.

Location:

trunk/technical/common/build

Files:

• svn_build_prepare.sh (modified) (2 diffs)
• svn_osc_build.sh (modified) (1 diff)

trunk/technical/common/build/svn_build_prepare.sh

@@ -59 +59 @@
         if [ $SVN_BUILD_MODIFIED -gt 0 ]; then  
             SVN_BUILD_RELEASE=${SVN_BUILD_RELEASE}m
+            REBUILD="yes"
         elif [ $SVN_LAST_MODIFICATION -ne $SVN_BUILD_RELEASE ]; then
             SVN_BUILD_RELEASE=${SVN_BUILD_RELEASE}p
+            REBUILD="yes"
         else # check if RPM has been build already
             # TODO: this chekc is broken for OpenSUSE build service,
@@ -113 +115 @@
     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 "*~"
     

trunk/technical/common/build/svn_osc_build.sh

@@ -62 +62 @@
 
 cd $OSC_PACKAGE
-rsync -a --delete $BUILDSRC_DIR/. . --exclude .osc
+# rsync -a: -rlptgoD
+# but we don't want to check for timestamps
+# TODO: if our data (tar.bz2) is transfered to the
+#       openSUSE server, the size changed!!! Why?
+#       Therefore every new build run
+#       results in a new commit for the build server
+rsync --checksum -r -v --delete $BUILDSRC_DIR/. . --exclude .osc
 
 # osc build DIST ARCH