Changeset 2289


Ignore:
Timestamp:
Jun 18, 2011 7:04:55 AM (8 years ago)
Author:
stefan
Message:

as in chgset 2243 for prepare_new_release, update update of version info in config header in prepare_new_stable

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/prepare_new_release

    r2243 r2289  
    440440
    441441stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
    442 configFileLoc=`find . -name 'config_*_default.h' -print`
     442configFileLoc=`find . -name .svn -prune -o -name 'config_*_default.h' -print`
    443443if test -n "$configFileLoc" ; then
    444444  versionSym=${stableProjUC}_VERSION
  • trunk/prepare_new_stable

    r2072 r2289  
    402402done
    403403
    404 # Find ProjConfig.h. If there's a definition for PROJ_VERSION, adjust it and
    405 # add ProjConfig.h.bak to the list of files to be restored.
     404# Find config_proj_default.h. If there's a definition for PROJ_VERSION, adjust it and
     405# add config_proj_default.h.bak to the list of files to be restored.
    406406
    407407srcProjUC=`echo $srcProj | tr '[a-z]' '[A-Z]'`
    408 configFileLoc=`find . -name .svn -prune -o -name '*Config.h' -print`
     408configFileLoc=`find . -name .svn -prune -o -name 'config_*_default.h' -print`
    409409if test -n "$configFileLoc" ; then
    410410  versionSym=${srcProjUC}_VERSION
     
    414414  mv $configFileLoc $configFileLoc.bak
    415415  bak_files="$bak_files $configFileLoc"
    416   sed -e "s/# *define $versionSym.*\$/#define $versionSym \"$newVersion\"/" <$configFileLoc.bak >$configFileLoc
     416  sed -e "s/# *define $versionSym.*\$/#define $versionSym \"$newVersion\"/" \
     417    -e "s/# *define ${versionSym}_MAJOR .*\$/#define ${versionSym}_MAJOR $majVer/" \
     418    -e "s/# *define ${versionSym}_MINOR .*\$/#define ${versionSym}_MINOR $minVer/" \
     419    -e "s/# *define ${versionSym}_RELEASE .*\$/#define ${versionSym}_RELEASE 9999/" \
     420  <$configFileLoc.bak >$configFileLoc
    417421  svn diff $configFileLoc
    418422fi
Note: See TracChangeset for help on using the changeset viewer.