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_release

    r2839 r2866  
    361361# contains a '/', strip it out to make the build and checkout directories.
    362362
    363 topBuildDir=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
    364 topBuildDir="${topBuildDir}-${newVer}"
     363topProjName=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
     364topBuildDir="${topProjName}-${newVer}"
    365365if test $isThirdParty = yes; then
    366366  coDir=$topBuildDir/Thirdparty/$stableProj
     
    418418echo ''
    419419echo "===> Checking for configure.ac files ..."
    420 bak_files=`find $stableProj -name 'configure.ac'`
     420if test -d $topProjName ; then
     421  bak_files=`find $topProjName -name 'configure.ac'`
     422fi
    421423if test -e configure.ac ; then
    422424  bak_files="$bak_files configure.ac"
     
    451453# add config_proj_default.h.bak to the list of files to be restored.
    452454
    453 stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
    454 configFileLoc=`find $stableProj -name .svn -prune -o -name 'config_*_default.h' -print`
     455topProjNameUC=`echo $topProjName | tr '[a-z]' '[A-Z]'`
     456if test -d $topProjName ; then
     457  configFileLoc=`find $topProjName -name .svn -prune -o -name 'config_*_default.h' -print`
     458fi
    455459if test -n "$configFileLoc" ; then
    456   versionSym=${stableProjUC}_VERSION
     460  versionSym=${topProjNameUC}_VERSION
    457461  echo ''
    458462  echo "===> Updating $versionSym in $configFileLoc (if present)"
Note: See TracChangeset for help on using the changeset viewer.