[CalendarServer-changes] [951] CalendarServer/trunk/support

[source_changes at macosforge.org]

Revision: 951
          http://trac.macosforge.org/projects/calendarserver/changeset/951
Author:   dreid at apple.com
Date:     2007-01-05 17:00:11 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
install the manpage for caladmin, install the twisted directory, and make support/submit -b not check versions and build with your WC

Modified Paths:
--------------
    CalendarServer/trunk/support/Makefile.Apple
    CalendarServer/trunk/support/submit

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2007-01-05 22:30:21 UTC (rev 950)
+++ CalendarServer/trunk/support/Makefile.Apple	2007-01-06 01:00:11 UTC (rev 951)
@@ -82,6 +82,7 @@
 install::
 	$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(MANDIR)/man8
 	$(_v) $(INSTALL_FILE) $(Sources)/doc/caldavd.8 $(DSTROOT)$(MANDIR)/man8
+	$(_v) $(INSTALL_FILE) $(Sources)/doc/caladmin.8 $(DSTROOT)$(MANDIR)/man8
 	$(_v) gzip -9 -f $(DSTROOT)$(MANDIR)/man8/*.8
 	$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(NSLIBRARYDIR)/$(Project)
 	$(_v) $(INSTALL_DIRECTORY) -o $(USER) -g $(GROUP) $(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/$(Project)/Documents
@@ -96,7 +97,7 @@
 $(BuildDirectory)/$(Project):
 	@echo "Copying source for $(Project)..."
 	$(_v) $(MKDIR) -p "$@"
-	$(_v) pax -rw bin conf Makefile patches setup.py twistedcaldav "$@/"
+	$(_v) pax -rw bin conf Makefile patches setup.py twistedcaldav twisted "$@/"
 
 $(BuildDirectory)/%: %.tgz
 	@echo "Extracting source for $(notdir $<)..."

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2007-01-05 22:30:21 UTC (rev 950)
+++ CalendarServer/trunk/support/submit	2007-01-06 01:00:11 UTC (rev 951)
@@ -76,26 +76,29 @@
 # Do the Right Thing
 ##
 
+if "${build}"; then
+  project_version="${project}-${revision}";
+else 
 #
 # 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;
-else
-  revision="$(echo "${revision}" | sed 's|M$||g')";
-fi;
+  if [ -n "$(echo "${revision}" | sed 's|[0-9M]||g')" ]; then
+    echo "Working copy has multiple versions of files: ${revision}.  Aborting.";
+    exit 1;
+  else
+    revision="$(echo "${revision}" | sed 's|M$||g')";
+  fi;
 
-project_version="${project}-$((${version} + ${revision} / 10000 % 100)).$((${revision} / 100 % 100)).$((${revision} % 100))";
+  project_version="${project}-$((${version} + ${revision} / 10000 % 100)).$((${revision} / 100 % 100)).$((${revision} % 100))";
 
 #
 # Make sure changes are checked in.
 #
-if [ "$(svn st "${src}" | grep -v support/submit)" != "" ]; then
-  echo "Working copy has uncommitted changes.  Aborting.";
-  exit 1;
+  if [ "$(svn st "${src}" | grep -v support/submit)" != "" ]; then
+    echo "Working copy has uncommitted changes.  Aborting.";
+    exit 1;
+  fi;
 fi;
-
 #
 # Do submission
 #
@@ -103,9 +106,15 @@
 tmp="$(mktemp -d -t CalendarServer)";
 wc="${tmp}/${project_version}";
 
-echo "";
-echo "Exporting ${uri}@${revision}..."
-svn export -r "${revision}" "${uri}@${revision}" "${wc}";
+if "${build}"; then
+  echo "";
+  echo "Copying ${src}...";
+  cp -rv "${src}" "${wc}"
+else
+  echo "";
+  echo "Exporting ${uri}@${revision}..."
+  svn export -r "${revision}" "${uri}@${revision}" "${wc}";
+fi;
 
 echo ""
 echo "Tweaking for B&I...";

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