Changeset 545


Ignore:
Timestamp:
May 14, 2006, 12:32:41 AM (13 years ago)
Author:
bcornec
Message:

revert to 543

Location:
branches/stable
Files:
1 deleted
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/VERSION

    r543 r545  
    1 1.0.8
     1stable
  • branches/stable/mondo/VERSION

    r543 r545  
    1 2.0.8
     1stable
  • branches/stable/tools/common-env

    r544 r545  
    88# Adapt to your needs
    99export BASE=${HOME}/mondo
    10 export TOPDIR=${BASE}/RPMS
    11 mkdir -p ${TOPDIR}
    1210
    1311# Should not be modified below
    1412dname=`dirname $0`
    15 export VER="branches/`cat $dname/../mondo/VERSION`"
     13export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
    1614export TMP=${BASE}/tmp
    1715mkdir -p ${TMP}
    1816
    19 export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/VERSION`
    20 export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/VERSION`
     17export MINDI_VER=`cat ${BASE}/svn/${SVNBRANCH}/mindi/VERSION`
     18export MONDO_VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
    2119
    2220# To be safe for SVN commands
    2321cd $TOOLHOME/..
    24 export REVISION=`svnversion .`
     22export REVISION=`$TOOLHOME/mksvnversion`
  • branches/stable/tools/livwww

    r543 r545  
    5555fi
    5656
    57 svn export $optsvn ${VER}/website $LOCALDIR
     57svn export $optsvn ${SVNBRANCH}/website $LOCALDIR
    5858
    5959if [ $force -eq 1 ]; then
     
    6262fi
    6363
    64 svn export $optsvn ${VER}/documentation $LOCALDOC
     64svn export $optsvn ${SVNBRANCH}/mondo-doc $LOCALDOC
    6565
    6666#
  • branches/stable/tools/mkcommon

    r544 r545  
    11#!/bin/bash
    22#
    3 # Prepare source packages from SVN repository as a tar file
    4 # Also prepare the documentation which is common as a separate tar files
     3# Prepare build env common for all packages build process from SVN repository
     4# Also prepare the documentation which is common
    55#
    66# $Id$
     
    88
    99umask 022
    10 dname=`dirname $0`
    11 prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
    13         export TOOLHOME=$dname
    14 else
    15         export TOOLHOME=${PWD}/$dname
    16 fi
    1710
    18 cd $TOOLHOME
    19 . ./common-env
    20 
    21 mkdir -p ${TOPDIR}/SOURCES
     11cd $TOOLHOME/..
     12echo "Generating SVN log file ..."
     13svn log -v > /tmp/mondorescue-svn.log
    2214
    2315if [ "$1" = "" ]; then
     
    3022    fi
    3123fi
     24if [ "`echo $c | grep mindi-kernel`" != "" ]; then
     25    cd ${BASE}/svn
     26    echo "Management of mindi-kernel ${MINDI_VER}-$REVISION"
     27    rm -fr mindi-kernel-${MINDI_VER}
     28    svn export ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
     29    mkdir -p ${TOPDIR}/SOURCES
    3230
     31    echo "Creating mindi-kernel tar files"
     32    tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
     33    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
     34fi
    3335
    34 cd ${BASE}/svn
     36#
     37# Should be done before mindi
     38#
     39if [ "`echo $c | grep mondo-doc`" != "" ]; then
     40    cd ${BASE}/svn
     41    echo "Management of mondo-doc ${MONDO_VER}-$REVISION"
     42    rm -rf mondo-doc-${MONDO_VER}
     43    svn export ${VER}/documentation mondo-doc-${MONDO_VER}
     44    svn log -v ${VER}/documentation > mondo-doc-${MONDO_VER}/svn.log
     45    echo "$REVISION" > mondo-doc-${MONDO_VER}/REVISION
     46    cd mondo-doc-${MONDO_VER}
     47    $TOOLHOME/expandver mondorescue-howto.sgml *8
     48    make -f Makefile.howto install INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/en
     49    if [ $? != 0 ]; then
     50        exit -1
     51    fi
     52    make -f Makefile.man install-mondo INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/man
     53    if [ $? != 0 ]; then
     54        exit -1
     55    fi
     56    cd ..
    3557
    36 for p in "$c"; do
    37     v=`cat ${VER}/$p/VERSION`
    38     echo "Management of $p $v-$REVISION"
    39     rm -fr $p-$v
    40     svn export ${VER}/$p $p-$v
    41     echo "$REVISION" > $p-$v/REVISION
    42     echo "Generating SVN log file ..."
    43     svn log -v ${VER}/$p > $p-$v/svn.log
     58    echo "Creating mondo-doc tar files"
     59    tar cfhz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz mondo-doc-${MONDO_VER}
     60    tar cfhj ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 mondo-doc-${MONDO_VER}
     61fi
     62if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     63    cd ${BASE}/svn
     64    echo "Management of mindi ${MINDI_VER}-$REVISION"
     65    rm -fr mindi-${MINDI_VER}
     66    svn export ${VER}/mindi mindi-${MINDI_VER}
     67    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
     68    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER})
     69    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
     70    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    4471
    45     if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
    46         cd ${p}-${v}
    47         $TOOLHOME/expandver mondorescue-howto.sgml *8
    48         make -f Makefile.howto
    49         if [ $? != 0 ]; then
    50             exit -1
    51         fi
    52         make -f Makefile.man
    53         if [ $? != 0 ]; then
    54             exit -1
    55         fi
    56         cd ..
    57     fi
     72    echo "Creating mindi tar files"
     73    tar cfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
     74    tar cfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
     75    rm -f ${TMP}/mindi-*-root
     76fi
     77if [ "`echo $c | grep -v doc | grep  mondo`" != "" ]; then
     78    cd ${BASE}/svn
     79    echo "Management of mondo ${MONDO_VER}-$REVISION"
     80    rm -rf mondo-${MONDO_VER}
     81    svn export ${VER}/mondo mondo-${MONDO_VER}
     82    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
     83    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
     84    (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)
     85    (cd mondo-${MONDO_VER} ; echo "Bootstraping mondo ... " ; ./bootstrap)
    5886
    59     if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
    60         v1=`cat ${VER}/mondo-doc/VERSION`
    61         if [ ! -d mondo-doc-$v1 ]; then
    62             echo "mondo-doc should be created before $p"
    63             exit -1
    64         fi
    65         (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
    66         rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    67     fi
    68     if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
    69         v1=`cat ${VER}/mondo-doc/VERSION`
    70         if [ ! -d mondo-doc-$v1 ]; then
    71             echo "mondo-doc should be created before $p"
    72             exit -1
    73         fi
    74         (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)
    75         (cd $p-$v ; echo "Bootstraping mondo ... " ; ./bootstrap)
    76     fi
    77 
    78     # Finally creates the tar files
    79     echo "Creating $p tar files"
    80     tar cvfhz ${TOPDIR}/SOURCES/$p-$v.tgz $p-$v
    81     tar cvfhj ${TOPDIR}/SOURCES/$p-$v.tar.bz2 $p-$v
    82 done
     87    echo "Creating mondo tar files"
     88    tar cfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
     89    tar cfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
     90    rm -f ${TMP}/mondo-*-root
     91fi
  • branches/stable/tools/mksvnversion

    r544 r545  
    2020rel=`svnversion $TOOLHOME/..`
    2121
     22cat > $TOOLHOME/../mondo/REVISION << EOF
     23${rel}
     24EOF
     25cat > $TOOLHOME/../mindi/REVISION << EOF
     26${rel}
     27EOF
     28
    2229#
    2330# return the release
Note: See TracChangeset for help on using the changeset viewer.