[CalendarServer-changes] [12076] CalendarServer/trunk/setup.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:19:03 PDT 2014
Revision: 12076
http://trac.calendarserver.org//changeset/12076
Author: wsanchez at apple.com
Date: 2013-12-12 17:49:39 -0800 (Thu, 12 Dec 2013)
Log Message:
-----------
cosmetic
Modified Paths:
--------------
CalendarServer/trunk/setup.py
Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py 2013-12-13 01:42:24 UTC (rev 12075)
+++ CalendarServer/trunk/setup.py 2013-12-13 01:49:39 UTC (rev 12076)
@@ -24,6 +24,8 @@
from version import version
+
+
def find_modules():
modules = [
"twisted.plugins",
@@ -52,9 +54,9 @@
# Options
#
-description = "CalDAV/CardDAV protocol extensions to twext.web2.dav",
+description = "Calendar and Contacts Server",
long_description = """
-Extends twisted.web2.dav to implement CalDAV/CardDAV-aware resources and methods.
+Calendar and Contacts Server, implementing the CalDAV and CardDAV protocols.
"""
classifiers = None
@@ -65,7 +67,10 @@
version_number, version_info = version()
-version_string = "{number} ({info})".format(number=version_number, info=version_info)
+version_string = (
+ "{number} ({info})"
+ .format(number=version_number, info=version_info)
+)
version_file = file(os.path.join("calendarserver", "version.py"), "w")
version_file.write('version = "{version}"\n'.format(version=version_string))
version_file.close()
@@ -115,50 +120,50 @@
platforms=["all"],
packages=find_modules(),
package_data={
- "twistedcaldav": [
- "*.html",
- "zoneinfo/*.ics",
- "zoneinfo/*/*.ics",
- "zoneinfo/*/*/*.ics",
- "images/*/*.jpg",
- ],
- "calendarserver.webadmin": [
- "*.html"
- ],
- "twistedcaldav.directory": [
- "*.html"
- ],
- "txdav.common.datastore": [
- "sql_schema/*.sql",
- "sql_schema/*/*.sql",
- "sql_schema/*/*/*.sql",
- ],
- },
+ "twistedcaldav": [
+ "*.html",
+ "zoneinfo/*.ics",
+ "zoneinfo/*/*.ics",
+ "zoneinfo/*/*/*.ics",
+ "images/*/*.jpg",
+ ],
+ "calendarserver.webadmin": [
+ "*.html"
+ ],
+ "twistedcaldav.directory": [
+ "*.html"
+ ],
+ "txdav.common.datastore": [
+ "sql_schema/*.sql",
+ "sql_schema/*/*.sql",
+ "sql_schema/*/*/*.sql",
+ ],
+ },
scripts=[
- "bin/caldavd",
- "bin/calendarserver_backup",
- "bin/calendarserver_bootstrap_database",
- "bin/calendarserver_command_gateway",
- "bin/calendarserver_config",
- #"bin/calendarserver_dbinspect",
- #"bin/calendarserver_dkimtool",
- "bin/calendarserver_export",
- #"bin/calendarserver_icalendar_validate",
- #"bin/calendarserver_load_augmentdb",
- #"bin/calendarserver_manage_postgres",
- "bin/calendarserver_manage_principals",
- "bin/calendarserver_manage_push",
- "bin/calendarserver_manage_timezones",
- "bin/calendarserver_migrate_resources",
- #"bin/calendarserver_monitor_amp_notifications",
- #"bin/calendarserver_monitor_notifications",
- "bin/calendarserver_purge_attachments",
- "bin/calendarserver_purge_events",
- "bin/calendarserver_purge_principals",
- "bin/calendarserver_shell",
- "bin/calendarserver_upgrade",
- #"bin/calendarserver_verify_data",
- ],
+ "bin/caldavd",
+ "bin/calendarserver_backup",
+ "bin/calendarserver_bootstrap_database",
+ "bin/calendarserver_command_gateway",
+ "bin/calendarserver_config",
+ # "bin/calendarserver_dbinspect",
+ # "bin/calendarserver_dkimtool",
+ "bin/calendarserver_export",
+ # "bin/calendarserver_icalendar_validate",
+ # "bin/calendarserver_load_augmentdb",
+ # "bin/calendarserver_manage_postgres",
+ "bin/calendarserver_manage_principals",
+ "bin/calendarserver_manage_push",
+ "bin/calendarserver_manage_timezones",
+ "bin/calendarserver_migrate_resources",
+ # "bin/calendarserver_monitor_amp_notifications",
+ # "bin/calendarserver_monitor_notifications",
+ "bin/calendarserver_purge_attachments",
+ "bin/calendarserver_purge_events",
+ "bin/calendarserver_purge_principals",
+ "bin/calendarserver_shell",
+ "bin/calendarserver_upgrade",
+ # "bin/calendarserver_verify_data",
+ ],
data_files=[("caldavd", ["conf/caldavd.plist"]), ],
ext_modules=extensions,
py_modules=[],
@@ -177,7 +182,9 @@
install_lib = install_lib[len(root):]
for script in dist.scripts:
- scriptPath = os.path.join(install_scripts, os.path.basename(script))
+ scriptPath = os.path.join(
+ install_scripts, os.path.basename(script)
+ )
print("rewriting {0}".format(scriptPath))
@@ -196,17 +203,29 @@
line = line.rstrip("\n")
if fileType == "sh":
if line == "#PYTHONPATH":
- script.append('PYTHONPATH="{add}:$PYTHONPATH"'.format(add=install_lib))
+ script.append(
+ 'PYTHONPATH="{add}:$PYTHONPATH"'
+ .format(add=install_lib)
+ )
elif line == "#PATH":
- script.append('PATH="{add}:$PATH"'.format(add=os.path.join(base, "usr", "bin")))
+ script.append(
+ 'PATH="{add}:$PATH"'
+ .format(add=os.path.join(base, "usr", "bin"))
+ )
else:
script.append(line)
elif fileType == "python":
if line == "#PYTHONPATH":
- script.append('PYTHONPATH="{path}"'.format(path=install_lib))
+ script.append(
+ 'PYTHONPATH="{path}"'
+ .format(path=install_lib)
+ )
elif line == "#PATH":
- script.append('PATH="{path}"'.format(path=os.path.join(base, "usr", "bin")))
+ script.append(
+ 'PATH="{path}"'
+ .format(path=os.path.join(base, "usr", "bin"))
+ )
else:
script.append(line)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/efb6b468/attachment.html>
More information about the calendarserver-changes
mailing list