Changeset 726 for trunk/technical/common

Timestamp:

Oct 2, 2008, 6:52:33 PM (16 years ago)

Author:

joergs

Message:

bugfix: more changes for checking for existing tar.bz2

File:

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

trunk/technical/common/build/svn_build_prepare.sh

@@ -9 +9 @@
 #   1   build directory already up-to-date. Nothing to do.
 # 255   error
+
+# TODO: 
+#   needs force parameter for tar.bz2 creation
 
 BUILDUSER=$USER
@@ -49 +52 @@
     fi
 else
-    cp -a $SPECFILE ${BUILDTEMP}/src/${PACKAGE}
-    
     # uses Subversion (svn) to generate more information for the RPM
     if [ "$BUILD_USES_SVN" = "yes" ]; then
@@ -79 +80 @@
             fi
         fi
+
         if [ "$SVN_BUILD_RELEASE" ]; then
             # Release will be overwritten bei OpenSUSE build service,
@@ -84 +86 @@
             VERSION_ORIG=$VERSION
             VERSION=$VERSION.$SVN_BUILD_RELEASE
-            #sed "s/^Release:.*/Release: $SVN_BUILD_RELEASE/ig" $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-            #sed -r "s/^(Version:\s*\S*)/\1.$SVN_BUILD_RELEASE/ig"  $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-            sed "s/^Version:.*/Version: $VERSION/ig" $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
         fi
         echo "SVN_BUILD_RELEASE: $SVN_BUILD_RELEASE"
@@ -93 +92 @@
         # changelog header
         DATE=`unset LANG; date +"%a %b %d %Y"`
-        echo -e "* $DATE -\n" > Changes
+        echo -e "* $DATE svn_build\n" > Changes
         echo "- Subversion status:" >> Changes
         # additional infos for the Changes file (see if everything is checked in)
@@ -103 +102 @@
         cat ChangeLog >> Changes
         
-        # if there is no changelog section in the spec file,
-        # also append the Changes there
-        if ! grep -q -i "%changelog" $SPECFILE ; then
-            # paste "Changes" into SPEC file. 
-            echo "%changelog" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-            # without trailing *, except for the initial
-            echo -n "*" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-            cat Changes | sed 's/\(^[\*]\+\)//g' >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-        fi
         printf "done\n"
     fi
@@ -142 +132 @@
         exit 255
     fi
+
+    
+    echo $SVN_BUILD_RELEASE
+    if [ "$SVN_BUILD_RELEASE" ]; then
+        # Release will be overwritten bei OpenSUSE build service,
+        # therefore we add SVN_BUILD_RELEASE to Version
+        #sed "s/^Release:.*/Release: $SVN_BUILD_RELEASE/ig" $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+        #sed -r "s/^(Version:\s*\S*)/\1.$SVN_BUILD_RELEASE/ig"  $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+        sed "s/^Version:.*/Version: $VERSION/ig" $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+    else
+        cp -a $SPECFILE ${BUILDTEMP}/src/${PACKAGE}
+    fi
+
+    # if there is no changelog section in the spec file,
+    # also append the Changes there
+    if ! grep -q -i "%changelog" $SPECFILE ; then
+        # paste "Changes" into SPEC file. 
+        echo "%changelog" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+        # without trailing *, except for the initial
+        echo -n "*" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+        cat Changes | sed 's/\(^[\*]\+\)//g' >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+    fi
+
 fi