Changeset 2841


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

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

Location:
trunk
Files:
2 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)"
  • trunk/prepare_new_stable

    r2840 r2841  
    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 . -name 'configure.ac'`
     384if test -d $topProjName ; then
     385  bak_files=`find $topProjName -name 'configure.ac'`
     386fi
     387if test -e configure.ac ; then
     388  bak_files="$bak_files configure.ac"
     389fi
    385390echo "===> Creating backup (.bak) for configure.ac files..."
    386391for i in $bak_files; do
     
    405410# add config_proj_default.h.bak to the list of files to be restored.
    406411
    407 srcProjUC=`echo $srcProj | tr '[a-z]' '[A-Z]'`
    408 configFileLoc=`find . -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
     416echo "config File Loc: $configFileLoc"
    409417if test -n "$configFileLoc" ; then
    410   versionSym=${srcProjUC}_VERSION
     418  versionSym=${topProjNameUC}_VERSION
    411419  echo ''
    412420  echo "===> Updating $versionSym in $configFileLoc (if present)"
Note: See TracChangeset for help on using the changeset viewer.