Update [de]activation scripts for consistency (#2293)

* Update rust package

* Update flang package

* Update emscripten package

* Update cross-r-base

* Bump recipes for testing

* Remove cffi pin

* Update cross-python

* Replace orjson with pycrdt for testing

* Restore tested packages

* Restore pycrdt

Author: IsabelParedes

recipes/recipes/cross-python_emscripten-wasm32/activate-cross-python.sh renamed to recipes/recipes/cross-python_emscripten-wasm32/activate.sh

@@ -15,7 +15,7 @@ cp $BUILD_PREFIX/bin/python3 $PREFIX/bin
 
 
 # this will activate emscripten in case it has not yet been activated
-source $CONDA_PREFIX/etc/conda/activate.d/emscripten_emscripten-wasm32_activate.sh
+source $CONDA_PREFIX/etc/conda/activate.d/activate_emscripten_emscripten-wasm32.sh
 
 
 if [[ "${CONDA_BUILD:-0}" == "1" && "${CONDA_BUILD_STATE}" != "TEST" ]]; then

recipes/recipes/cross-python_emscripten-wasm32/build.sh

@@ -1,6 +1,9 @@
-mkdir -p ${PREFIX}/etc/conda/activate.d
-mkdir -p ${PREFIX}/etc/conda/deactivate.d
+#!/bin/bash
 
-
-cp "${RECIPE_DIR}"/activate-cross-python.sh ${PREFIX}/etc/conda/activate.d/activate_z-${PKG_NAME}.sh
-cp "${RECIPE_DIR}"/deactivate-cross-python.sh ${PREFIX}/etc/conda/deactivate.d/deactivate_z-${PKG_NAME}.sh
+# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
+# This will allow them to be run on environment activation.
+for TASK in "activate" "deactivate"
+do
+    mkdir -p "${PREFIX}/etc/conda/${TASK}.d"
+    envsubst '$PKG_VERSION' < "${RECIPE_DIR}/${TASK}.sh" > "${PREFIX}/etc/conda/${TASK}.d/${TASK}_${PKG_NAME}.sh"
+done

recipes/recipes/cross-python_emscripten-wasm32/deactivate-cross-python.sh renamed to recipes/recipes/cross-python_emscripten-wasm32/deactivate.sh

@@ -1,30 +1,30 @@
 context:
   name: cross-python_emscripten-wasm32
-  version: "3.13.1"
+  version: 3.13.1
 
 package:
-  name: ${{ name|lower }}
+  name: ${{ name }}
   version: ${{ version }}
 
 build:
-  number: 4
+  number: 5
 
 requirements:
 
   run:
     - coreutils
     - crossenv >=1.2
-    - emscripten_emscripten-wasm32 
+    - emscripten_emscripten-wasm32
     - rsync
     - sed
     - python =3.13
     - setuptools
     - pip
-  
+
   run_exports:
     strong:
       - emscripten-abi  >=3.1.73,<3.1.74.0a0
-    
+
 about:
   summary: cross-python
 

recipes/recipes/cross-python_emscripten-wasm32/recipe.yaml

@@ -2,8 +2,10 @@
 
 set -eux
 
-mkdir -p $PREFIX/etc/conda/activate.d
-mkdir -p $PREFIX/etc/conda/deactivate.d
-
-cp $RECIPE_DIR/activate-cross-r-base.sh $PREFIX/etc/conda/activate.d/
-cp $RECIPE_DIR/deactivate-cross-r-base.sh $PREFIX/etc/conda/deactivate.d/
+# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
+# This will allow them to be run on environment activation.
+for TASK in "activate" "deactivate"
+do
+    mkdir -p "${PREFIX}/etc/conda/${TASK}.d"
+    cp "${RECIPE_DIR}/${TASK}.sh" "${PREFIX}/etc/conda/${TASK}.d/${TASK}_z-${PKG_NAME}.sh"
+done

recipes/recipes/cross-python_emscripten-wasm32/recipe_legacy.yaml

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+unset R
+unset R_ARGS
+unset R_HOME

recipes/recipes/cross-r-base_emscripten-wasm32/activate-cross-r-base.sh renamed to recipes/recipes/cross-r-base_emscripten-wasm32/activate.sh

@@ -1,39 +1,33 @@
 #!/bin/bash
 
+mkdir -p ${PREFIX}/bin
+
 # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
 # This will allow them to be run on environment activation.
-for CHANGE in "activate" "deactivate"
+for TASK in "activate" "deactivate"
 do
-    mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
-    envsubst '$PKG_VERSION' < "${RECIPE_DIR}/${CHANGE}.sh" > "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
+    mkdir -p "${PREFIX}/etc/conda/${TASK}.d"
+    envsubst '$PKG_VERSION' < "${RECIPE_DIR}/${TASK}.sh" > "${PREFIX}/etc/conda/${TASK}.d/${TASK}_${PKG_NAME}.sh"
+    cp "${PREFIX}/etc/conda/${TASK}.d/${TASK}_${PKG_NAME}.sh" "${PREFIX}/bin/${TASK}_emscripten.sh"
 done
 
-mkdir -p ${PREFIX}/bin
-cp "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh" ${PREFIX}/bin/activate_emscripten.sh
-
 export EMSDK_PYTHON=${BUILD_PREFIX}/bin/python
 
 ./emsdk install $PKG_VERSION
 
-# export EMSDK=/Users/wolfv/Programs/emscripten-forge/emscripten_forge_emsdk_install
 export EMSDK=.
 
-
 echo "emsdk patching"
 pushd upstream/emscripten
-cat $RECIPE_DIR/patches/*.patch | patch -p1 --verbose 
-popd    
+cat $RECIPE_DIR/patches/*.patch | patch -p1 --verbose
+popd
 echo "...done"
 
 
-
-
 mkdir -p $PREFIX/opt/emsdk/
 cp -r $EMSDK/upstream $PREFIX/opt/emsdk/upstream
 rm -rf $PREFIX/opt/emsdk/upstream/emscripten/test/
 
-mkdir -p $PREFIX/bin
-
 for file in $PREFIX/opt/emsdk/upstream/bin/*; do
     echo "Linking $file"
     ln -sf $file $PREFIX/bin/