Ignore:
Timestamp:
Sep 8, 2013 12:27:09 PM (7 years ago)
Author:
stefan
Message:

merge r2839-2856,2858-2865 from trunk

Location:
stable/0.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/prepare_new_stable

    r2839 r2866  
    330330# Construct a build directory name.
    331331
    332 topBuildDir=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
    333 topBuildDir=${topBuildDir}-${newVersion}
     332topProjName=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
     333topBuildDir=${topProjName}-${newVersion}
    334334echo "Build directory.....: $topBuildDir"
    335335
     
    382382
    383383echo ''
    384 bak_files=`find $srcProj -name 'configure.ac'`
     384if test -d $topProjName ; then
     385  bak_files=`find $topProjName -name 'configure.ac'`
     386fi
    385387if test -e configure.ac ; then
    386388  bak_files="$bak_files configure.ac"
     
    408410# add config_proj_default.h.bak to the list of files to be restored.
    409411
    410 srcProjUC=`echo $srcProj | tr '[a-z]' '[A-Z]'`
    411 configFileLoc=`find $srcProj -name .svn -prune -o -name 'config_*_default.h' -print`
     412topProjNameUC=`echo $topProjName | tr '[a-z]' '[A-Z]'`
     413if test -d $topProjName ; then
     414  configFileLoc=`find $topProjName -name .svn -prune -o -name 'config_*_default.h' -print`
     415fi
    412416echo "config File Loc: $configFileLoc"
    413417if test -n "$configFileLoc" ; then
    414   versionSym=${srcProjUC}_VERSION
     418  versionSym=${topProjNameUC}_VERSION
    415419  echo ''
    416420  echo "===> Updating $versionSym in $configFileLoc (if present)"
Note: See TracChangeset for help on using the changeset viewer.