<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12444] CalendarServer/trunk/bin/run</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12444">12444</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 18:04:35 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Starting server works</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbinrun">CalendarServer/trunk/bin/run</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbinrun"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/run (12443 => 12444)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/run 2014-01-24 01:49:00 UTC (rev 12443)
+++ CalendarServer/trunk/bin/run 2014-01-24 02:04:35 UTC (rev 12444)
</span><span class="lines">@@ -40,6 +40,17 @@
</span><span class="cx"> # Usage
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+ config="${wd}/conf/caldavd-dev.plist";
+ reactor="";
+ plugin_name="caldav";
+service_type="Combined";
+ run="true";
+ daemonize="-X -L";
+ kill="false";
+ restart="false";
+ profile="";
+
+
</ins><span class="cx"> usage () {
</span><span class="cx"> program="$(basename "$0")";
</span><span class="cx">
</span><span class="lines">@@ -78,42 +89,39 @@
</span><span class="cx"> # Parse command-line options to set up state which controls the behavior of the
</span><span class="cx"> # functions in build.sh.
</span><span class="cx"> parse_options () {
</span><del>- kill="false";
- restart="false";
-
</del><span class="cx"> OPTIND=1;
</span><span class="cx"> while getopts "ahsfnpedkrK:i:I:b:t:S:P:R:" option; do
</span><span class="cx"> case "${option}" in
</span><span class="cx"> '?') usage; ;;
</span><span class="cx"> 'h') usage -; exit 0; ;;
</span><del>- # 'f') force_setup="true"; ;;
- 'k') kill="true"; ;;
- 'r') restart="true"; ;;
- 'd') daemonize=""; ;;
- 'P') plugin_name="${OPTARG}"; ;;
- 'R') reactor="-R ${OPTARG}"; ;;
- 't') service_type="${OPTARG}"; ;;
- 'K') read_key="${OPTARG}"; ;;
- 'S') profile="-p ${OPTARG}"; ;;
- 's') do_get="true" ; do_setup="true" ; do_run="false"; ;;
</del><ins>+ # 'f') force_setup="true"; ;;
+ 'k') kill="true"; ;;
+ 'r') restart="true"; ;;
+ 'd') daemonize=""; ;;
+ 'P') plugin_name="${OPTARG}"; ;;
+ 'R') reactor="-R ${OPTARG}"; ;;
+ 't') service_type="${OPTARG}"; ;;
+ 'K') read_key="${OPTARG}"; ;;
+ 'S') profile="-p ${OPTARG}"; ;;
+ 's') setup="true" ; run="false"; ;;
</ins><span class="cx"> # 'p')
</span><del>- # do_get="false"; do_setup="false"; do_run="false"; print_path="true";
</del><ins>+ # do_get="false"; setup="false"; run="false"; print_path="true";
</ins><span class="cx"> # ;;
</span><span class="cx"> # 'e')
</span><del>- # do_get="false"; do_setup="false"; do_run="false"; print_path="true";
</del><ins>+ # do_get="false"; setup="false"; run="false"; print_path="true";
</ins><span class="cx"> # print_environment="true";
</span><span class="cx"> # ;;
</span><span class="cx"> # 'i')
</span><span class="cx"> # do_get="true";
</span><del>- # do_setup="true";
- # do_run="false";
</del><ins>+ # setup="true";
+ # run="false";
</ins><span class="cx"> # install="${OPTARG}";
</span><span class="cx"> # install_flag="--root=";
</span><span class="cx"> # ;;
</span><span class="cx"> # 'I')
</span><span class="cx"> # do_get="true";
</span><del>- # do_setup="true";
- # do_run="false";
</del><ins>+ # setup="true";
+ # run="false";
</ins><span class="cx"> # install="${wd}/build/dst";
</span><span class="cx"> # install_flag="--root=";
</span><span class="cx"> # install_home="${OPTARG}";
</span><span class="lines">@@ -121,12 +129,12 @@
</span><span class="cx"> # 'b')
</span><span class="cx"> # do_bundle="true";
</span><span class="cx"> # do_get="true";
</span><del>- # do_setup="true";
- # do_run="false";
</del><ins>+ # setup="true";
+ # run="false";
</ins><span class="cx"> # install="${OPTARG}";
</span><span class="cx"> # install_flag="--root=";
</span><span class="cx"> # ;;
</span><del>- 'n') do_get="false" ; do_setup="false"; ;;
</del><ins>+ 'n') setup="false"; ;;
</ins><span class="cx"> esac;
</span><span class="cx"> done;
</span><span class="cx"> shift $((${OPTIND} - 1));
</span><span class="lines">@@ -141,7 +149,7 @@
</span><span class="cx"> run () {
</span><span class="cx"> echo "Using ${python} as Python";
</span><span class="cx">
</span><del>- if "${do_run}"; then
</del><ins>+ if "${run}"; then
</ins><span class="cx"> if [ ! -f "${config}" ]; then
</span><span class="cx"> echo "";
</span><span class="cx"> echo "Missing config file: ${config}";
</span><span class="lines">@@ -172,8 +180,15 @@
</span><span class="cx"> mkdir "${wd}/data";
</span><span class="cx"> fi;
</span><span class="cx">
</span><ins>+ if [ "$(uname -s)" == "Darwin" ] && [ "$(uname -r | cut -d . -f 1)" -ge 9 ]; then
+ caldavd_wrapper_command="launchctl bsexec /";
+ else
+ caldavd_wrapper_command="";
+ fi;
+
</ins><span class="cx"> echo "";
</span><span class="cx"> echo "Starting server...";
</span><ins>+ export PYTHON="${python}";
</ins><span class="cx"> exec ${caldavd_wrapper_command} \
</span><span class="cx"> "${wd}/bin/caldavd" ${daemonize} \
</span><span class="cx"> -f "${config}" \
</span><span class="lines">@@ -227,7 +242,7 @@
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span><span class="cx">
</span><del>- if "${do_setup}"; then
</del><ins>+ if "${setup}"; then
</ins><span class="cx"> c_dependencies >> "${dev_home}/setup.log";
</span><span class="cx"> py_dependencies >> "${dev_home}/setup.log";
</span><span class="cx"> fi;
</span></span></pre>
</div>
</div>
</body>
</html>