fix

humbletim · May 30, 2024 · 1962a4d · 1962a4d
1 parent b596f5a
commit 1962a4d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 28 deletions.
diff --git a/gha-populate-bin.bash b/gha-populate-bin.bash
@@ -15,8 +15,8 @@ function get_ninja-windows() {(
 function get_colout() {(
     echo "get_colout..." >&2
     set -Euo pipefail
-    python -m pip install --break-system-packages --no-warn-script-location --user colout
-    local pysite="$(python -msite --user-site)"
+    python3 -m pip install --break-system-packages --no-warn-script-location --user colout
+    local pysite="$(python3 -msite --user-site)"
     if grep SIGPIPE $pysite/colout/colout.py ; then
       # workaround SIGPIPE on Win32 missing with some colout versions
       perl -i.bak -pe 's@^.*[.]SIGPIPE.*$@#$&@g' $pysite/colout/colout.py
@@ -75,24 +75,12 @@ function gha-populate-bin-windows() {(
   function generate_BASH_FUNC_invoke() {
     echo "generate_BASH_FUNC_invoke..." >&2
     source $gha_fsvr_dir/bashland/BASH_FUNC/gha.alias-exe.bash
-    BASH=$(cygpath -was "$BASH") make-stub bin/BASH_FUNC_invoke.exe || return 90
+    BASH=$(cygpath -was "$BASH") make-stub bin/_invoke.exe || return 90
   }
 
-  gha-cache-restore-fast $cache_id-BASH_FUNC_invoke bin/BASH_FUNC_invoke.exe || (
-    generate_BASH_FUNC_invoke
-    gha-cache-save-fast $cache_id-BASH_FUNC_invoke bin/BASH_FUNC_invoke.exe || exit 89
-  )
-
   wget --version | head -1 || exit 80
   python3 --version | head -1 || exit 81
 
-  {
-    ht-ln bin/BASH_FUNC_invoke.exe bin/ht-ln.exe
-    ht-ln bin/BASH_FUNC_invoke.exe bin/hostname.exe
-    ht-ln bin/BASH_FUNC_invoke.exe bin/jq.exe
-    ht-ln bin/BASH_FUNC_invoke.exe bin/envsubst.exe
-  } || exit 86
-
   function xxtest_bin() {
     echo "xxtest_bin..." >&2
     test -f bin/parallel-home/will-cite || return 196
@@ -109,32 +97,29 @@ function gha-populate-bin-windows() {(
     echo "xxprovision_tools... PATH=$PATH" >&2
     set -Euo pipefail
     wget --version | head -1 || exit 80
-    python3 --version | head -1 || exit 81
     source $ghash/gha.wget-sha256.bash
     source $ghash/gha.literally-exists.bash
     pysite="$(cygpath -m "$(python3 -msite --user-site)")"
 
-    literally-exists bin/ninja.exe    || get_ninja-windows    || exit `_err $? "failed to provision ninja $?"`
-    literally-exists $pysite/colout   || get_colout   || exit `_err $? "failed to provision colout $?"`
-    literally-exists bin/parallel     || get_parallel || exit `_err $? "failed to provision parallel $?"`
-    literally-exists bin/colout.exe   || ht-ln bin/BASH_FUNC_invoke.exe bin/colout.exe
-    literally-exists bin/parallel.exe || ht-ln bin/BASH_FUNC_invoke.exe bin/parallel.exe
+    literally-exists bin/_invoke.exe  || generate_BASH_FUNC_invoke || exit `_err $? "failed to provision BASH_FUNC_invoke $?"`
+    literally-exists bin/ninja.exe    || get_ninja-windows         || exit `_err $? "failed to provision ninja $?"`
+    literally-exists $pysite/colout   || get_colout                || exit `_err $? "failed to provision colout $?"`
+    literally-exists bin/parallel     || get_parallel              || exit `_err $? "failed to provision parallel $?"`
+
+    for x in colout parallel ht-ln hostname jq envsubst ; do
+      literally-exists bin/$x.exe || ht-ln bin/_invoke.exe bin/$x.exe || exit `_err $? "error symlinking $x $?"`
+    done
 
     # note: autobuild is not necessary here, but viewer_manifest still depends on python-llsd
-    python -m pip install --no-warn-script-location --user llsd
+    python3 -m pip install --no-warn-script-location --user llsd
   )}
 
-  echo "..PATH=$PATH" >&2
-  wget --version | head -1 || exit 80
-  python3 --version | head -1 || exit 81
-
   gha-cache-restore-fast $cache_id-bin-b bin || (
     xxprovision_tools || exit `_err $? "!xxprovision_tools"` 
     xxtest_bin || exit `_err $? "!xxtest_bin"`
     gha-cache-save-fast $cache_id-bin-b bin || exit 85
   )
 
-  wget --version | head -1 || exit 80
   python3 --version | head -1 || exit 81
 
 )}

diff --git a/util/generate_msvc_env.sh b/util/generate_msvc_env.sh
@@ -21,10 +21,11 @@ test -d $CRT || { echo "msvc CRT '$CRT' does not exist" &>2 ; exit 20 ; }
 {
   echo msvc_dir=$CRT
   PATH="$msvc_path:$PATH:/usr/bin:/c/Windows/system32"
-  for x in cl lib link mt rc cmake ninja python cmcldeps; do
+  for x in cl lib link mt rc cmake ninja python3 cmcldeps; do
     y="$(which $x.exe)"
     test -x "$y" || { echo "could not locate $x '$y'" >&2 ; exit 26; }
     echo ${x}_exe=$(cygpath -msa "$y")
   done
   echo "cmd_exe=$(cygpath -wsa "${COMSPEC:-$(which cmd.exe)}")"
+  echo 'python_exe=$python3_exe'
 } | tee build/msvc.nunja.env