Changeset 237 in MondoRescue for branches/2.05/tools

Timestamp:

Dec 19, 2005, 8:23:17 PM (18 years ago)

Author:

bcornec

Message:

• single place for VERSION numbers in mondo and mindi (Bruno Cornec)
• revision taken from global tree, not from files for mindi/mondo tagging (Bruno Cornec)
• chown can't be done for RPMS in install.sh

Location:

branches/2.05/tools

Files:

• comp (modified) (1 diff)
• mkrpm (modified) (2 diffs)
• mksvnversion (modified) (1 diff)
• rpm-env (modified) (1 diff)

branches/2.05/tools/comp

@@ -1 @@
-./configure --without-x11
+./configure
 make

branches/2.05/tools/mkrpm

@@ -51 +51 @@
     tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
-    sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     rm -f ${TMP}/mindi-*-root
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
@@ -71 +71 @@
     tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
-    sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     rm -f ${TMP}/mondo-*-root
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"

branches/2.05/tools/mksvnversion

@@ -20 +20 @@
 #
 rel=`svnversion $TOOLHOME/..`
-cat > $TOOLHOME/../mondo/svn_version.c << EOF
-const char* svn_version(void) {
-    const char* SVN_Version = "${rel}"; 
-    return SVN_Version; 
-}"
+cat > $TOOLHOME/../mondo/revision.h << EOF
+#define REVISION "${rel}" 
+EOF
+cat > $TOOLHOME/../mondo/REVISION << EOF
+${rel}
+EOF
+cat > $TOOLHOME/../mindi/REVISION << EOF
+${rel}
 EOF
 

branches/2.05/tools/rpm-env

@@ -30 +30 @@
 mkdir -p RPMS SRPMS SPECS SOURCES BUILD
 
-export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
-export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
+export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/VERSION`
+export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/VERSION`
 
 if [ -e /etc/mandriva-release ]; then