[CalendarServer-changes] [6256] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Sep 8 09:03:57 PDT 2010
Revision: 6256
http://trac.macosforge.org/projects/calendarserver/changeset/6256
Author: sagen at apple.com
Date: 2010-09-08 09:03:55 -0700 (Wed, 08 Sep 2010)
Log Message:
-----------
Don't install obsolete carddavd-related files
Modified Paths:
--------------
CalendarServer/trunk/setup.py
CalendarServer/trunk/support/Makefile.Apple
Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py 2010-09-08 02:51:18 UTC (rev 6255)
+++ CalendarServer/trunk/setup.py 2010-09-08 16:03:55 UTC (rev 6256)
@@ -122,10 +122,8 @@
"bin/calendarserver_command_gateway",
"bin/calendarserver_purge_events",
"bin/calendarserver_migrate_resources",
- "bin/carddavd",
],
- data_files = [ ("caldavd", ["conf/caldavd.plist"]),
- ("carddavd", ["conf/carddavd.plist" ])],
+ data_files = [ ("caldavd", ["conf/caldavd.plist"]), ],
ext_modules = extensions,
py_modules = [],
)
Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple 2010-09-08 02:51:18 UTC (rev 6255)
+++ CalendarServer/trunk/support/Makefile.Apple 2010-09-08 16:03:55 UTC (rev 6256)
@@ -78,7 +78,6 @@
$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-partitioning-secondary.plist" "$(DSTROOT)$(ETCDIR)/caldavd/caldavd-partitioning-secondary.plist"
$(_v) $(INSTALL_FILE) "$(Sources)/conf/partitions.plist" "$(DSTROOT)$(ETCDIR)/caldavd/partitions.plist"
$(_v) $(INSTALL_FILE) "$(Sources)/conf/servertoserver.xml" "$(DSTROOT)$(ETCDIR)/caldavd/servertoserver.xml"
- $(_v) $(INSTALL_FILE) "$(Sources)/conf/carddavd-apple.plist" "$(DSTROOT)$(ETCDIR)/carddavd/carddavd.plist"
$(_v) chmod -R ugo+r "$(DSTROOT)$(PY_HOME)"
$(_v) for f in $$(find "$(DSTROOT)$(ETCDIR)" -type f ! -name '*.default'); do cp "$${f}" "$${f}.default"; done
$(_v) $(INSTALL_FILE) "$(Sources)/conf/servertoserver.dtd" "$(DSTROOT)$(ETCDIR)/caldavd/servertoserver.dtd"
@@ -87,7 +86,6 @@
@echo "Installing manual pages..."
$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/caldavd.8" "$(DSTROOT)$(MANDIR)/man8"
- $(_v) $(INSTALL_FILE) "$(Sources)/doc/carddavd.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_export.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_manage_principals.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_migrate_resources.8" "$(DSTROOT)$(MANDIR)/man8"
@@ -97,10 +95,8 @@
@echo "Installing launchd config..."
$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/$(Project)"
$(_v) $(INSTALL_DIRECTORY) -o calendar -g calendar -m 0755 "$(DSTROOT)$(VARDIR)/log/caldavd"
- $(_v) $(INSTALL_DIRECTORY) -o calendar -g calendar -m 0755 "$(DSTROOT)$(VARDIR)/log/carddavd"
$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons"
$(_v) $(INSTALL_FILE) "$(Sources)/contrib/launchd/calendarserver.plist" "$(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons/org.calendarserver.calendarserver.plist"
- $(_v) $(INSTALL_FILE) "$(Sources)/contrib/launchd/addressbookserver.plist" "$(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons/org.addressbookserver.addressbookserver.plist"
@echo "Installing migration config..."
$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/System/Library/ServerSetup/MigrationExtras"
$(_v) $(INSTALL_FILE) "$(Sources)/contrib/migration/59_calendarmigrator.py" "$(DSTROOT)/System/Library/ServerSetup/MigrationExtras/59_calendarmigrator.py"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100908/05552f21/attachment.html>
More information about the calendarserver-changes
mailing list