December 2014 - calendarserver-changes

[14242] CalendarServer/trunk/txdav/who/cache.py
by source_changes＠macosforge.org 23 Dec '14

23 Dec '14

Revision: 14242 http://trac.calendarserver.org//changeset/14242 Author: cdaboo(a)apple.com Date: 2014-12-23 09:29:57 -0800 (Tue, 23 Dec 2014) Log Message: ----------- Whitespace. Modified Paths: -------------- CalendarServer/trunk/txdav/who/cache.py Modified: CalendarServer/trunk/txdav/who/cache.py =================================================================== --- CalendarServer/trunk/txdav/who/cache.py 2014-12-19 01:54:19 UTC (rev 14241) +++ CalendarServer/trunk/txdav/who/cache.py 2014-12-23 17:29:57 UTC (rev 14242) @@ -102,7 +102,6 @@ self.resetCache() - def setTimingMethod(self, f): """ Replace the default no-op timing method @@ -212,7 +211,6 @@ pass - def purgeExpiredRecords(self): """ Scans the cache for expired records and deletes them @@ -228,7 +226,6 @@ del self._cache[indexType][key] - def lookupRecord(self, indexType, key, name): """ Looks for a record in the specified index, under the specified key.

1 0

[14241] CalendarServer/trunk
by source_changes＠macosforge.org 19 Dec '14

19 Dec '14

Revision: 14241 http://trac.calendarserver.org//changeset/14241 Author: wsanchez(a)apple.com Date: 2014-12-18 17:54:19 -0800 (Thu, 18 Dec 2014) Log Message: ----------- Add package tool. Added Paths: ----------- CalendarServer/trunk/bin/package CalendarServer/trunk/support/_run_from_ve Added: CalendarServer/trunk/bin/package =================================================================== --- CalendarServer/trunk/bin/package (rev 0) +++ CalendarServer/trunk/bin/package 2014-12-19 01:54:19 UTC (rev 14241) @@ -0,0 +1,130 @@ +#!/bin/sh +# -*- sh-basic-offset: 2 -*- + +## +# Copyright (c) 2005-2014 Apple 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. +## + +## +# WARNING: This script is intended for use by developers working on +# the Calendar Server code base. It is not intended for use in a +# deployment configuration. +# +# DO NOT use this script as a system startup tool (eg. in /etc/init.d, +# /Library/StartupItems, launchd plists, etc.) +# +# For those uses, install the server properly (eg. with "./run -i +# /tmp/foo && cd /tmp/foo && pax -pe -rvw . /") and use the caldavd +# executable to start the server. +## + +set -e; +set -u; + +wd="$(cd "$(dirname "$0")/.." && pwd)"; + + +# +# Usage +# + +clean="false"; + +usage () { + program="$(basename "$0")"; + + if [ "${1--}" != "-" ]; then + echo "$@"; + echo; + fi; + + echo "Usage: ${program} [-hFfn] destination"; + echo "Options:"; + echo " -h Print this help and exit"; + echo " -F Clean and force setup to run"; + echo " -f Force setup to run"; + echo " -n Do not run setup"; + + if [ "${1-}" == "-" ]; then + return 0; + fi; + exit 64; +} + + +parse_options () { + OPTIND=1; + while getopts "hFfn" option; do + case "${option}" in + '?') usage; ;; + 'h') usage -; exit 0; ;; + 'F') do_setup="true" ; force_setup="true" ; clean="true" ; ;; + 'f') do_setup="true" ; force_setup="true" ; clean="false"; ;; + 'n') do_setup="false"; force_setup="false"; clean="false"; ;; + esac; + done; + shift $((${OPTIND} - 1)); + + if [ $# -le 0 ]; then + usage "No desination provided."; + fi; + destination="$1"; shift; + + if [ $# != 0 ]; then + usage "Unrecognized arguments:" "$@"; + fi; +} + + +main () { + . "${wd}/bin/_build.sh"; + + parse_options "$@"; + + # Build the product + + if "${clean}"; then + develop_clean; + fi; + + develop; + + install -d "${destination}"; + + install -d "${destination}/virtualenv"; + cp -pR "${py_virtualenv}/" "${destination}/virtualenv"; + + # Make the python virtualenv relocatable + "${bootstrap_python}" -m virtualenv --relocatable "${destination}/virtualenv"; + + cp -pR "${dev_roots}"/*/ "${destination}/virtualenv/"; + + install -d "${destination}/bin"; + install -m 555 "${wd}/support/_run_from_ve" "${destination}/bin"; + ln -fsv _run_from_ve "${destination}/bin/caldavd"; + + for script in $( + python -c 'import setup; print "\n".join("calendarserver_{}".format(n) for n in setup.script_entry_points.keys())'; + ); do + ln -fsv _run_from_ve "${destination}/bin/${script}"; + done; + + # More here... + # Looks like we need to install calendarserver. + # Maybe should rebuild virtualenv insted of copying it. +} + + +main "$@"; Property changes on: CalendarServer/trunk/bin/package ___________________________________________________________________ Added: svn:executable + * Added: CalendarServer/trunk/support/_run_from_ve =================================================================== --- CalendarServer/trunk/support/_run_from_ve (rev 0) +++ CalendarServer/trunk/support/_run_from_ve 2014-12-19 01:54:19 UTC (rev 14241) @@ -0,0 +1,33 @@ +#!/bin/sh +# -*- sh-basic-offset: 2 -*- + +## +# Copyright (c) 2014 Apple 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. +## + +set -e; +set -u; + +dstroot="$(cd "$(dirname "$0")/../virtualenv" && pwd)"; + +export PATH="${dstroot}/bin:${PATH}"; +export C_INCLUDE_PATH="${dstroot}/include:${C_INCLUDE_PATH:-}"; +export LD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:${LD_LIBRARY_PATH:-}"; +export CPPFLAGS="-I${dstroot}/include ${CPPFLAGS:-} "; +export LDFLAGS="-L${dstroot}/lib -L${dstroot}/lib64 ${LDFLAGS:-} "; +export DYLD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:${DYLD_LIBRARY_PATH:-}"; +export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"; + +exec "${dstroot}/bin/$(basename "$0")"; Property changes on: CalendarServer/trunk/support/_run_from_ve ___________________________________________________________________ Added: svn:executable + *

1 0

[14240] CalendarServer/trunk/bin
by source_changes＠macosforge.org 19 Dec '14

19 Dec '14

Revision: 14240 http://trac.calendarserver.org//changeset/14240 Author: wsanchez(a)apple.com Date: 2014-12-18 17:53:54 -0800 (Thu, 18 Dec 2014) Log Message: ----------- Remove cruft. Modified Paths: -------------- CalendarServer/trunk/bin/benchmark CalendarServer/trunk/bin/benchreport Modified: CalendarServer/trunk/bin/benchmark =================================================================== --- CalendarServer/trunk/bin/benchmark 2014-12-19 01:53:32 UTC (rev 14239) +++ CalendarServer/trunk/bin/benchmark 2014-12-19 01:53:54 UTC (rev 14240) @@ -21,8 +21,6 @@ wd="$(cd "$(dirname "$0")/.." && pwd -L)"; -export _DEVELOP="true"; - . "${wd}/bin/_build.sh"; init_build > /dev/null; Modified: CalendarServer/trunk/bin/benchreport =================================================================== --- CalendarServer/trunk/bin/benchreport 2014-12-19 01:53:32 UTC (rev 14239) +++ CalendarServer/trunk/bin/benchreport 2014-12-19 01:53:54 UTC (rev 14240) @@ -21,8 +21,6 @@ wd="$(cd "$(dirname "$0")/.." && pwd -L)"; -export _DEVELOP="true"; - . "${wd}/bin/_build.sh"; init_build > /dev/null;

1 0

[14239] CalendarServer/trunk/bin/_build.sh
by source_changes＠macosforge.org 19 Dec '14

19 Dec '14

Revision: 14239 http://trac.calendarserver.org//changeset/14239 Author: wsanchez(a)apple.com Date: 2014-12-18 17:53:32 -0800 (Thu, 18 Dec 2014) Log Message: ----------- Don't put setuptools and pip into the virtualenv. We already have them in ve_tools. Modified Paths: -------------- CalendarServer/trunk/bin/_build.sh Modified: CalendarServer/trunk/bin/_build.sh =================================================================== --- CalendarServer/trunk/bin/_build.sh 2014-12-19 01:52:50 UTC (rev 14238) +++ CalendarServer/trunk/bin/_build.sh 2014-12-19 01:53:32 UTC (rev 14239) @@ -596,7 +596,10 @@ if [ ! -d "${py_virtualenv}" ]; then bootstrap_virtualenv; - "${bootstrap_python}" -m virtualenv --system-site-packages "${py_virtualenv}"; + "${bootstrap_python}" -m virtualenv \ + --system-site-packages \ + --no-setuptools \ + "${py_virtualenv}"; fi; cd "${wd}"; @@ -702,3 +705,20 @@ c_dependencies; py_dependencies; } + + +develop_clean () { + init_build; + + # Clean + rm -rf "${dev_roots}"; + rm -rf "${py_virtualenv}"; +} + + +develop_distclean () { + init_build; + + # Clean + rm -rf "${dev_home}"; +}

1 0

[14238] CalendarServer/trunk/bin/run
by source_changes＠macosforge.org 19 Dec '14

19 Dec '14

Revision: 14238 http://trac.calendarserver.org//changeset/14238 Author: wsanchez(a)apple.com Date: 2014-12-18 17:52:50 -0800 (Thu, 18 Dec 2014) Log Message: ----------- Remove cruft; this is not an installer. Modified Paths: -------------- CalendarServer/trunk/bin/run Modified: CalendarServer/trunk/bin/run =================================================================== --- CalendarServer/trunk/bin/run 2014-12-19 01:52:00 UTC (rev 14237) +++ CalendarServer/trunk/bin/run 2014-12-19 01:52:50 UTC (rev 14238) @@ -62,23 +62,20 @@ echo "Usage: ${program} [-hvgsfnpdkrR] [-K key] [-iIb dst] [-t type] [-S statsdirectory] [-P plugin]"; echo "Options:"; - echo " -h Print this help and exit"; - echo " -s Run setup only; don't run server"; - echo " -f Force setup to run"; - echo " -n Do not run setup"; - echo " -p Print PYTHONPATH value for server and exit"; - echo " -e Print =-separated environment variables required to run and exit"; - echo " -d Run caldavd as a daemon"; - echo " -k Stop caldavd"; - echo " -r Restart caldavd"; - echo " -K Print value of configuration key and exit"; - # echo " -i Perform a system install into dst; implies -s"; - # echo " -I Perform a home install into dst; implies -s"; - # echo " -b Perform a bundled install (include all dependencies) into dst; implies -s"; - echo " -t Select the server process type (Master, Slave or Combined) [${service_type}]"; - echo " -S Write a pstats object for each process to the given directory when the server is stopped."; - echo " -P Select the twistd plugin name [${plugin_name}]"; - echo " -R Twisted Reactor plugin to execute [${reactor}]"; + echo " -h Print this help and exit"; + echo " -s Run setup only; don't run server"; + echo " -f Force setup to run"; + echo " -n Do not run setup"; + echo " -p Print PYTHONPATH value for server and exit"; + echo " -e Print =-separated environment variables required to run and exit"; + echo " -d Run caldavd as a daemon"; + echo " -k Stop caldavd"; + echo " -r Restart caldavd"; + echo " -K Print value of configuration key and exit"; + echo " -t Select the server process type (Master, Slave or Combined) [${service_type}]"; + echo " -S Write a pstats object for each process to the given directory when the server is stopped."; + echo " -P Select the twistd plugin name [${plugin_name}]"; + echo " -R Twisted Reactor plugin to execute [${reactor}]"; if [ "${1-}" == "-" ]; then return 0; @@ -92,7 +89,6 @@ parse_options () { OPTIND=1; print_path="false"; - print_environment="false"; while getopts "ahsfnpedkrc:K:i:I:b:t:S:P:R:" option; do case "${option}" in '?') usage; ;; @@ -111,33 +107,6 @@ 'p') do_get="false"; do_setup="false"; run="false"; print_path="true"; ;; - # 'e') - # do_get="false"; do_setup="false"; run="false"; print_path="true"; - # print_environment="true"; - # ;; - # 'i') - # do_get="true"; - # do_setup="true"; - # run="false"; - # install="${OPTARG}"; - # install_flag="--root="; - # ;; - # 'I') - # do_get="true"; - # do_setup="true"; - # run="false"; - # install="${wd}/build/dst"; - # install_flag="--root="; - # install_home="${OPTARG}"; - # ;; - # 'b') - # do_bundle="true"; - # do_get="true"; - # do_setup="true"; - # run="false"; - # install="${OPTARG}"; - # install_flag="--root="; - # ;; 'n') do_setup="false"; force_setup="false"; ;; esac; done; @@ -226,8 +195,6 @@ # About to do something for real; let's enumerate (and depending on options, # possibly download and/or install) the dependencies. - export _DEVELOP="true"; - develop; if "${kill}" || "${restart}"; then @@ -250,18 +217,6 @@ fi; fi; - # # If we're installing, install the calendar server itself. - # py_install "Calendar Server" "${wd}"; - - # if [ -n "${install_home:-}" ]; then - # do_home_install; - # fi; - - # if "${do_bundle}"; then - # write_environment; - # fi; - - # Finally, run the server. run; }

1 0

[14237] CalendarServer/trunk/setup.py
by source_changes＠macosforge.org 19 Dec '14

19 Dec '14

Revision: 14237 http://trac.calendarserver.org//changeset/14237 Author: wsanchez(a)apple.com Date: 2014-12-18 17:52:00 -0800 (Thu, 18 Dec 2014) Log Message: ----------- More letters. Modified Paths: -------------- CalendarServer/trunk/setup.py Modified: CalendarServer/trunk/setup.py =================================================================== --- CalendarServer/trunk/setup.py 2014-12-18 03:52:56 UTC (rev 14236) +++ CalendarServer/trunk/setup.py 2014-12-19 01:52:00 UTC (rev 14237) @@ -215,9 +215,9 @@ ("calendarserver.tools.calverify", "main"), } -for n, (m, f) in script_entry_points.iteritems(): +for name, (module, function) in script_entry_points.iteritems(): entry_points["console_scripts"].append( - "calendarserver_{} = {}:{}".format(n, m, f) + "calendarserver_{} = {}:{}".format(name, module, function) )

1 0

[14236] CalendarServer/trunk
by source_changes＠macosforge.org 18 Dec '14

18 Dec '14

Revision: 14236 http://trac.calendarserver.org//changeset/14236 Author: cdaboo(a)apple.com Date: 2014-12-17 19:52:56 -0800 (Wed, 17 Dec 2014) Log Message: ----------- Need some extra time zone related files copied into the package. Modified Paths: -------------- CalendarServer/trunk/requirements-stable.txt CalendarServer/trunk/setup.py Modified: CalendarServer/trunk/requirements-stable.txt =================================================================== --- CalendarServer/trunk/requirements-stable.txt 2014-12-18 03:48:57 UTC (rev 14235) +++ CalendarServer/trunk/requirements-stable.txt 2014-12-18 03:52:56 UTC (rev 14236) @@ -7,7 +7,7 @@ -e . -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@142… -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trun… --e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trun… +-e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trun… # Specify specific versions of our dependencies so that we're all testing the same config. Modified: CalendarServer/trunk/setup.py =================================================================== --- CalendarServer/trunk/setup.py 2014-12-18 03:48:57 UTC (rev 14235) +++ CalendarServer/trunk/setup.py 2014-12-18 03:52:56 UTC (rev 14236) @@ -309,6 +309,8 @@ "twistedcaldav": [ "*.html", "zoneinfo/*.ics", + "zoneinfo/*.txt", + "zoneinfo/*.xml", "zoneinfo/*/*.ics", "zoneinfo/*/*/*.ics", "images/*/*.jpg",

1 0

[14235] CalendarServer/branches/release/CalendarServer-5.4-dev/setup.py
by source_changes＠macosforge.org 18 Dec '14

18 Dec '14

Revision: 14235 http://trac.calendarserver.org//changeset/14235 Author: cdaboo(a)apple.com Date: 2014-12-17 19:48:57 -0800 (Wed, 17 Dec 2014) Log Message: ----------- Need some extra time zone related files copied into the package. Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-5.4-dev/setup.py Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/setup.py =================================================================== --- CalendarServer/branches/release/CalendarServer-5.4-dev/setup.py 2014-12-18 03:46:29 UTC (rev 14234) +++ CalendarServer/branches/release/CalendarServer-5.4-dev/setup.py 2014-12-18 03:48:57 UTC (rev 14235) @@ -118,6 +118,8 @@ "twistedcaldav": [ "*.html", "zoneinfo/*.ics", + "zoneinfo/*.txt", + "zoneinfo/*.xml", "zoneinfo/*/*.ics", "zoneinfo/*/*/*.ics", "images/*/*.jpg",

1 0

[14234] PyCalendar/trunk/setup.py
by source_changes＠macosforge.org 18 Dec '14

18 Dec '14

Revision: 14234 http://trac.calendarserver.org//changeset/14234 Author: cdaboo(a)apple.com Date: 2014-12-17 19:46:29 -0800 (Wed, 17 Dec 2014) Log Message: ----------- Include zonal package to allow time zone data updates. Modified Paths: -------------- PyCalendar/trunk/setup.py Modified: PyCalendar/trunk/setup.py =================================================================== --- PyCalendar/trunk/setup.py 2014-12-18 03:39:29 UTC (rev 14233) +++ PyCalendar/trunk/setup.py 2014-12-18 03:46:29 UTC (rev 14234) @@ -27,5 +27,6 @@ 'pycalendar', 'pycalendar.icalendar', 'pycalendar.vcard', + 'zonal', ] )

1 0

[14233] PyCalendar/branches/CalendarServer-5.2/setup.py
by source_changes＠macosforge.org 18 Dec '14

18 Dec '14

Revision: 14233 http://trac.calendarserver.org//changeset/14233 Author: cdaboo(a)apple.com Date: 2014-12-17 19:39:29 -0800 (Wed, 17 Dec 2014) Log Message: ----------- Include zonal package to allow time zone data updates. Modified Paths: -------------- PyCalendar/branches/CalendarServer-5.2/setup.py Modified: PyCalendar/branches/CalendarServer-5.2/setup.py =================================================================== --- PyCalendar/branches/CalendarServer-5.2/setup.py 2014-12-18 02:38:20 UTC (rev 14232) +++ PyCalendar/branches/CalendarServer-5.2/setup.py 2014-12-18 03:39:29 UTC (rev 14233) @@ -27,5 +27,6 @@ 'pycalendar', 'pycalendar.icalendar', 'pycalendar.vcard', + 'zonal', ] )

1 0