Changeset 238 for trunk/tools


Ignore:
Timestamp:
Dec 19, 2005, 8:25:31 PM (14 years ago)
Author:
bcornec
Message:

merge -r235:237 $SVN_M/branches/2.05

Location:
trunk/tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/comp

    r30 r238  
    1 ./configure --without-x11
     1./configure
    22make
  • trunk/tools/mkrpm

    r219 r238  
    5151    tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
    5252    tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
    53     sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     53    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    5454    rm -f ${TMP}/mindi-*-root
    5555    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     
    7171    tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
    7272    tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
    73     sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     73    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    7474    rm -f ${TMP}/mondo-*-root
    7575    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
  • trunk/tools/mksvnversion

    r36 r238  
    2020#
    2121rel=`svnversion $TOOLHOME/..`
    22 cat > $TOOLHOME/../mondo/svn_version.c << EOF
    23 const char* svn_version(void) {
    24     const char* SVN_Version = "${rel}";
    25     return SVN_Version;
    26 }"
     22cat > $TOOLHOME/../mondo/revision.h << EOF
     23#define REVISION "${rel}"
     24EOF
     25cat > $TOOLHOME/../mondo/REVISION << EOF
     26${rel}
     27EOF
     28cat > $TOOLHOME/../mindi/REVISION << EOF
     29${rel}
    2730EOF
    2831
  • trunk/tools/rpm-env

    r236 r238  
    3030mkdir -p RPMS SRPMS SPECS SOURCES BUILD
    3131
    32 export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
    33 export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
     32export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/VERSION`
     33export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/VERSION`
    3434
    3535if [ -e /etc/mandriva-release ]; then
Note: See TracChangeset for help on using the changeset viewer.