Changeset 872


Ignore:
Timestamp:
Oct 4, 2006, 3:08:01 PM (13 years ago)
Author:
bruno
Message:

Fix bug #79 by removing use of SVNBRANCH and BASE variable in build process
WARNING: the build process doesn't allow anymore to use the script of one version for building another version

Location:
branches/stable
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/deplist.txt

    r860 r872  
    3939devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
    4040
     41# For Debug  mode
     42# gdb
     43
    4144#----------------- For all you LVM users out there, much love -----------------
    4245LVMFILES:
  • branches/stable/tools/common-env

    r871 r872  
    77
    88# Adapt to your needs
    9 export BASE=${HOME}/mondo
    10 export TOPDIR=${BASE}/build
     9d=`dirname ${TOOLHOME}`
     10if [ _"`basename ${d}/..`" = _"trunk" ]; then
     11    BASE=${TOOLHOME}/../..
     12else
     13    BASE=${TOOLHOME}/../../..
     14fi
     15export TOPDIR=${BASE}/delivery
    1116mkdir -p ${TOPDIR}
    1217export TMPDIR=/tmp
  • branches/stable/tools/distro-env

    r732 r872  
    117117# Additional exports and preparation for some distros
    118118#
     119
     120# Default
     121export TOPBUILDDIR=${TOPDIR}/../build
     122
    119123if [ _"$dtype" = _"rpm" ]; then
    120124    export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
    121125    if [ -f ${HOME}/.rpmmacros ]; then
    122126        export TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
    123     else
    124         export TOPBUILDDIR=${BASE}/build
    125127    fi
    126128    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
    127129elif [ _"$dtype" = _"deb" ]; then
    128     export TOPBUILDDIR=${BASE}/build
    129130    mkdir -p ${TOPBUILDDIR}
    130131elif [ _"$dtype" = _"ebuild" ]; then
    131     export TOPBUILDDIR=${BASE}/build
    132132    mkdir -p ${TOPBUILDDIR}/portage
    133133fi
  • branches/stable/tools/livwww

    r659 r872  
    4949. $TOOLHOME/svn-env
    5050
    51 cd ${BASE}/svn
     51# To be safe for SVN commands
     52cd ${TOOLHOME}/..
    5253
    5354if [ $force -eq 1 ]; then
     
    5657fi
    5758
    58 svn export $optsvn ${SVNBRANCH}/website $LOCALDIR
     59svn export $optsvn ${TOOLHOME}/../website $LOCALDIR
    5960
    6061if [ $force -eq 1 ]; then
     
    6364fi
    6465
    65 svn export $optsvn ${SVNBRANCH}/mondo-doc $LOCALDOC
     66svn export $optsvn ${TOOLHOME}/../mondo-doc $LOCALDOC
    6667
    6768#
  • branches/stable/tools/svn-env

    r553 r872  
    66#
    77
    8 export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
    9 export VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
     8export VER=`cat ${TOOLHOME}/../mondo/VERSION`
    109
    1110# To be safe for SVN commands
  • branches/stable/tools/svn2build

    r829 r872  
    3333
    3434# Make it safe for SVN commands
    35 cd ${BASE}/svn
     35cd ${TOOLHOME}/..
    3636
    3737for p in $c; do
    38     v=`cat ${SVNBRANCH}/$p/VERSION`
     38    v=`cat ${TOOLHOME}/../$p/VERSION`
    3939    echo "Management of $p $v-$TAG (rev $REVISION)"
    4040    dest="$p-$v"
    4141    rm -fr $dest
    42     svn export ${SVNBRANCH}/$p $dest
     42    svn export ${TOOLHOME}/../$p $dest
    4343    echo "$REVISION" > $dest/REVISION
    4444    echo "Generating SVN log file ..."
    45     svn log -v ${SVNBRANCH}/$p > $dest/svn.log
     45    svn log -v ${TOOLHOME}/../$p > $dest/svn.log
    4646
    4747    for d in `cat ${TOOLHOME}/DISTROS`; do
     
    117117
    118118    if [ _"`echo $p | grep -vE 'kernel|busybox' | grep mindi`" != _"" ]; then
    119         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
     119        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
    120120        if [ ! -d mondo-doc-$v1 ]; then
    121121            echo "mondo-doc should be created before $p"
     
    126126    fi
    127127    if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
    128         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
     128        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
    129129        if [ ! -d mondo-doc-$v1 ]; then
    130130            echo "mondo-doc should be created before $p"
Note: See TracChangeset for help on using the changeset viewer.