Changeset 2841 for trunk

Timestamp:

Aug 3, 2013 2:40:00 PM (7 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:

• prepare_new_release (modified) (3 diffs)
• prepare_new_stable (modified) (3 diffs)

trunk/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 . -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"
+fi
 
 if test -n "$bak_files" ; then
@@ -448 +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 . -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)"

trunk/prepare_new_stable

@@ -330 +330 @@
 # Construct a build directory name.
 
-topBuildDir=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
-topBuildDir=${topBuildDir}-${newVersion}
+topProjName=`echo $srcProj | sed -e 's|.*/\([^/]*\)$|\1|'`
+topBuildDir=${topProjName}-${newVersion}
 echo "Build directory.....: $topBuildDir"
 
@@ -382 +382 @@
 
 echo ''
-bak_files=`find . -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"
+fi
 echo "===> Creating backup (.bak) for configure.ac files..."
 for i in $bak_files; do
@@ -405 +410 @@
 # add config_proj_default.h.bak to the list of files to be restored.
 
-srcProjUC=`echo $srcProj | tr '[a-z]' '[A-Z]'`
-configFileLoc=`find . -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
+echo "config File Loc: $configFileLoc"
 if test -n "$configFileLoc" ; then
-  versionSym=${srcProjUC}_VERSION
+  versionSym=${topProjNameUC}_VERSION
   echo ''
   echo "===> Updating $versionSym in $configFileLoc (if present)"