Changeset 340 for trunk/tools


Ignore:
Timestamp:
Jan 20, 2006, 1:11:02 AM (14 years ago)
Author:
bcornec
Message:

merge -r335:339 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mkcommon

    r320 r340  
    2121    echo "Management of mindi-kernel ${MINDI_VER}-$REVISION"
    2222    rm -fr mindi-kernel-${MINDI_VER}
    23     cp -a ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
    24     find mindi-kernel-${MINDI_VER} -type d -name .svn | xargs rm -rf
    25     find mindi-kernel-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
    26     find mindi-kernel-${MINDI_VER} -type f -name '*~' | xargs rm -rf
     23    svn export ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
     24    #cp -a ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
     25    #find mindi-kernel-${MINDI_VER} -type d -name .svn | xargs rm -rf
     26    #find mindi-kernel-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
     27    #find mindi-kernel-${MINDI_VER} -type f -name '*~' | xargs rm -rf
    2728    mkdir -p ${TOPDIR}/SOURCES
    2829
     
    3536    echo "Management of mindi ${MINDI_VER}-$REVISION"
    3637    rm -fr mindi-${MINDI_VER}
    37     cp -a ${VER}/mindi mindi-${MINDI_VER}
     38    svn export ${VER}/mindi mindi-${MINDI_VER}
     39    #cp -a ${VER}/mindi mindi-${MINDI_VER}
    3840    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    39     find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
    40     find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
    41     find mindi-${MINDI_VER} -type f -name '*~' | xargs rm -rf
    42     rm -f mindi-${MINDI_VER}/parted2fdisk mindi-${MINDI_VER}/parted2fdisk.c mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
     41    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
     42    #find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
     43    #find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
     44    #find mindi-${MINDI_VER} -type f -name '*~' | xargs rm -rf
     45    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
     46    #rm -f mindi-${MINDI_VER}/parted2fdisk mindi-${MINDI_VER}/parted2fdisk.c mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    4347
    4448    echo "Creating mindi tar files"
     
    5155    echo "Management of mondo ${MONDO_VER}-$REVISION"
    5256    rm -rf mondo-${MONDO_VER}
    53     cp -a ${VER}/mondo mondo-${MONDO_VER}
     57    svn export ${VER}/mondo mondo-${MONDO_VER}
     58    #cp -a ${VER}/mondo mondo-${MONDO_VER}
    5459    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    55     cd mondo-${MONDO_VER}
     60    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
     61    rm -rf documentation-${MONDO_VER}
     62    svn export ${VER}/documentation documentation-${MONDO_VER}
     63    cd documentation-${MONDO_VER}
     64    make install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
     65    cd ../mondo-${MONDO_VER}
    5666    echo "Bootstraping mondo ... "
    5767    ./bootstrap
    58     find . -type d -name .svn | xargs rm -rf
    59     find . -type f -name '.*.swp' | xargs rm -rf
    60     find . -type f -name '*~' | xargs rm -rf
     68    #find . -type d -name .svn | xargs rm -rf
     69    #find . -type f -name '.*.swp' | xargs rm -rf
     70    #find . -type f -name '*~' | xargs rm -rf
    6171    cd ..
    6272
Note: See TracChangeset for help on using the changeset viewer.