[CalendarServer-changes] [12578] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:23:22 PDT 2014
Revision: 12578
http://trac.calendarserver.org//changeset/12578
Author: wsanchez at apple.com
Date: 2014-02-05 14:21:13 -0800 (Wed, 05 Feb 2014)
Log Message:
-----------
Don't update deps in tools by default.
Modified Paths:
--------------
CalendarServer/trunk/bin/_build.sh
CalendarServer/trunk/bin/benchmark
CalendarServer/trunk/bin/benchreport
CalendarServer/trunk/bin/pyflakes
CalendarServer/trunk/bin/python
CalendarServer/trunk/bin/sim
CalendarServer/trunk/bin/test
CalendarServer/trunk/bin/testserver
CalendarServer/trunk/bin/trial
CalendarServer/trunk/bin/twistd
CalendarServer/trunk/requirements/py_develop.txt
Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/_build.sh 2014-02-05 22:21:13 UTC (rev 12578)
@@ -99,6 +99,8 @@
py_libdir="${py_root}/lib/python";
py_bindir="${py_root}/bin";
+ python="${py_bindir}/python";
+
if [ -z "${TWEXT_PKG_CACHE-}" ]; then
dep_packages="${dev_home}/pkg";
else
@@ -111,6 +113,8 @@
rm -rf "${py_root}";
fi;
+ export PYTHONPATH="${wd}:${PYTHONPATH:-}";
+
# These variables are defaults for things which might be configured by
# environment; only set them if they're un-set.
@@ -576,8 +580,6 @@
"${bootstrap_python}" -m virtualenv "${py_root}";
- python="${py_bindir}/python";
-
# Make sure setup got called enough to write the version file.
"${python}" "${wd}/setup.py" check > /dev/null;
Modified: CalendarServer/trunk/bin/benchmark
===================================================================
--- CalendarServer/trunk/bin/benchmark 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/benchmark 2014-02-05 22:21:13 UTC (rev 12578)
@@ -19,8 +19,12 @@
set -e;
set -u;
-wd="$(cd "$(dirname "$0")" && pwd -L)";
+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
-export PYTHONPATH="$("${wd}/run" -p)";
+export _DEVELOP="true";
-exec "${wd}/contrib/performance/benchmark" "$@";
+. "${wd}/bin/_build.sh";
+
+init_build > /dev/null;
+
+exec "${python}" "${wd}/contrib/performance/benchmark" "$@";
Modified: CalendarServer/trunk/bin/benchreport
===================================================================
--- CalendarServer/trunk/bin/benchreport 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/benchreport 2014-02-05 22:21:13 UTC (rev 12578)
@@ -19,17 +19,21 @@
set -e;
set -u;
-wd="$(cd "$(dirname "$0")" && pwd -L)";
+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
-export PYTHONPATH="$("${wd}/run" -p):${wd}/../CalDAVClientLibrary/src";
+export _DEVELOP="true";
+. "${wd}/bin/_build.sh";
+
+init_build > /dev/null;
+
args="$@"
echo "Parameter: 1";
-"${wd}/contrib/performance/report" ${args} 1 HTTP summarize;
+"${python}" "${wd}/contrib/performance/report" ${args} 1 HTTP summarize;
echo;
echo "Parameter: 9";
-"${wd}/contrib/performance/report" ${args} 9 HTTP summarize;
+"${python}" "${wd}/contrib/performance/report" ${args} 9 HTTP summarize;
echo;
echo "Parameter: 81";
-"${wd}/contrib/performance/report" ${args} 81 HTTP summarize;
+"${python}" "${wd}/contrib/performance/report" ${args} 81 HTTP summarize;
Modified: CalendarServer/trunk/bin/pyflakes
===================================================================
--- CalendarServer/trunk/bin/pyflakes 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/pyflakes 2014-02-05 22:21:13 UTC (rev 12578)
@@ -31,7 +31,5 @@
set - calendarserver contrib twisted twistedcaldav txdav txweb2;
fi;
-"${python}" -m pip install pyflakes --upgrade >> "${dev_home}/setup.log";
-
echo "Checking modules:" "$@";
exec "${python}" -m pyflakes "$@";
Modified: CalendarServer/trunk/bin/python
===================================================================
--- CalendarServer/trunk/bin/python 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/python 2014-02-05 22:21:13 UTC (rev 12578)
@@ -28,7 +28,5 @@
. "${wd}/bin/_build.sh";
init_build > /dev/null;
-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
exec "${python}" "$@";
Modified: CalendarServer/trunk/bin/sim
===================================================================
--- CalendarServer/trunk/bin/sim 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/sim 2014-02-05 22:21:13 UTC (rev 12578)
@@ -19,10 +19,12 @@
set -e;
set -u;
-wd="$(cd "$(dirname "$0")" && pwd -L)";
+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
-source "${wd}/support/shell.sh";
+export _DEVELOP="true";
-export PYTHONPATH="$("${wd}/run" -p)";
+. "${wd}/bin/_build.sh";
-exec "${wd}/contrib/performance/sim" "$@";
+init_build > /dev/null;
+
+exec "${python}" "${wd}/contrib/performance/sim" "$@";
Modified: CalendarServer/trunk/bin/test
===================================================================
--- CalendarServer/trunk/bin/test 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/test 2014-02-05 22:21:13 UTC (rev 12578)
@@ -97,8 +97,8 @@
# Dependencies
#
-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
+#c_dependencies >> "${dev_home}/setup.log";
+#py_dependencies >> "${dev_home}/setup.log";
Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/testserver 2014-02-05 22:21:13 UTC (rev 12578)
@@ -16,20 +16,30 @@
# limitations under the License.
##
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-cdt="${wd}/../CalDAVTester";
+set -e;
+set -u;
+wd="$(cd "$(dirname "$0")/.." && pwd -L)";
+
+export _DEVELOP="true";
+
+. "${wd}/bin/_build.sh";
+
+init_build > /dev/null;
+
+cdt="${py_root}/src/caldavtester";
+
##
# Command line handling
##
-verbose="";
+ verbose="";
serverinfo="${cdt}/scripts/server/serverinfo.xml";
-printres="";
-subdir="";
-random="--random";
-seed="";
-ssl="";
+ printres="";
+ subdir="";
+ random="--random";
+ seed="";
+ ssl="";
usage ()
{
@@ -75,7 +85,5 @@
# Do The Right Thing
##
-source "${wd}/support/shell.sh";
-
cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
Modified: CalendarServer/trunk/bin/trial
===================================================================
--- CalendarServer/trunk/bin/trial 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/trial 2014-02-05 22:21:13 UTC (rev 12578)
@@ -26,7 +26,5 @@
. "${wd}/bin/_build.sh";
init_build > /dev/null;
-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
exec "${py_bindir}/trial" "$@";
Modified: CalendarServer/trunk/bin/twistd
===================================================================
--- CalendarServer/trunk/bin/twistd 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/bin/twistd 2014-02-05 22:21:13 UTC (rev 12578)
@@ -26,7 +26,5 @@
. "${wd}/bin/_build.sh";
init_build > /dev/null;
-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
exec "${py_bindir}/twistd" "$@";
Modified: CalendarServer/trunk/requirements/py_develop.txt
===================================================================
--- CalendarServer/trunk/requirements/py_develop.txt 2014-02-05 22:20:51 UTC (rev 12577)
+++ CalendarServer/trunk/requirements/py_develop.txt 2014-02-05 22:21:13 UTC (rev 12578)
@@ -1,5 +1,6 @@
+pyflakes
docutils>=0.11
-# Simulator
+-e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk#egg=CalDAVClientLibrary
--e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk#egg=caldavclientlibrary
+-e svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk#egg=CalDAVTester
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/7f2f51f4/attachment.html>
More information about the calendarserver-changes
mailing list