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

[source_changes at macosforge.org]

Revision: 5089
          http://trac.macosforge.org/projects/calendarserver/changeset/5089
Author:   cdaboo at apple.com
Date:     2010-02-10 20:25:44 -0800 (Wed, 10 Feb 2010)
Log Message:
-----------
Undo some carddav merge changes.

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

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2010-02-10 21:02:58 UTC (rev 5088)
+++ CalendarServer/trunk/support/submit	2010-02-11 04:25:44 UTC (rev 5089)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@
 
 if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi;
 
- project="AddressBookServer";
+ project="CalendarServer";
      uri="$(svn info "${src}" --xml | sed -n 's|^.*<url>\(.*\)</url>.*$|\1|p')";
 revision="$(svnversion "${src}")";
 
@@ -106,8 +106,7 @@
     revision="$(echo "${revision}" | sed 's|M$||g')";
   fi;
 
-#  project_version="${project}-$((${version} + ${revision} / 10000 % 100)).$((${revision} / 100 % 100)).$((${revision} % 100))";
-  project_version="${project}-${version}"
+  project_version="${project}-$((${version} + ${revision} / 10000 % 100)).$((${revision} / 100 % 100)).$((${revision} % 100))";
 
   #
   # Make sure changes are checked in.
@@ -121,13 +120,13 @@
 # Do submission
 #
 
-tmp="$(mktemp -d -t AddressBookServer_build)";
+tmp="$(mktemp -d -t CalendarServer_build)";
 wc="${tmp}/${project_version}";
 
 if "${build}"; then
   echo "";
   echo "Copying ${src}...";
-  ignores="$(mktemp -t AddressBookServer_ignores)";
+  ignores="$(mktemp -t CalendarServer_ignores)";
   svn st --no-ignore | sed -n -e 's|^I......||p' > "${ignores}";
   rsync -av --exclude=".svn" --exclude="_trial_temp" --exclude-from="${ignores}" "${src}/" "${wc}";
   rm "${ignores}";
@@ -159,7 +158,7 @@
 
 echo "";
 echo "Preparing sources for ${project_version}...";
-make SRCROOT="${wc}" -C "${wc}" prep;
+make -C "${wc}" prep;
 
 if "${build}"; then
   echo "";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100210/5537add7/attachment.html>