Ignore:
Timestamp:
Aug 3, 2013 2:40:00 PM (7 years ago)
Author:
stefan
Message:

restore r2838, but fix issue with */* projects; also fix updating of config_*_default.h files for such projects

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/prepare_new_release

    r2840 r2841  
    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 . -name 'configure.ac'`
     420if test -d $topProjName ; then
     421  bak_files=`find $topProjName -name 'configure.ac'`
     422fi
     423if test -e configure.ac ; then
     424  bak_files="$bak_files configure.ac"
     425fi
    421426
    422427if test -n "$bak_files" ; then
     
    448453# add config_proj_default.h.bak to the list of files to be restored.
    449454
    450 stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
    451 configFileLoc=`find . -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
    452459if test -n "$configFileLoc" ; then
    453   versionSym=${stableProjUC}_VERSION
     460  versionSym=${topProjNameUC}_VERSION
    454461  echo ''
    455462  echo "===> Updating $versionSym in $configFileLoc (if present)"
Note: See TracChangeset for help on using the changeset viewer.