[CalendarServer-changes] [955] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 955
          http://trac.macosforge.org/projects/calendarserver/changeset/955
Author:   dreid at apple.com
Date:     2007-01-08 08:29:48 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
move sbs_backup stuff to the apple makefile, and rewrite #PATH, and #PYTHONPATH in bin/caldavd to appropriate directories after installation.

Modified Paths:
--------------
    CalendarServer/trunk/bin/caldavd
    CalendarServer/trunk/conf/launchd.plist
    CalendarServer/trunk/setup.py
    CalendarServer/trunk/support/Makefile.Apple

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2007-01-06 02:57:34 UTC (rev 954)
+++ CalendarServer/trunk/bin/caldavd	2007-01-08 16:29:48 UTC (rev 955)
@@ -18,6 +18,9 @@
 # DRI: David Reid, dreid at apple.com
 ##
 
+#PATH
+#PYTHONPATH
+
 daemonize="";
 username="";
 groupname="";

Modified: CalendarServer/trunk/conf/launchd.plist
===================================================================
--- CalendarServer/trunk/conf/launchd.plist	2007-01-06 02:57:34 UTC (rev 954)
+++ CalendarServer/trunk/conf/launchd.plist	2007-01-08 16:29:48 UTC (rev 955)
@@ -26,14 +26,6 @@
   <key>Disabled</key>
   <true/>
 
-  <key>EnvironmentVariables</key>
-  <dict>
-    <key>PATH</key>
-    <string>/usr/bin:/usr/share/caldavd/bin</string>
-    <key>PYTHONPATH</key>
-    <string>/usr/share/caldavd/lib/python</string>
-  </dict>
-
   <key>ProgramArguments</key>
   <array>
     <string>/usr/sbin/caldavd</string>

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2007-01-06 02:57:34 UTC (rev 954)
+++ CalendarServer/trunk/setup.py	2007-01-08 16:29:48 UTC (rev 955)
@@ -73,13 +73,7 @@
 
 from distutils.core import setup
 
-data_files = [("caldavd", ["conf/caldavd.plist",])]
-
-if sys.platform == 'darwin':
-    data_files.append(('sbs_backup', ['conf/85-calendar.plist']))
-    data_files.append(('/usr/libexec/sbs_backup', ['bin/calendar_restore']))
-
-setup(
+dist = setup(
     name             = "twistedcaldav",
     version          = version,
     description      = description,
@@ -96,5 +90,29 @@
                          "twisted" ],
     package_data     = { "twisted": ["plugins/caldav.py"] },
     scripts          = [ "bin/caldavd", "bin/caladmin" ],
-    data_files       = data_files
+    data_files = [("caldavd", ["conf/caldavd.plist",])]
 )
+
+if 'install' in dist.commands:
+    import os
+    install_scripts = dist.command_obj['install'].install_scripts
+    install_lib = dist.command_obj['install'].install_lib
+    base = dist.command_obj['install'].install_base
+
+    caldavdPath = os.path.join(install_scripts, 'caldavd')
+
+    print "rewriting %s" % (caldavdPath,)
+
+    caldavd = []
+    for line in file(caldavdPath, 'r'):
+        line = line.rstrip('\n')
+        if line == '#PYTHONPATH':
+            caldavd.append('PYTHONPATH="%s:$PYTHONPATH"' % (install_lib,))
+        elif line == '#PATH':
+            caldavd.append('PATH="%s:$PATH"' % (os.path.join(base, 'bin'),))
+        else:
+            caldavd.append(line)
+
+    newCaldavd = open(caldavdPath, 'w')
+    newCaldavd.write('\n'.join(caldavd))
+    newCaldavd.close()

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2007-01-06 02:57:34 UTC (rev 954)
+++ CalendarServer/trunk/support/Makefile.Apple	2007-01-08 16:29:48 UTC (rev 955)
@@ -89,6 +89,8 @@
 	$(_v) $(INSTALL_DIRECTORY) -o $(USER) -g $(GROUP) $(DSTROOT)$(VARDIR)/log/caldavd
 	$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons
 	$(_v) $(INSTALL_FILE) $(Sources)/conf/launchd.plist $(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons/org.darwin.calendarserver.plist
+	$(_v) $(INSTALL_FILE) $(Sources)/conf/85-calendar.plist $(DSTROOT)/private/etc/sbs_backup/
+	$(_v) $(INSTALL_FILE) $(Sources)/bin/calendar_restore $(DSTROOT)/usr/libexec/sbs_backup/
 
 #
 # Automatic Extract

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