[build] Move _devbuild/cpython-full -> _deps/cpython-full

oilshell · Nov 22, 2020 · 6fbe7bb · 6fbe7bb
1 parent 92fb173
commit 6fbe7bb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/build/common.sh b/build/common.sh
@@ -42,7 +42,7 @@ readonly CLANG_LINK_FLAGS=''
 
 readonly PY27=Python-2.7.13
 
-readonly PREPARE_DIR=_devbuild/cpython-full
+readonly PREPARE_DIR=_deps/cpython-full
 
 # Used by misc/bin.sh and opy/build.sh
 readonly OIL_SYMLINKS=(oil oilc osh oshc tea sh true false readlink)

diff --git a/devtools/release.sh b/devtools/release.sh
@@ -867,8 +867,8 @@ tarball-build-deps() {
   # On Travis, the _devbuild and _deps dirs should be cached.
 
   #if false; then
-  if test -d _devbuild/cpython-full; then
-    echo '_devbuild/cpython-full exists: skipping build/prepare.sh'
+  if test -d _deps/cpython-full; then
+    echo '_deps/cpython-full exists: skipping build/prepare.sh'
   else
     build/prepare.sh configure
     build/prepare.sh build-python

diff --git a/opy/common.sh b/opy/common.sh
@@ -44,7 +44,6 @@ oil-python-sources() {
     -name _deps -a -prune -o \
     -name _regtest -a -prune -o \
     -name mycpp -a -prune -o \
-    -name cpython-full -a -prune -o \
     -name testdata -a -prune -o \
     -name Python-2.7.13 -a -prune -o \
     -name py-yajl -a -prune -o \

diff --git a/services/sourcehut.sh b/services/sourcehut.sh
@@ -50,4 +50,13 @@ publish-html-assuming-ssh-key() {
   return $status
 }
 
+#
+# For create-cache.yml
+#
+
+compress-deps() {
+  ### Compress output of tarball-deps and spec-deps
+  echo TODO
+}
+
 "$@"
diff --git a/services/toil-worker.sh b/services/toil-worker.sh
@@ -166,6 +166,7 @@ create-cache-tasks() {
   cat <<EOF
 tarball-deps      devtools/release.sh tarball-build-deps -
 spec-deps         test/spec-bin.sh all-steps             -
+compress-deps     services/sourcehut.sh compress-deps    -
 EOF
 }
 

diff --git a/types/oil-slice.sh b/types/oil-slice.sh
@@ -104,7 +104,7 @@ typecheck-all() {
 }
 
 # The manifest needs to be checked in because we don't have
-# _devbuild/cpython-full on Travis to crawl dependencies.
+# _deps/cpython-full on Travis to crawl dependencies.
 travis-setup() {
   # TODO: add stat.py back.  Why does it cause errors?
   local exclude='vendor|__future__|mylib.py|/stat.py'