Merge branch 'master' into github_action_mac

Author: j-woz

dev/conda/README.adoc

@@ -82,6 +82,8 @@ Setup:
   create the "exported" Swift/T source tree in `$TMP/distro`,
   where `$TMP` defaults to `/tmp`.
   This source code location is hard-coded into `meta.yaml`.
+** Thus, the working Swift/T clone and the copy in `$TMP/distro` must be
+   identical!  Version numbers are pulled from the working clone.
 
 Loop:
 
@@ -138,6 +140,8 @@ $ anaconda login
 $ anaconda upload $PKG
 ----
 
+Use `dev/conda/upload.sh` to automate this.
+
 == Dependencies
 
 `r-rinside`::

dev/conda/build-generic.sh

@@ -40,18 +40,19 @@ echo ENABLE_R=$ENABLE_R
   echo "ENABLE_R:   $ENABLE_R"
 } > $RECIPE_DIR/build-generic.log
 
-# Cf. helpers.zsh
 if [[ $PLATFORM =~ osx-* ]]
 then
   NULL=""
   ZT=""
   if [[ $PLATFORM =~ osx-arm64 ]]
   then
-     export MPICH_CC=clang
-     export MPICH_CXX=clang++
+    # These variables affect the mpicc/mpicxx wrappers
+    export MPICH_CC=clang
+    export MPICH_CXX=clang++
   fi
 else
-  NULL="--null" ZT="--zero-terminated"
+  NULL="--null"
+  ZT="--zero-terminated"
 fi
 printenv ${NULL} | sort ${ZT} | tr '\0' '\n' > \
                                    $RECIPE_DIR/build-env.log

dev/conda/conda-build.sh

@@ -27,8 +27,8 @@ Options:
 END
 }
 
-C="" R=""
-zparseopts -D -E -F h=HELP C=C r=R
+C="" R="" R_VERSION=""
+zparseopts -D -E -F h=HELP C=C r:=R
 
 if (( ${#HELP} )) {
   help
@@ -37,20 +37,28 @@ if (( ${#HELP} )) {
 
 # Get this directory (absolute):
 DEV_CONDA=${0:A:h}
+source $DEV_CONDA/helpers.zsh
 
 # The Swift/T Git clone:
 SWIFT_T_TOP=${DEV_CONDA:h:h}
 TMP=${TMP:-/tmp}
 
 source $SWIFT_T_TOP/turbine/code/scripts/helpers.zsh
-source $DEV_CONDA/helpers.zsh
+# Sets SWIFT_T_VERSION:
+source $SWIFT_T_TOP/dev/get-versions.sh
+export SWIFT_T_VERSION
+# Sets PYTHON_VERSION:
+source $DEV_CONDA/get-python-version.sh
+# Optionally set R_VERSION from user argument:
+if (( ${#R} )) export R_VERSION=${R[2]}
 
 if (( ${#PLATFORM:-} == 0 )) {
   log "unset: PLATFORM"
   log "       This script should be called by a conda-platform.sh"
   return 1
 }
 
+log "VERSION:  $SWIFT_T_VERSION"
 log "PLATFORM: $PLATFORM $*"
 
 # This is passed into meta.yaml:
@@ -114,7 +122,7 @@ m4 -P -I $DEV_CONDA $COMMON_M4 $SETTINGS_SED  > settings.sed
 
 if (( ${#C} )) {
   log "configure-only: exit."
-  exit
+  return
 }
 
 # Backup the old log

dev/conda/conda-platform.sh

@@ -0,0 +1,29 @@
+#!/bin/zsh
+set -eu
+
+# CONDA PLATFORM
+# Dependency files are in the PLATFORM directory
+# Generated scripts and log files are put in the PLATFORM directory
+# Arguments:
+#  -C configure-only- generate meta.yaml and settings.sed, then stop
+#  -r R_VERSION for the R version
+#  PLATFORM: The PLATFORM directory
+
+C="" R=""
+zparseopts -D -E -F h=HELP C=C r:=R
+if (( ${#*} != 1 )) {
+  print "conda-platform.sh: Provide PLATFORM!"
+  return 1
+}
+export PLATFORM=$1
+
+# The Swift/T Conda script directory (absolute):
+DEV_CONDA=${0:A:h}
+
+if [[ ! -d $DEV_CONDA/$PLATFORM ]] {
+  printf "conda-platform.sh: No such platform: '%s'\n" $PLATFORM
+  return 1
+}
+
+cd $DEV_CONDA/$PLATFORM
+$DEV_CONDA/conda-build.sh $HELP $C $R

dev/conda/linux-64/conda-platform.sh

@@ -3,18 +3,16 @@ COMMENT(
 # Will be filtered into PLATFORM/meta.yaml by conda-build.sh:m4
 )
 
-# Date that this meta.yaml was filtered:
+# Date that this meta.yaml was filtered from meta-template.yaml:
 # DATE: getenv(DATE)
 
-{% set name = "getenv(PKG_NAME)" %}
-{% set version = "1.6.4" %}
-{% set major = version.rpartition('.')[0] %}
-{% set sha256 = 'f5b26bb1ac427c271e19dff2146101f7c4da03652d66426a291e96638ba15c03' %}
+{% set name    = "getenv(PKG_NAME)" %}
+{% set version = "getenv(SWIFT_T_VERSION)" %}
+{% set major   = version.rpartition('.')[0] %}
 
 package:
-  name: {{ name|lower }}
+  name:    {{ name|lower }}
   version: {{ version }}
-  sha256: {{ sha256 }}
 
 source:
   path: getenv(DISTRO)/swift-t-{{ version }}/swift-t-{{ version }}

dev/conda/linux-aarch64/conda-platform.sh

@@ -7,6 +7,6 @@ COMMENT(      inside build-generic.sh                       )m4_dnl
 COMMENT( Retain indentation                                 )m4_dnl
 m4_ifelse(getenv(PLATFORM),`osx-arm64',
 `    - swift-t::emews-rinside',
-`    - r'
+`    - r=getenv(R_VERSION)'
 )m4_dnl
 # pkgs-R.yaml: STOP