Changeset 2839


Ignore:
Timestamp:
Jul 23, 2013 8:35:05 AM (7 years ago)
Author:
stefan
Message:

merge r2838 from trunk

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

    • Property svn:mergeinfo changed
      /trunkmerged: 2838
  • stable/0.7/prepare_new_release

    r2402 r2839  
    418418echo ''
    419419echo "===> Checking for configure.ac files ..."
    420 bak_files=`find . -name 'configure.ac'`
     420bak_files=`find $stableProj -name 'configure.ac'`
     421if test -e configure.ac ; then
     422  bak_files="$bak_files configure.ac"
     423fi
    421424
    422425if test -n "$bak_files" ; then
     
    449452
    450453stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
    451 configFileLoc=`find . -name .svn -prune -o -name 'config_*_default.h' -print`
     454configFileLoc=`find $stableProj -name .svn -prune -o -name 'config_*_default.h' -print`
    452455if test -n "$configFileLoc" ; then
    453456  versionSym=${stableProjUC}_VERSION
  • stable/0.7/prepare_new_stable

    r2358 r2839  
    382382
    383383echo ''
    384 bak_files=`find . -name 'configure.ac'`
     384bak_files=`find $srcProj -name 'configure.ac'`
     385if test -e configure.ac ; then
     386  bak_files="$bak_files configure.ac"
     387fi
    385388echo "===> Creating backup (.bak) for configure.ac files..."
    386389for i in $bak_files; do
     
    406409
    407410srcProjUC=`echo $srcProj | tr '[a-z]' '[A-Z]'`
    408 configFileLoc=`find . -name .svn -prune -o -name 'config_*_default.h' -print`
     411configFileLoc=`find $srcProj -name .svn -prune -o -name 'config_*_default.h' -print`
     412echo "config File Loc: $configFileLoc"
    409413if test -n "$configFileLoc" ; then
    410414  versionSym=${srcProjUC}_VERSION
Note: See TracChangeset for help on using the changeset viewer.