Changeset 1366

Timestamp:

Jul 22, 2009 11:11:38 AM (12 years ago)

Author:

tkr

Message:

Slight change to prepare_new_release

File:

• trunk/prepare_new_release (modified) (8 diffs)

trunk/prepare_new_release

@@ -525 +525 @@
   echo ''
 
-  rm -f Externals
+  rm -f Externals.releases
   ext_name=
   ext_url=
@@ -604 +604 @@
 
       echo "     $ext_rel_url"
-      echo "$ext_name  $ext_rel_url" >>Externals
+      echo "$ext_name  $ext_rel_url" >>Externals.releases
       ext_name=
       echo ''
@@ -614 +614 @@
   echo ''
 
-  svn pset svn:externals -F Externals .
+  svn pset svn:externals -F Externals.releases .
 
   svn update
@@ -624 +624 @@
   ext_name=
   ext_url=
-  for i in `cat Externals`; do
+  for i in `cat Externals.releases`; do
     if test "$ext_name" = ""; then
       ext_name="$i"
@@ -646 +646 @@
     fi
   done
-fi # if test -r Externals
+fi # if test -r Externals.releases
 
 if test $isThirdParty = yes; then
@@ -733 +733 @@
 if test -n "$stableExternals" ; then
   echo "Grooming Externals to remove stable references used for testing."
-  rm -rf Externals.releases
+  mv Externals.releases Externals
   ext_name=
   ext_url=
@@ -754 +754 @@
     fi
   done
-  mv Externals.releases Externals
-  svn propset -F Externals svn:externals .
-fi
-
-
-if test -r Externals; then
+  svn propset -F Externals.releases svn:externals .
+  rm -rf Externals
+fi
+
+
+if test -r Externals.releases; then
   echo ''
   echo 'Also, please confirm the Externals are correct:'
@@ -773 +773 @@
 echo "and run the commit_new_release script"
 
-rm -rf Externals
+rm -rf Externals.releases
 
 cat >.new_release_data <<EOF