Changeset 924 in MondoRescue for branches/stable/tools/mknewversion

Timestamp:

Nov 13, 2006, 9:57:05 AM (17 years ago)

Author:

Bruno Cornec

Message:

TAG is now per package and not shared anymore + build process adapted

File:

• branches/stable/tools/mknewversion (modified) (2 diffs)

branches/stable/tools/mknewversion

@@ -16 +16 @@
 fi
 
-. $TOOLHOME/common-env
-. $TOOLHOME/distro-env
-
 # We need to get $VER
 if [ "$1" = "" ]; then
-    LAST=`cat ${TOPDIR}/LAST`
+    echo "Syntax: mknewversion version"
+    exit -1
 else
-    LAST=$1
+    VER=$1
     shift
 fi
-VER=`echo $LAST | cut -d- -f1`
-MAJVER=`echo $VER | cut -d. -f1-2`
-MINDIMAJVER=`echo $VER | cut -d. -f1`
-MINDIMINVER=`echo $VER | cut -d. -f2`
-((MINDIMAJVER=$MINDIMAJVER-1))
-MINVER=`echo $VER | cut -d. -f3`
-TAG=1
-((MINVER=$MINVER+1))
-VER=${MAJVER}.${MINVER}
-echo "Changing Version $LAST to ${VER}-${TAG}"
+
 grep -q stable $TOOLHOME/../mondo/VERSION
 if [ $? -ne 0 ]; then
@@ -41 +30 @@
     exit -1
 fi
+
 nb=`svn diff $TOOLHOME/.. | wc -l`
 if [ $nb -gt 0 ]; then
     echo "You'll have to check in before changing version"
-else
-    svn copy $SVN_M/branches/stable $SVN_M/branches/${VER}
-    cd $TOOLHOME/../..
-    svn co $SVN_M/branches/${VER} ${VER}
-    cd ${VER}
-    echo "$TAG" > tools/TAG
-    for p in mindi mondo mondo-doc mindi-kernel mindi-busybox; do
-        v=${VER}
-        if [ $p == "mindi" ]; then
-            v=${MINDIMAJVER}.${MINDIMINVER}.${MINVER}
-        fi
-        echo "$v" > $p/VERSION
-        if [ -f $p/ChangeLog ]; then
-            grep -q "${v}-${TAG}" $p/ChangeLog
-            if [ $? -ne 0 ]; then
-                echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
-                exit -1
-            fi
-        fi
-    done
-    svn ci -m "Creation of ${VER}-$TAG"
-    svn up
+    exit -1
 fi
+
+svn copy $SVN_M/branches/stable $SVN_M/branches/${VER}
+cd $TOOLHOME/../..
+svn co $SVN_M/branches/${VER} ${VER}
+cd ${VER}
+
+for p in mindi mondo mondo-doc mindi-kernel mindi-busybox; do
+    # Reset TAG - This maybe an issue for mindi-busybox only
+    echo "1" > $p/TAG
+    v=$VER
+    echo $p | grep -q mindi 
+    if [ $? -eq 0 ]; then
+        echo "Please give new $p version for this $VER mondo version ? "
+        read v
+    fi
+    echo "$v" > $p/VERSION
+done
+svn ci -m "Creation of mondo ${VER}-$TAG"
+svn up