[CalendarServer-changes] [12460] twext/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:17:02 PDT 2014


Revision: 12460
          http://trac.calendarserver.org//changeset/12460
Author:   wsanchez at apple.com
Date:     2014-01-28 10:32:52 -0800 (Tue, 28 Jan 2014)
Log Message:
-----------
Back-port _build from CS

Modified Paths:
--------------
    twext/trunk/bin/_build.sh

Added Paths:
-----------
    twext/trunk/requirements/py_base.txt
    twext/trunk/requirements/py_develop.txt
    twext/trunk/requirements/py_opt_DAL.txt
    twext/trunk/requirements/py_opt_LDAP.txt
    twext/trunk/requirements/py_opt_Oracle.txt

Removed Paths:
-------------
    twext/trunk/requirements/base.txt
    twext/trunk/requirements/develop.txt
    twext/trunk/requirements/opt_DAL.txt
    twext/trunk/requirements/opt_LDAP.txt
    twext/trunk/requirements/opt_Oracle.txt

Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh	2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/bin/_build.sh	2014-01-28 18:32:52 UTC (rev 12460)
@@ -86,25 +86,26 @@
 init_build () {
   init_py;
 
-      verbose="";
        do_get="true";
      do_setup="true";
   force_setup="false";
 
       dev_home="${wd}/.develop";
-      dev_root="${dev_home}/root";
-    dev_libdir="${dev_root}/lib/python";
-    dev_bindir="${dev_root}/bin";
+     dev_roots="${dev_home}/roots";
   dep_packages="${dev_home}/pkg";
    dep_sources="${dev_home}/src";
 
+    py_root="${dev_roots}/py_modules";
+  py_libdir="${py_root}/lib/python";
+  py_bindir="${py_root}/bin";
+
   mkdir -p "${dep_sources}";
 
   # Set up virtual environment
 
-  "${bootstrap_python}" -m virtualenv "${dev_root}";
+  "${bootstrap_python}" -m virtualenv "${py_root}";
 
-  python="${dev_bindir}/python";
+  python="${py_bindir}/python";
 
   # These variables are defaults for things which might be configured by
   # environment; only set them if they're un-set.
@@ -415,7 +416,7 @@
 
   srcdir="${dep_sources}/${path}";
   # local dstroot="${srcdir}/_root";
-  local dstroot="${dev_root}";
+  local dstroot="${dev_roots}/${name}";
 
   www_get ${f_hash} "${name}" "${srcdir}" "${uri}";
 
@@ -457,13 +458,17 @@
 # Build C dependencies
 #
 c_dependencies () {
+     c_glue_root="${dev_roots}/c_glue";
+  c_glue_include="${c_glue_root}/include";
 
+  export C_INCLUDE_PATH="${c_glue_include}:${C_INCLUDE_PATH:-}";
+
   ruler;
   if find_header ffi.h; then
     using_system "libffi";
   elif find_header ffi/ffi.h; then
-    mkdir -p "${dev_root}/include";
-    echo "#include <ffi/ffi.h>" > "${dev_root}/include/ffi.h"
+    mkdir -p "${c_glue_include}";
+    echo "#include <ffi/ffi.h>" > "${c_glue_include}/ffi.h"
     using_system "libffi";
   else
     c_dependency -m "45f3b6dbc9ee7c7dfbbbc5feba571529" \
@@ -485,11 +490,11 @@
   fi;
 
   ruler;
-  if find_header sasl/sasl.h && ! find_header sasl.h; then
-    mkdir -p "${dev_root}/include";
-    echo "#include <sasl/sasl.h>" > "${dev_root}/include/sasl.h"
+  if find_header sasl.h; then
     using_system "SASL";
-  elif find_header sasl.h; then
+  elif find_header sasl/sasl.h; then
+    mkdir -p "${c_glue_include}";
+    echo "#include <sasl/sasl.h>" > "${c_glue_include}/sasl.h"
     using_system "SASL";
   else
     local v="2.1.26";
@@ -500,7 +505,6 @@
       "ftp://ftp.cyrusimap.org/cyrus-sasl/${p}.tar.gz" \
       --disable-macos-framework;
   fi;
-
 }
 
 
@@ -508,28 +512,21 @@
 # Build Python dependencies
 #
 py_dependencies () {
-  # export PYTHONPATH="${dev_libdir}:${PYTHONPATH:-}"
+  export PATH="${py_root}/bin:${PATH}";
 
-  # export              PATH="${dev_root}/bin:${PATH}";
-  export    C_INCLUDE_PATH="${dev_root}/include:${C_INCLUDE_PATH:-}";
-  export   LD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${LD_LIBRARY_PATH:-}";
-  export          CPPFLAGS="-I${dev_root}/include ${CPPFLAGS:-} ";
-  export           LDFLAGS="-L${dev_root}/lib -L${dev_root}/lib64 ${LDFLAGS:-} ";
-  export DYLD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${DYLD_LIBRARY_PATH:-}";
-  export PKG_CONFIG_PATH="${dev_root}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
+  for requirements in "${wd}/requirements/py_"*".txt"; do
 
-  for requirements in "${wd}/requirements/"*; do
-
     ruler "Preparing Python requirements: ${requirements}";
     echo "";
 
     if ! "${python}" -m pip install               \
         --requirement "${requirements}"           \
         --download-cache "${dev_home}/pip_cache"  \
+        --log "${dev_home}/pip.log"               \
     ; then
       err=$?;
       echo "Unable to set up Python requirements: ${requirements}";
-      if [ "${requirements#${wd}/requirements/opt_}" != "${requirements}" ]; then
+      if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
         echo "Requirements ${requirements} are optional; continuing.";
       else
         echo "";

Deleted: twext/trunk/requirements/base.txt
===================================================================
--- twext/trunk/requirements/base.txt	2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/base.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -1,2 +0,0 @@
-cffi==0.6
-twisted>=13.2.0

Deleted: twext/trunk/requirements/develop.txt
===================================================================
--- twext/trunk/requirements/develop.txt	2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/develop.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -1,2 +0,0 @@
-docutils>=0.11
-mockldap>=0.1.4

Deleted: twext/trunk/requirements/opt_DAL.txt
===================================================================
--- twext/trunk/requirements/opt_DAL.txt	2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/opt_DAL.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -1 +0,0 @@
-sqlparse==0.1.2

Deleted: twext/trunk/requirements/opt_LDAP.txt
===================================================================
--- twext/trunk/requirements/opt_LDAP.txt	2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/opt_LDAP.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -1 +0,0 @@
-python-ldap>=2.4.13

Deleted: twext/trunk/requirements/opt_Oracle.txt
===================================================================
--- twext/trunk/requirements/opt_Oracle.txt	2014-01-28 01:25:30 UTC (rev 12459)
+++ twext/trunk/requirements/opt_Oracle.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -1 +0,0 @@
-cx_Oracle==5.1.2

Copied: twext/trunk/requirements/py_base.txt (from rev 12459, twext/trunk/requirements/base.txt)
===================================================================
--- twext/trunk/requirements/py_base.txt	                        (rev 0)
+++ twext/trunk/requirements/py_base.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -0,0 +1,2 @@
+cffi==0.6
+twisted>=13.2.0

Copied: twext/trunk/requirements/py_develop.txt (from rev 12459, twext/trunk/requirements/develop.txt)
===================================================================
--- twext/trunk/requirements/py_develop.txt	                        (rev 0)
+++ twext/trunk/requirements/py_develop.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -0,0 +1,2 @@
+docutils>=0.11
+mockldap>=0.1.4

Copied: twext/trunk/requirements/py_opt_DAL.txt (from rev 12459, twext/trunk/requirements/opt_DAL.txt)
===================================================================
--- twext/trunk/requirements/py_opt_DAL.txt	                        (rev 0)
+++ twext/trunk/requirements/py_opt_DAL.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -0,0 +1 @@
+sqlparse==0.1.2

Copied: twext/trunk/requirements/py_opt_LDAP.txt (from rev 12459, twext/trunk/requirements/opt_LDAP.txt)
===================================================================
--- twext/trunk/requirements/py_opt_LDAP.txt	                        (rev 0)
+++ twext/trunk/requirements/py_opt_LDAP.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -0,0 +1 @@
+python-ldap>=2.4.13

Copied: twext/trunk/requirements/py_opt_Oracle.txt (from rev 12459, twext/trunk/requirements/opt_Oracle.txt)
===================================================================
--- twext/trunk/requirements/py_opt_Oracle.txt	                        (rev 0)
+++ twext/trunk/requirements/py_opt_Oracle.txt	2014-01-28 18:32:52 UTC (rev 12460)
@@ -0,0 +1 @@
+cx_Oracle==5.1.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/49460508/attachment.html>


More information about the calendarserver-changes mailing list