Changeset 2254 for stable/0.7/prepare_new_release

Timestamp:

Jun 9, 2011 1:46:45 PM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2253

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• prepare_new_release (modified) (2 diffs)

stable/0.7/prepare_new_release

@@ -436 +436 @@
 fi
 
-# Find ProjConfig.h. If there's a definition for PROJ_VERSION, adjust it and
-# add ProjConfig.h.bak to the list of files to be restored.
+# Find config_proj_default.h. If there's a definition for PROJ_VERSION, adjust it and
+# add config_proj_default.h.bak to the list of files to be restored.
 
 stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
-configFileLoc=`find . -name '*Config.h' -print`
+configFileLoc=`find . -name 'config_*_default.h' -print`
 if test -n "$configFileLoc" ; then
   versionSym=${stableProjUC}_VERSION
@@ -448 +448 @@
   mv $configFileLoc $configFileLoc.bak
   bak_files="$bak_files $configFileLoc"
-  sed -e "s/# *define $versionSym.*\$/#define $versionSym \"$newVer\"/" <$configFileLoc.bak >$configFileLoc
+  sed -e "s/# *define $versionSym .*\$/#define $versionSym \"$newVer\"/" \
+    -e "s/# *define ${versionSym}_MAJOR .*\$/#define ${versionSym}_MAJOR $majVer/" \
+    -e "s/# *define ${versionSym}_MINOR .*\$/#define ${versionSym}_MINOR $minVer/" \
+    -e "s/# *define ${versionSym}_RELEASE .*\$/#define ${versionSym}_RELEASE $newRel/" \
+    <$configFileLoc.bak >$configFileLoc
   svn diff $configFileLoc
 fi