svn commit: r1868707 - in /subversion/branches/swig-py3: ./ get-deps.sh

[br...@apache.org]

Author: brane
Date: Mon Oct 21 13:54:28 2019
New Revision: 1868707

URL: http://svn.apache.org/viewvc?rev=1868707&view=rev
Log:
On the swig-py3 branch: Add tooling for downloading the new py3c dependency.

* .: Ignore a local py3c directory.
* get-deps.sh: Download py3c like all the other dependencies.

Modified:
    subversion/branches/swig-py3/   (props changed)
    subversion/branches/swig-py3/get-deps.sh

Propchange: subversion/branches/swig-py3/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 21 13:54:28 2019
@@ -41,6 +41,7 @@ mkmf.log
 .cdtproject
 .settings
 .cproject
+py3c
 zlib
 sqlite-amalgamation
 serf

Modified: subversion/branches/swig-py3/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/get-deps.sh?rev=1868707&r1=1868706&r2=1868707&view=diff
==============================================================================
--- subversion/branches/swig-py3/get-deps.sh (original)
+++ subversion/branches/swig-py3/get-deps.sh Mon Oct 21 13:54:28 2019
@@ -33,6 +33,7 @@
 
 APR_VERSION=${APR_VERSION:-"1.4.6"}
 APU_VERSION=${APU_VERSION:-"1.5.1"}
+PY3C_VERSION=${PY3C_VERSION:='1.1'}
 SERF_VERSION=${SERF_VERSION:-"1.3.8"}
 ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
 SQLITE_VERSION=${SQLITE_VERSION:-"3.8.11.1"}
@@ -43,6 +44,7 @@ APR_ICONV_VERSION=${APR_ICONV_VERSION:-"
 
 APR=apr-${APR_VERSION}
 APR_UTIL=apr-util-${APU_VERSION}
+PY3C=py3c-${PY3C_VERSION}
 SERF=serf-${SERF_VERSION}
 ZLIB=zlib-${ZLIB_VERSION}
 SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'`
@@ -66,7 +68,7 @@ APACHE_MIRROR=https://archive.apache.org
 # helpers
 usage() {
     echo "Usage: $0"
-    echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..."
+    echo "Usage: $0 [ apr | py3c | serf | zlib | sqlite ] ..."
     exit $1
 }
 
@@ -84,6 +86,19 @@ get_apr() {
     test -d $BASEDIR/apr-util || mv $APR_UTIL apr-util
 }
 
+get_py3c() {
+    test -d $BASEDIR/py3c && return
+    py3cdist=v${PY3C_VERSION}.tar.gz
+
+    cd $TEMPDIR
+    $HTTP_FETCH https://github.com/encukou/py3c/archive/${py3cdist}
+    cd $BASEDIR
+
+    gzip -dc $TEMPDIR/${py3cdist} | tar -xf -
+
+    mv $PY3C py3c
+}
+
 get_serf() {
     test -d $BASEDIR/serf && return
 
@@ -125,7 +140,7 @@ get_sqlite() {
 get_deps() {
     mkdir -p $TEMPDIR
 
-    for i in zlib serf sqlite-amalgamation apr apr-util; do
+    for i in zlib serf sqlite-amalgamation py3c apr apr-util; do
       if [ -d $i ]; then
         echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
       fi
@@ -134,6 +149,7 @@ get_deps() {
     if [ $# -gt 0 ]; then
       for target in "$@"; do
         if [ "$target" != "deps" ]; then
+          echo "get_$target || usage"
           get_$target || usage
         else
           usage
@@ -141,6 +157,7 @@ get_deps() {
       done
     else
       get_apr
+      get_py3c
       get_serf
       get_zlib
       get_sqlite