[CalendarServer-changes] [12585] twext/trunk

[source_changes at macosforge.org]

Revision: 12585
          http://trac.calendarserver.org//changeset/12585
Author:   wsanchez at apple.com
Date:     2014-02-06 05:37:02 -0800 (Thu, 06 Feb 2014)
Log Message:
-----------
sync tools

Modified Paths:
--------------
    twext/trunk/bin/_build.sh
    twext/trunk/bin/pyflakes
    twext/trunk/bin/python
    twext/trunk/bin/test
    twext/trunk/bin/trial
    twext/trunk/bin/twistd
    twext/trunk/requirements/py_develop.txt

Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh	2014-02-06 00:55:13 UTC (rev 12584)
+++ twext/trunk/bin/_build.sh	2014-02-06 13:37:02 UTC (rev 12585)
@@ -86,10 +86,6 @@
 init_build () {
   init_py;
 
-       do_get="true";
-     do_setup="true";
-  force_setup="false";
-
       dev_home="${wd}/.develop";
      dev_roots="${dev_home}/roots";
   dep_packages="${dev_home}/pkg";
@@ -99,22 +95,23 @@
   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
     dep_packages="${TWEXT_PKG_CACHE}";
   fi;
 
-  mkdir -p "${dep_sources}";
+  export PYTHONPATH="${wd}:${PYTHONPATH:-}";
 
-  if "${force_setup}"; then
-    rm -rf "${py_root}";
-  fi;
-
   # These variables are defaults for things which might be configured by
   # environment; only set them if they're un-set.
 
   conditional_set wd "$(pwd)";
+  conditional_set do_get "true";
+  conditional_set do_setup "true";
+  conditional_set force_setup "false";
 
   # Find some hashing commands
   # sha1() = sha1 hash, if available
@@ -432,6 +429,8 @@
 
   # Extra arguments are processed below, as arguments to './configure'.
 
+  mkdir -p "${dep_sources}";
+
   srcdir="${dep_sources}/${path}";
   # local dstroot="${srcdir}/_root";
   local dstroot="${dev_roots}/${name}";
@@ -560,10 +559,13 @@
 
   # Set up virtual environment
 
+  if "${force_setup}"; then
+    # Nuke the virtual environment first
+    rm -rf "${py_root}";
+  fi;
+
   "${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: twext/trunk/bin/pyflakes
===================================================================
--- twext/trunk/bin/pyflakes	2014-02-06 00:55:13 UTC (rev 12584)
+++ twext/trunk/bin/pyflakes	2014-02-06 13:37:02 UTC (rev 12585)
@@ -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: twext/trunk/bin/python
===================================================================
--- twext/trunk/bin/python	2014-02-06 00:55:13 UTC (rev 12584)
+++ twext/trunk/bin/python	2014-02-06 13:37:02 UTC (rev 12585)
@@ -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: twext/trunk/bin/test
===================================================================
--- twext/trunk/bin/test	2014-02-06 00:55:13 UTC (rev 12584)
+++ twext/trunk/bin/test	2014-02-06 13:37:02 UTC (rev 12585)
@@ -94,15 +94,6 @@
 
 
 #
-# Dependencies
-#
-
-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
-
-
-
-#
 # Clean up
 #
 

Modified: twext/trunk/bin/trial
===================================================================
--- twext/trunk/bin/trial	2014-02-06 00:55:13 UTC (rev 12584)
+++ twext/trunk/bin/trial	2014-02-06 13:37:02 UTC (rev 12585)
@@ -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: twext/trunk/bin/twistd
===================================================================
--- twext/trunk/bin/twistd	2014-02-06 00:55:13 UTC (rev 12584)
+++ twext/trunk/bin/twistd	2014-02-06 13:37:02 UTC (rev 12585)
@@ -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: twext/trunk/requirements/py_develop.txt
===================================================================
--- twext/trunk/requirements/py_develop.txt	2014-02-06 00:55:13 UTC (rev 12584)
+++ twext/trunk/requirements/py_develop.txt	2014-02-06 13:37:02 UTC (rev 12585)
@@ -1,2 +1,3 @@
+pyflakes
 docutils>=0.11
 mockldap>=0.1.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/47e27b5e/attachment.html>