Changeset 722 for trunk/technical/common

Timestamp:

Oct 2, 2008, 5:22:18 PM (16 years ago)

Author:

joergs

Message:

optimized, using modified Version instead of Release

File:

• trunk/technical/common/build/svn_osc_build.sh (modified) (3 diffs)

trunk/technical/common/build/svn_osc_build.sh

@@ -23 +23 @@
 OSC_PACKAGE=`cat OSC_PACKAGE`
 
+svn_build_prepare.sh $* || {
+    echo "failed to prepare sources"
+    exit 1
+}
 
-
+# TODO: get this info from svn_build_prepare.sh? seperate script?
 if [ -z "$1" ]; then
     # without parameter, we are in source directory
     SPECFILE=$(ls *.spec | awk '{print $1}')
     PACKAGE=$(sed -n -e 's/^Name:\W*//pi' <$SPECFILE)
-    VERSION=$(sed -n -e 's/^Version:\W*//pi' <$SPECFILE)
-elif [ -r "$1" ]; then
-    # parameter is src.rpm file
-        PACKAGE=`rpm -qp --qf "%{NAME}" $1`
-        VERSION=`rpm -qp --qf "%{VERSION}" $1`
+    # use Version from BUILDSRC, 
+    # because it has been modified by svn_build_prepare
+    #VERSION=$(sed -n -e 's/^Version:\W*//pi' <$SPECFILE)
+    BUILDSRC_DIR=${BUILDTEMP}/src/${PACKAGE}
+    VERSION=$(sed -n -e 's/^Version:\W*//pi' <$BUILDSRC_DIR/$SPECFILE)
 fi
 
+# RPMs can be handeld directly by osc
+# elif [ -r "$1" ]; then
+#     # parameter is src.rpm file
+#     PACKAGE=`rpm -qp --qf "%{NAME}" $1`
+#     VERSION=`rpm -qp --qf "%{VERSION}" $1`
 
 if [ -z "$PACKAGE" ]; then
@@ -42 +51 @@
 fi
 
-BUILDSRC_DIR=${BUILDTEMP}/src/${PACKAGE}
-
-
-svn_build_prepare.sh $* || {
-    echo "failed to prepare sources"
-    exit 1
-}
+echo "Version: $VERSION"
 
 osc co $OSC_PACKAGE || {
@@ -56 +59 @@
 # rsync is not usable, because ":" is interpretaded as remote host
 #rsync -av "$BUILDSRC_DIR/*" "$OSC_PACKAGE/."
-cp -av $BUILDSRC_DIR/* $OSC_PACKAGE/.
-
-if [ "$BUILD_USES_SVN" = "yes" ]; then
-    echo "receiving subversion information ..."
-    # set RELEASE number (last modification in this directory)
-    # requires subversion (but connection to server isn't neccessary)
-    SVN_BUILD_RELEASE=$(unset LANG; svn info . | sed -n 's/^Last Changed Rev: \([0-9]*\)/\1/p')
-    # in case of local modification a "m" is added to the release number
-    SVN_BUILD_MODIFIED=$(svn status -v | grep "^ *M" | wc -l)
-    # 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
-    fi
-    echo "SVN_BUILD_RELEASE: $SVN_BUILD_RELEASE"
-fi
+#cp -av $BUILDSRC_DIR/* $OSC_PACKAGE/.
 
 cd $OSC_PACKAGE
-pwd
-#echo "OSC_PACKAGE"
+rsync -a --delete $BUILDSRC_DIR/. . --exclude .osc
+
 # osc build DIST ARCH
-osc add *
-if [ "$SVN_BUILD_RELEASE" ]; then
-    osc commit -m "release $SVN_BUILD_RELEASE"
-fi
+#osc add $FILELIST
+osc addremove
+osc commit -m "release $VERSION"