Changeset 33 in MondoRescue

Timestamp:

Sep 29, 2005, 3:11:40 AM (19 years ago)

Author:

bcornec

Message:

Finer use of the release concept for tagging and delivery

Location:

trunk/tools

Files:

• mkdeliv (modified) (2 diffs)
• mkrpm (modified) (3 diffs)
• mksvnversion (copied) (copied from trunk/mondo/mksvnversion ) (2 diffs)
• rpm-env (modified) (1 diff)

trunk/tools/mkdeliv

@@ -2 +2 @@
 #
 # Deliver RPMs packages and tgz files to BerliOS
+#
+# $Id$
+#
 
-. ./rpm-env
+dname=`dirname $0`
+prem=`echo $dname |cut -c1`
+if [ ${prem} == "/" ]; then
+        export TOOLHOME=$dname
+else
+    export TOOLHOME=${PWD}/$dname
+fi
+
+. $TOOLHOME/rpm-env
 
 tgz=""
 srpms=""
 rpms=""
-ct=`date "+%Y%m%d"`
+rev=`$TOOLHOME/mksvnversion`
 
 if [ "$1" = "" ]; then
@@ -16 +27 @@
 fi
 if [ "`echo $c | grep mindi`" != "" ]; then
-    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-${ct}.tgz
-    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-${ct}.tgz"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-1.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-1.src.rpm"
+    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz
+    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz"
+    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
+    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}.src.rpm"
 fi
 if [ "`echo $c | grep  mondo`" != "" ]; then
-    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-${ct}.tgz
-    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-${ct}.tgz"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-1.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-1.src.rpm"
+    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
+    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz"
+    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
+    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}.src.rpm"
 fi
 scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/TGZ

trunk/tools/mkrpm

@@ -2 +2 @@
 #
 # Creates RPMs packages from SVN repository for local tests
+#
+# $Id$
+#
 
-. ./rpm-env
+dname=`dirname $0`
+prem=`echo $dname |cut -c1`
+if [ ${prem} == "/" ]; then
+    export TOOLHOME=$dname
+else
+    export TOOLHOME=${PWD}/$dname
+fi
+
+. $TOOLHOME/rpm-env
+
+rev=`$TOOLHOME/mksvnversion`
 
 if [ "$1" = "" ]; then
@@ -23 +36 @@
     cp mindi-${MINDI_VER}/mindi.spec ${TOPDIR}/SPECS/mindi.spec
     rm -f ${TMP}/mindi-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-1.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
     # ATTENTION: This could be dangerous for your setup
     opt="rm -rf /usr/share/mindi ;"
@@ -42 +55 @@
     cp mondo-${MONDO_VER}/mondo.spec ${TOPDIR}/SPECS/mondo.spec
     rm -f ${TMP}/mondo-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-1.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
 fi
 cd ${TOPDIR}/SPECS

trunk/tools/mksvnversion

@@ +1 @@
+#!/bin/bash
 ########################################################
 # $Id$
@@ -5 +6 @@
 # on every build, record the working copy revision string
 #
-echo -n 'const char* svn_version(void) { const char* SVN_Version = "' > svn_version.c
-svnversion -n .. >> svn_version.c
-echo '"; return SVN_Version; }'   >> svn_version.c
+dname=`dirname $0`
+prem=`echo $dname |cut -c1`
+if [ ${prem} == "/" ]; then
+    export TOOLHOME=$dname
+else
+    export TOOLHOME=${PWD}/$dname
+fi
+. $TOOLHOME/rpm-env
+
+#
+# Create a .c file for mondo to link with and get
+# the right build version from SVN
+#
+rel=`svnversion $TOOLHOME/..`
+cat > $TOOLHOME/../mondo/svn_version.c << EOF
+const char* svn_version(void) {
+    const char* SVN_Version = "${rel}"; 
+    return SVN_Version; 
+}"
+EOF
+
+#
+# Patches the file needing that release reference
+#
+perl -pi -e "s/^Release:.*$/Release:    ${rel}" $TOOLHOME/../*/*spec
+
+#
+# return the release
+#
+echo ${rel}

trunk/tools/rpm-env

@@ -2 +2 @@
 #
 # Creates RPMs environment from SVN repository
+#
+# $Id$
+#
 
 # Adapt to your needs
-export BASE=/bruno/mondo
+export BASE=${HOME}/mondo
 export SVNAUTH=bcornec@shell.berlios.de
 export DSTDIR=/home/groups/ftp/pub/mondorescue