Changeset 739 for trunk

Timestamp:

May 26, 2009, 1:34:34 PM (16 years ago)

Author:

joergs

Message:

changed from tar.bz2 to orig.tar.gz to be compatable with Debian, checks for OSC_LOCAL flag file

Location:

trunk/dassbuild

Files:

• svn_build_prepare.sh (modified) (2 diffs)
• svn_osc_build.sh (modified) (5 diffs)

trunk/dassbuild/svn_build_prepare.sh

@@ -11 +11 @@
 
 # TODO: 
-#   needs force parameter for tar.bz2 creation
+#   needs force parameter for tar.gz creation
 
 
@@ -125 +125 @@
     if [ -r "SOURCES" ]; then
         # create a tar file from the sources
-        printf "creating $PACKAGE-$VERSION.tar.bz2: "
-
-        if [ "$REBUILD" -o ! -r ${BUILDTEMP}/src/${PACKAGE}/$PACKAGE-$VERSION.tar.bz2 ]; then
+        SOURCE_ARCHIVE="$PACKAGE-$VERSION.orig.tar.gz"
+        printf "creating $SOURCE_ARCHIVE: "
+
+        if [ "$REBUILD" -o ! -r ${BUILDTEMP}/src/${PACKAGE}/$SOURCE_ARCHIVE ]; 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 "*~"
+            tar cvzf ${BUILDTEMP}/src/${PACKAGE}/$SOURCE_ARCHIVE --files-from SOURCES --exclude .svn --exclude "*~"
         else
             printf "already exists. Skipped\n"
-            exit 1
+            printf "  (${BUILDTEMP}/src/${PACKAGE}/$SOURCE_ARCHIVE)\n"
+            # exit, but without error, so that the calling script will continue
+            exit 0
         fi
     elif [ -r "SPECSOURCES" ]; then

trunk/dassbuild/svn_osc_build.sh

@@ -10 +10 @@
 #
 
+# environment variables:
+#   OSBS_PROJECT (e.g. home:dassit) or config file "OSC_PACKAGE" (e.g. home:dassit/dasscm)
+
+
 [ -z "$BUILD_USES_SVN" ] && BUILD_USES_SVN="yes"
 
@@ -16 +20 @@
 BUILDTEMP=$DEST_DIR/buildsrc/
 
-if [ ! -r OSC_PACKAGE ]; then
-    echo "failed to read config file OSC_PACKAGE"
-    exit 1
+if [ -r OSC_LOCAL ]; then
+    LOCAL_BUILD="yes"
 fi
 
-OSC_PACKAGE=`cat OSC_PACKAGE`
 
 svn_build_prepare.sh $*
@@ -58 +60 @@
 echo "Version: $VERSION"
 
+#
+# get the openSUSE build service project
+#   check for file "OSC_PACKAGE" first,
+#   if it is not found, use the variable OSBC_PROJECT
+#
+if [ -r OSC_PACKAGE ]; then
+    OSC_PACKAGE=`cat OSC_PACKAGE`
+elif [ "$OSBS_PROJECT" ]; then
+    OSC_PACKAGE="$OSBS_PROJECT/$PACKAGE"
+else
+    OSC_PACKAGE="home:$BUILDUSER/$PACKAGE"
+fi
+
+# remove double slashes (/)
+OSC_PACKAGE=`sed 's|/[/]*|/|g' <<< $OSC_PACKAGE`
+
 osc co $OSC_PACKAGE || {
-    # error message already from osc
+    echo
+    echo 'An existing "openSUSE Build Service" project must be specified.'
+    echo 'To specify it, use the config file OSC_PACKAGE or the environment variable OSBS_PROJECT'
     exit 1
 }
@@ -66 +86 @@
 #cp -av $BUILDSRC_DIR/* $OSC_PACKAGE/.
 
-cd $OSC_PACKAGE
+cd $OSC_PACKAGE || exit 1
 # rsync -a: -rlptgoD
 # but we don't want to check for timestamps
@@ -73 +93 @@
 rsync --checksum -r -v --delete $BUILDSRC_DIR/. . --exclude .osc
 
-# osc build DIST ARCH
-#osc add $FILELIST
-osc addremove
-osc commit -m "release $VERSION"
+if [ "$LOCAL_BUILD" ]; then
+    echo 'skipped. Use
+# local build:
+# osc repos | while read DIST ARCH; do osc build --no-verify $DIST $ARCH; done
+# '
+else 
+    osc addremove
+    osc commit -m "release $VERSION"
+fi
+