Changeset 2866 for stable/0.7/prepare_new_release

Timestamp:

Sep 8, 2013 12:27:09 PM (7 years ago)

Author:

stefan

Message:

merge r2839-2856,2858-2865 from trunk

Location:

stable/0.7

Files:

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

stable/0.7/prepare_new_release

@@ -361 +361 @@
 # contains a '/', strip it out to make the build and checkout directories.
 
-topBuildDir=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
-topBuildDir="${topBuildDir}-${newVer}"
+topProjName=`echo $stableProj | sed -e 's|.*/\([^/]*\)$|\1|'`
+topBuildDir="${topProjName}-${newVer}"
 if test $isThirdParty = yes; then
   coDir=$topBuildDir/Thirdparty/$stableProj
@@ -418 +418 @@
 echo ''
 echo "===> Checking for configure.ac files ..."
-bak_files=`find $stableProj -name 'configure.ac'`
+if test -d $topProjName ; then
+  bak_files=`find $topProjName -name 'configure.ac'`
+fi
 if test -e configure.ac ; then
   bak_files="$bak_files configure.ac"
@@ -451 +453 @@
 # add config_proj_default.h.bak to the list of files to be restored.
 
-stableProjUC=`echo $stableProj | tr '[a-z]' '[A-Z]'`
-configFileLoc=`find $stableProj -name .svn -prune -o -name 'config_*_default.h' -print`
+topProjNameUC=`echo $topProjName | tr '[a-z]' '[A-Z]'`
+if test -d $topProjName ; then
+  configFileLoc=`find $topProjName -name .svn -prune -o -name 'config_*_default.h' -print`
+fi
 if test -n "$configFileLoc" ; then
-  versionSym=${stableProjUC}_VERSION
+  versionSym=${topProjNameUC}_VERSION
   echo ''
   echo "===> Updating $versionSym in $configFileLoc (if present)"