Changeset 545 in MondoRescue for branches/stable/tools

Timestamp:

May 14, 2006, 12:32:41 AM (19 years ago)

Author:

bcornec

Message:

revert to 543

Location:

branches/stable/tools

Files:

• common-env (modified) (1 diff)
• livwww (modified) (2 diffs)
• mkcommon (modified) (3 diffs)
• mksvnversion (modified) (1 diff)

branches/stable/tools/common-env

@@ -8 +8 @@
 # Adapt to your needs
 export BASE=${HOME}/mondo
-export TOPDIR=${BASE}/RPMS
-mkdir -p ${TOPDIR}
 
 # Should not be modified below
 dname=`dirname $0`
-export VER="branches/`cat $dname/../mondo/VERSION`"
+export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
 export TMP=${BASE}/tmp
 mkdir -p ${TMP}
 
-export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/VERSION`
-export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/VERSION`
+export MINDI_VER=`cat ${BASE}/svn/${SVNBRANCH}/mindi/VERSION`
+export MONDO_VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
 
 # To be safe for SVN commands
 cd $TOOLHOME/..
-export REVISION=`svnversion .`
+export REVISION=`$TOOLHOME/mksvnversion`

branches/stable/tools/livwww

@@ -55 +55 @@
 fi
 
-svn export $optsvn ${VER}/website $LOCALDIR
+svn export $optsvn ${SVNBRANCH}/website $LOCALDIR
 
 if [ $force -eq 1 ]; then
@@ -62 +62 @@
 fi
 
-svn export $optsvn ${VER}/documentation $LOCALDOC
+svn export $optsvn ${SVNBRANCH}/mondo-doc $LOCALDOC
 
 #

branches/stable/tools/mkcommon

@@ -1 +1 @@
 #!/bin/bash
 #
-# Prepare source packages from SVN repository as a tar file
-# Also prepare the documentation which is common as a separate tar files
+# Prepare build env common for all packages build process from SVN repository
+# Also prepare the documentation which is common
 #
 # $Id$
@@ -8 +8 @@
 
 umask 022
-dname=`dirname $0`
-prem=`echo $dname |cut -c1`
-if [ ${prem} == "/" ]; then
-        export TOOLHOME=$dname
-else
-        export TOOLHOME=${PWD}/$dname
-fi
 
-cd $TOOLHOME
-. ./common-env
-
-mkdir -p ${TOPDIR}/SOURCES 
+cd $TOOLHOME/..
+echo "Generating SVN log file ..."
+svn log -v > /tmp/mondorescue-svn.log
 
 if [ "$1" = "" ]; then
@@ -30 +22 @@
     fi
 fi
+if [ "`echo $c | grep mindi-kernel`" != "" ]; then
+    cd ${BASE}/svn
+    echo "Management of mindi-kernel ${MINDI_VER}-$REVISION"
+    rm -fr mindi-kernel-${MINDI_VER}
+    svn export ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
+    mkdir -p ${TOPDIR}/SOURCES 
 
+    echo "Creating mindi-kernel tar files"
+    tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
+    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
+fi
 
-cd ${BASE}/svn
+#
+# Should be done before mindi
+#
+if [ "`echo $c | grep mondo-doc`" != "" ]; then
+    cd ${BASE}/svn
+    echo "Management of mondo-doc ${MONDO_VER}-$REVISION"
+    rm -rf mondo-doc-${MONDO_VER}
+    svn export ${VER}/documentation mondo-doc-${MONDO_VER}
+    svn log -v ${VER}/documentation > mondo-doc-${MONDO_VER}/svn.log
+    echo "$REVISION" > mondo-doc-${MONDO_VER}/REVISION
+    cd mondo-doc-${MONDO_VER}
+    $TOOLHOME/expandver mondorescue-howto.sgml *8
+    make -f Makefile.howto install INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/en
+    if [ $? != 0 ]; then
+        exit -1
+    fi
+    make -f Makefile.man install-mondo INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/man
+    if [ $? != 0 ]; then
+        exit -1
+    fi
+    cd ..
 
-for p in "$c"; do
-    v=`cat ${VER}/$p/VERSION`
-    echo "Management of $p $v-$REVISION"
-    rm -fr $p-$v
-    svn export ${VER}/$p $p-$v
-    echo "$REVISION" > $p-$v/REVISION
-    echo "Generating SVN log file ..."
-    svn log -v ${VER}/$p > $p-$v/svn.log
+    echo "Creating mondo-doc tar files"
+    tar cfhz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz mondo-doc-${MONDO_VER}
+    tar cfhj ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 mondo-doc-${MONDO_VER}
+fi
+if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
+    cd ${BASE}/svn
+    echo "Management of mindi ${MINDI_VER}-$REVISION"
+    rm -fr mindi-${MINDI_VER}
+    svn export ${VER}/mindi mindi-${MINDI_VER}
+    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
+    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER})
+    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
+    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
 
-    if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
-        cd ${p}-${v}
-        $TOOLHOME/expandver mondorescue-howto.sgml *8
-        make -f Makefile.howto
-        if [ $? != 0 ]; then
-            exit -1
-        fi
-        make -f Makefile.man
-        if [ $? != 0 ]; then
-            exit -1
-        fi
-        cd ..
-    fi
+    echo "Creating mindi tar files"
+    tar cfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
+    tar cfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
+    rm -f ${TMP}/mindi-*-root
+fi
+if [ "`echo $c | grep -v doc | grep  mondo`" != "" ]; then
+    cd ${BASE}/svn
+    echo "Management of mondo ${MONDO_VER}-$REVISION"
+    rm -rf mondo-${MONDO_VER}
+    svn export ${VER}/mondo mondo-${MONDO_VER}
+    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
+    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
+    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en ; make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man)
+    (cd mondo-${MONDO_VER} ; echo "Bootstraping mondo ... " ; ./bootstrap)
 
-    if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
-        v1=`cat ${VER}/mondo-doc/VERSION`
-        if [ ! -d mondo-doc-$v1 ]; then
-            echo "mondo-doc should be created before $p"
-            exit -1
-        fi
-        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
-        rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
-    fi
-    if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
-        v1=`cat ${VER}/mondo-doc/VERSION`
-        if [ ! -d mondo-doc-$v1 ]; then
-            echo "mondo-doc should be created before $p"
-            exit -1
-        fi
-        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$p-$v/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v/docs/man)
-        (cd $p-$v ; echo "Bootstraping mondo ... " ; ./bootstrap)
-    fi
-
-    # Finally creates the tar files
-    echo "Creating $p tar files"
-    tar cvfhz ${TOPDIR}/SOURCES/$p-$v.tgz $p-$v
-    tar cvfhj ${TOPDIR}/SOURCES/$p-$v.tar.bz2 $p-$v
-done
+    echo "Creating mondo tar files"
+    tar cfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
+    tar cfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
+    rm -f ${TMP}/mondo-*-root
+fi

branches/stable/tools/mksvnversion

@@ -20 +20 @@
 rel=`svnversion $TOOLHOME/..`
 
+cat > $TOOLHOME/../mondo/REVISION << EOF
+${rel}
+EOF
+cat > $TOOLHOME/../mindi/REVISION << EOF
+${rel}
+EOF
+
 #
 # return the release