[CalendarServer-changes] [226] CalendarServer/trunk/support/submit

[source_changes at macosforge.org]

Revision: 226
          http://trac.macosforge.org/projects/calendarserver/changeset/226
Author:   wsanchez at apple.com
Date:     2006-10-02 16:25:21 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
Derive version # from svn

Modified Paths:
--------------
    CalendarServer/trunk/support/submit

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2006-10-02 23:22:28 UTC (rev 225)
+++ CalendarServer/trunk/support/submit	2006-10-02 23:25:21 UTC (rev 226)
@@ -25,6 +25,8 @@
 set -e
 set -u
 
+version="11";
+
  wd="$(cd "$(dirname "$0")" && pwd)";
 src="$(cd "${wd}/.." && pwd)";
 
@@ -34,7 +36,7 @@
 
 usage ()
 {
-  program="$(basename "$0") version release";
+  program="$(basename "$0") release";
 
   if [ "${1-}" != "-" ]; then echo "$1"; echo; fi;
 
@@ -52,10 +54,6 @@
 done;
 shift $((${OPTIND} - 1));
 
-if [ $# == 0 ]; then usage "No version specified"; fi;
-
-version="$1"; shift;
-
 if [ $# == 0 ]; then usage "No release specified"; fi;
 
 release="$1"; shift;
@@ -63,7 +61,6 @@
 if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi;
 
  project="CalendarServer";
-     tag="${project}-${version}";
      uri="$(svn info "${src}" --xml | sed -n 's|^.*<url>\(.*\)</url>.*$|\1|p')";
 revision="$(svnversion "${src}")";
 
@@ -75,18 +72,20 @@
 # We need a single revision number
 #
 if [ -n "$(echo "${revision}" | sed 's|[0-9M]||g')" ]; then
-    echo "Working copy has multiple versions of files: ${revision}.  Aborting.";
-    exit 1;
+  echo "Working copy has multiple versions of files: ${revision}.  Aborting.";
+  exit 1;
 else
-    revision="$(echo "${revision}" | sed 's|M$||g')";
+  revision="$(echo "${revision}" | sed 's|M$||g')";
 fi;
 
+tag="${project}-${version}.${revision}";
+
 #
 # Make sure changes are checked in.
 #
 if [ "$(svn st "${src}" | grep -v support/submit)" != "" ]; then
-    echo "Working copy has uncommitted changes.  Aborting.";
-    exit 1;
+  echo "Working copy has uncommitted changes.  Aborting.";
+  exit 1;
 fi;
 
 #

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061002/ee9286f7/attachment.html