Permalink
Browse files

Result of merge -r119:HEAD

  • Loading branch information...
2 parents 9bb014c + 6859c4a commit 27e834e16b328f33b705177e96f720b617bb5e41 @cyrusdaboo cyrusdaboo committed Sep 15, 2006
Showing with 196 additions and 10 deletions.
  1. +55 −10 support/CalDAV.xcodeproj/project.pbxproj
  2. +137 −0 support/Makefile.Apple
  3. +4 −0 support/submit
@@ -48,14 +48,20 @@
3506A86E0922BE1500389D48 /* draft-desruisseaux-caldav-sched.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "draft-desruisseaux-caldav-sched.txt"; sourceTree = "<group>"; };
3506A86F0922BE1500389D48 /* draft-dusseault-caldav.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "draft-dusseault-caldav.txt"; sourceTree = "<group>"; };
350781A2096DF5A4004A4366 /* dateops.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = dateops.py; sourceTree = "<group>"; };
+ 3508925D0ABA0AC100F9995A /* caldavd-dev.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "caldavd-dev.plist"; sourceTree = "<group>"; };
+ 3508925E0ABA0AC100F9995A /* caldavd.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = caldavd.plist; sourceTree = "<group>"; };
+ 3508925F0ABA0AC100F9995A /* launchd.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = launchd.plist; sourceTree = "<group>"; };
+ 350892600ABA0AC100F9995A /* repository-dev.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "repository-dev.xml"; sourceTree = "<group>"; };
+ 350892610ABA0AC100F9995A /* repository-static.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "repository-static.xml"; sourceTree = "<group>"; };
+ 350892620ABA0AC100F9995A /* repository.dtd */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = repository.dtd; sourceTree = "<group>"; };
3524530309897DC400B9179C /* TODO.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO.txt; sourceTree = "<group>"; };
3524532E098982D900B9179C /* test_DAV.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = test_DAV.py; sourceTree = "<group>"; };
353696D1092BB6500075CE69 /* test_icalendar.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = test_icalendar.py; sourceTree = "<group>"; };
- 353A557C099153D900A08D28 /* setup.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = setup.py; sourceTree = "<group>"; };
+ 353A557C099153D900A08D28 /* setup.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = setup.py; path = ../setup.py; sourceTree = "<group>"; };
353A63BF0994448C00A08D28 /* caldavd */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = caldavd; sourceTree = "<group>"; };
359CD65C0946136A002E3A15 /* test_xml.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = test_xml.py; sourceTree = "<group>"; };
- 35A15ED40985C14800D404FF /* run */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = run; sourceTree = "<group>"; };
- 35A15ED60985C14800D404FF /* test */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = test; sourceTree = "<group>"; };
+ 35A15ED40985C14800D404FF /* run */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; name = run; path = ../run; sourceTree = "<group>"; };
+ 35A15ED60985C14800D404FF /* test */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; name = test; path = ../test; sourceTree = "<group>"; };
35B48642095CA1D000AB3411 /* rfc2518.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = rfc2518.txt; sourceTree = "<group>"; };
35B48643095CA1D000AB3411 /* rfc3253.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = rfc3253.txt; sourceTree = "<group>"; };
35B48644095CA1D000AB3411 /* rfc3744.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = rfc3744.txt; sourceTree = "<group>"; };
@@ -65,20 +71,20 @@
35B71A27097C3B2C00E65B22 /* report_multiget.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = report_multiget.py; sourceTree = "<group>"; };
35B8AA660A0BFE60005547E5 /* http.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = http.py; sourceTree = "<group>"; };
35B8AA670A0BFE60005547E5 /* repository.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = repository.py; sourceTree = "<group>"; };
- 35CF70B50A0FF59100993B2A /* repository.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = repository.xml; path = conf/repository.xml; sourceTree = "<group>"; };
- 35CF70B60A0FF59100993B2A /* server.pem */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = server.pem; path = conf/server.pem; sourceTree = "<group>"; };
+ 35CF70B50A0FF59100993B2A /* repository.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = repository.xml; sourceTree = "<group>"; };
+ 35CF70B60A0FF59100993B2A /* server.pem */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = server.pem; sourceTree = "<group>"; };
35E2ACFF09BF6D3400BC8CB9 /* logging.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = logging.py; sourceTree = "<group>"; };
35E2AF1409C2491600BC8CB9 /* put_common.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = put_common.py; sourceTree = "<group>"; };
35E2AF1509C2491600BC8CB9 /* schedule.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = schedule.py; sourceTree = "<group>"; };
- 35E2B38109C7C2DF00BC8CB9 /* patches */ = {isa = PBXFileReference; lastKnownFileType = folder; path = patches; sourceTree = "<group>"; };
+ 35E2B38109C7C2DF00BC8CB9 /* lib-patches */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "lib-patches"; sourceTree = "<group>"; };
35E8059B0981C33F000981A6 /* test_props.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = test_props.py; sourceTree = "<group>"; };
35F36BAF09B3E8AD00A3D736 /* resource.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = resource.py; sourceTree = "<group>"; };
35F36C0E09B4FA6A00A3D736 /* icaldav.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = icaldav.py; sourceTree = "<group>"; };
35FC85A009ABEC0600586387 /* test_freebusyquery.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = test_freebusyquery.py; sourceTree = "<group>"; };
35FC85A109ABEC0600586387 /* test_multiget.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = test_multiget.py; sourceTree = "<group>"; };
35FC85A209ABEC9700586387 /* report_common.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = report_common.py; sourceTree = "<group>"; };
35FC85A309ABEC9700586387 /* report_freebusy.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = report_freebusy.py; sourceTree = "<group>"; };
- 35FC85A809ABED2B00586387 /* version.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; name = version.py; path = twistedcaldav/version.py; sourceTree = "<group>"; };
+ 35FC85A809ABED2B00586387 /* version.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; name = version.py; path = ../twistedcaldav/version.py; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
@@ -90,6 +96,7 @@
3506A86B0922BE1500389D48 /* Documentation */,
353A63B50994444700A08D28 /* Scripts */,
35A15ED30985C12C00D404FF /* Support */,
+ 350892570ABA0A8C00F9995A /* Configuration */,
);
sourceTree = "<group>";
};
@@ -158,7 +165,7 @@
isa = PBXGroup;
children = (
35069C160922B96300389D48 /* twistedcaldav */,
- 35E2B38109C7C2DF00BC8CB9 /* patches */,
+ 35E2B38109C7C2DF00BC8CB9 /* lib-patches */,
);
name = CalendarServer;
path = ..;
@@ -197,6 +204,46 @@
path = RFC;
sourceTree = "<group>";
};
+ 350892570ABA0A8C00F9995A /* Configuration */ = {
+ isa = PBXGroup;
+ children = (
+ 350892800ABA0B8900F9995A /* Development */,
+ 3508927F0ABA0B8300F9995A /* Open Directory */,
+ 350892810ABA0BB700F9995A /* Static XML */,
+ 350892620ABA0AC100F9995A /* repository.dtd */,
+ 35CF70B60A0FF59100993B2A /* server.pem */,
+ 3508925F0ABA0AC100F9995A /* launchd.plist */,
+ );
+ name = Configuration;
+ path = ../conf;
+ sourceTree = "<group>";
+ };
+ 3508927F0ABA0B8300F9995A /* Open Directory */ = {
+ isa = PBXGroup;
+ children = (
+ 3508925E0ABA0AC100F9995A /* caldavd.plist */,
+ 35CF70B50A0FF59100993B2A /* repository.xml */,
+ );
+ name = "Open Directory";
+ sourceTree = "<group>";
+ };
+ 350892800ABA0B8900F9995A /* Development */ = {
+ isa = PBXGroup;
+ children = (
+ 3508925D0ABA0AC100F9995A /* caldavd-dev.plist */,
+ 350892600ABA0AC100F9995A /* repository-dev.xml */,
+ );
+ name = Development;
+ sourceTree = "<group>";
+ };
+ 350892810ABA0BB700F9995A /* Static XML */ = {
+ isa = PBXGroup;
+ children = (
+ 350892610ABA0AC100F9995A /* repository-static.xml */,
+ );
+ name = "Static XML";
+ sourceTree = "<group>";
+ };
353A63B50994444700A08D28 /* Scripts */ = {
isa = PBXGroup;
children = (
@@ -213,8 +260,6 @@
35A15ED60985C14800D404FF /* test */,
353A557C099153D900A08D28 /* setup.py */,
35FC85A809ABED2B00586387 /* version.py */,
- 35CF70B50A0FF59100993B2A /* repository.xml */,
- 35CF70B60A0FF59100993B2A /* server.pem */,
);
name = Support;
sourceTree = "<group>";
View
@@ -0,0 +1,137 @@
+##
+# B&I Makefile for CalendarServer
+#
+# This is only useful internally at Apple, probably.
+##
+# Copyright (c) 2005-2006 Apple Computer, 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# DRI: Wilfredo Sanchez, wsanchez@apple.com
+##
+
+# Project info
+Project = CalendarServer
+ProjectName = CalendarServer
+UserType = Server
+ToolType = Applications
+
+# Include common makefile targets for B&I
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make
+
+PYTHON = /usr/bin/python
+PY_INSTALL_FLAGS = --root="$(DSTROOT)" --home="$(SHAREDIR)/caldavd"
+
+USER = 93 # FIXME: calendar
+GROUP = 93 # FIXME: calendar
+
+#
+# Build
+#
+
+.phony: $(Project) vobject Twisted setup prep
+
+PyKerberos:: $(BuildDirectory)/PyKerberos
+PyOpenDirectory:: $(BuildDirectory)/PyOpenDirectory
+vobject:: $(BuildDirectory)/vobject
+Twisted:: $(BuildDirectory)/Twisted
+$(Project):: $(BuildDirectory)/$(Project)
+
+build:: PyKerberos PyOpenDirectory vobject Twisted $(Project)
+
+setup:
+ $(_v) $(Sources)/run -s
+
+prep:: setup PyKerberos.tgz PyOpenDirectory.tgz vobject.tgz Twisted.tgz
+
+PyKerberos PyOpenDirectory vobject $(Project)::
+ @echo "Building $@..."
+ $(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
+
+TwistedSubEnvironment = $(Environment) PYTHONPATH="$(DSTROOT)$(SHAREDIR)/caldavd/lib/python"
+
+Twisted::
+ @echo "Building Twisted..."
+ $(_v) cd $(BuildDirectory)/Twisted && $(Environment) $(PYTHON) twisted/topfiles/setup.py install $(PY_INSTALL_FLAGS)
+ $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web/topfiles/setup.py build
+ $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web2/topfiles/setup.py build
+
+install:: build
+ $(_v) cd $(BuildDirectory)/$(Project) && $(Environment) $(PYTHON) setup.py install \
+ $(PY_INSTALL_FLAGS) \
+ --install-scripts="$(USRSBINDIR)" \
+ --install-data="$(ETCDIR)"
+ $(_v) cd $(BuildDirectory)/PyKerberos && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
+ $(_v) cd $(BuildDirectory)/PyOpenDirectory && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
+ $(_v) cd $(BuildDirectory)/vobject && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
+ $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web/topfiles/setup.py install $(PY_INSTALL_FLAGS)
+ $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web2/topfiles/setup.py install $(PY_INSTALL_FLAGS)
+ $(_v) for so in $$(find "$(DSTROOT)$(SHAREDIR)/caldavd/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done
+ $(_v) for f in $$(find "$(DSTROOT)$(ETCDIR)" -type f ! -name '*.default'); do cp "$${f}" "$${f}.default"; done
+
+install::
+ $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(MANDIR)/man8
+ $(_v) $(INSTALL_FILE) $(Sources)/doc/caldavd.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
+ $(_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
+
+#
+# Automatic Extract
+#
+
+$(BuildDirectory)/$(Project):
+ @echo "Copying source for $(Project)..."
+ $(_v) $(MKDIR) -p "$@"
+ $(_v) pax -rw bin conf Makefile patches setup.py twistedcaldav "$@/"
+
+$(BuildDirectory)/%: %.tgz
+ @echo "Extracting source for $(notdir $<)..."
+ $(_v) $(MKDIR) -p "$(BuildDirectory)"
+ $(_v) $(RMDIR) "$@"
+ $(_v) $(TAR) -C "$(BuildDirectory)" -xzf $<
+
+%.tgz: ../%
+ @echo "Archiving sources for $(notdir $<)..."
+ $(_v) $(TAR) -C "$(dir $<)" \
+ --exclude=.svn \
+ --exclude=build \
+ --exclude=_trial_temp \
+ --exclude=dropin.cache \
+ -czf $@ "$(notdir $<)"
+
+#
+# Open Source Hooey
+#
+
+OSV = /usr/local/OpenSourceVersions
+OSL = /usr/local/OpenSourceLicenses
+
+#install:: install-ossfiles
+
+install-ossfiles::
+ $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSV)
+ $(_v) $(INSTALL_FILE) $(Sources)/$(ProjectName).plist $(DSTROOT)/$(OSV)/$(ProjectName).plist
+ $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSL)
+ $(_v) $(INSTALL_FILE) $(BuildDirectory)/$(Project)/LICENSE $(DSTROOT)/$(OSL)/$(ProjectName).txt
+
+#
+# B&I Hooey
+#
+
+buildit: prep
+ @echo "Running buildit..."
+ $(_v) sudo ~rc/bin/buildit $(CC_Archs) $(Sources)
View
@@ -98,6 +98,10 @@ echo "";
echo "Exporting ${tag_uri}..."
svn export "${tag_uri}" "${wc}";
+echo ""
+echo "Tweaking for B&I...";
+ln -s support/Makefile.Apple "${wc}/Makefile";
+
echo "";
echo "Preparing sources...";
make -C "${wc}" prep;

0 comments on commit 27e834e

Please sign in to comment.