modtool: template: Update conda recipe.

Most of these are minor tweaks, but the addition of `libboost-headers`
as a host dependency is absolutely necessary to get a recipe that will
build against the latest `gnuradio` conda-forge package, which has
migrated to Boost 1.82 which brings new split packages.

Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
(cherry picked from commit f7bcf737755bab82998c39c9d3d9e6b4b50fe489)
Signed-off-by: Jeff Long <willcode4@gmail.com>

4 files changed, 15 insertions, 11 deletions

diff --git a/gr-utils/modtool/templates/gr-newmod/.conda/README.md b/gr-utils/modtool/templates/gr-newmod/.conda/README.md
index beef4c665..e2b755649 100644
--- a/gr-utils/modtool/templates/gr-newmod/.conda/README.md
+++ b/gr-utils/modtool/templates/gr-newmod/.conda/README.md
@@ -24,7 +24,7 @@ Packages for GNU Radio and some out-of-tree (OOT) modules are available through
         conda install -n base conda-build conda-forge-pinning
         conda upgrade -n base conda-build conda-forge-pinning
 
-    **Windows users only**: you will also need to have Microsoft's Visual C++ build tools installed. Usually you can do this by installing the [Community edition of Visual Studio](https://visualstudio.microsoft.com/free-developer-offers/) and then selecting a MSVC C++ x64/x86 build tools component under the list of "Individual Components". As of this writing, you will specifically need MSVC v141, i.e. the "MSVC v141 - VS2017 C++ x64/x86 build tools (v14.16)" component. If the build fails to find the version of MSVC it is looking for, try installing other (newer) versions.
+    **Windows users only**: you will also need to have Microsoft's Visual C++ build tools installed. Usually you can do this by installing the [Community edition of Visual Studio](https://visualstudio.microsoft.com/free-developer-offers/) and then selecting a MSVC C++ x64/x86 build tools component under the list of "Individual Components". As of this writing, you will specifically need MSVC v142, i.e. the "MSVC v142 - VS 2019 C++ x64/x86 build tools" component. If the build fails to find the version of MSVC it is looking for, try installing other (newer) versions.
 
 2. Download the source code for this OOT module (which includes this recipe). Typically, this is done by using `git` and cloning the module's repository:
 
@@ -55,11 +55,11 @@ Packages for GNU Radio and some out-of-tree (OOT) modules are available through
 
 4. Install the package into an existing environment
 
-        conda install --use-local -n <environment_name> gnuradio-EXAMPLE
+        conda install --use-local -n <environment_name> gnuradio-howto
 
     or create a new environment that includes the package:
 
-        conda create -n test_env gnuradio-EXAMPLE
+        conda create -n test_env gnuradio-howto
 
 
 ## Modifying the recipe
diff --git a/gr-utils/modtool/templates/gr-newmod/.conda/conda-forge.yml b/gr-utils/modtool/templates/gr-newmod/.conda/conda-forge.yml
index 66c58f22a..700083cfd 100644
--- a/gr-utils/modtool/templates/gr-newmod/.conda/conda-forge.yml
+++ b/gr-utils/modtool/templates/gr-newmod/.conda/conda-forge.yml
@@ -1,11 +1,14 @@
 # See https://conda-forge.org/docs/maintainer/conda_forge_yml.html for
 # documentation on possible keys and values.
 
-# uncomment to enable cross-compiled osx-arm64 builds
+# uncomment to enable cross-compiled builds
 #build_platform:
+#  linux_aarch64: linux_64
+#  linux_ppc64le: linux_64
 #  osx_arm64: osx_64
 clone_depth: 0
 github_actions:
+  cancel_in_progress: false
   store_build_artifacts: true
 os_version:
   linux_64: cos7
@@ -13,7 +16,7 @@ provider:
   linux: github_actions
   osx: github_actions
   win: github_actions
-  # uncomment to enable additional linux platforms
+  # uncomment to enable emulated builds for additional linux platforms
   #linux_aarch64: github_actions
   #linux_ppc64le: github_actions
 recipe_dir: .conda/recipe
diff --git a/gr-utils/modtool/templates/gr-newmod/.conda/recipe/bld.bat b/gr-utils/modtool/templates/gr-newmod/.conda/recipe/bld.bat
index de4a3b7fc..c007950d2 100644
--- a/gr-utils/modtool/templates/gr-newmod/.conda/recipe/bld.bat
+++ b/gr-utils/modtool/templates/gr-newmod/.conda/recipe/bld.bat
@@ -7,10 +7,10 @@ cd buildconda
 
 :: configure
 cmake -G "Ninja" ^
-    -DCMAKE_BUILD_TYPE:STRING=Release ^
-    -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^
-    -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^
-    -DGR_PYTHON_DIR:PATH="%SP_DIR%" ^
+    -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+    -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
+    -DGR_PYTHON_DIR="%SP_DIR%" ^
     -DENABLE_DOXYGEN=OFF ^
     -DENABLE_TESTING=ON ^
     ..
diff --git a/gr-utils/modtool/templates/gr-newmod/.conda/recipe/meta.yaml b/gr-utils/modtool/templates/gr-newmod/.conda/recipe/meta.yaml
index 80f992841..15cfd552f 100644
--- a/gr-utils/modtool/templates/gr-newmod/.conda/recipe/meta.yaml
+++ b/gr-utils/modtool/templates/gr-newmod/.conda/recipe/meta.yaml
@@ -40,6 +40,7 @@ requirements:
     # the following two entries are for generating builds against specific GR versions
     - gnuradio-core  # [not gnuradio_extra_pin]
     - gnuradio-core {{ gnuradio_extra_pin }}.*  # [gnuradio_extra_pin]
+    - libboost-headers
     - pip  # [win]
     - pybind11
     - python
@@ -59,7 +60,7 @@ test:
     ## verify that commands run
     #- COMMAND --help
 
-    # verify that (some) headers get installed
+    ## verify that (some) headers get installed
     - test -f $PREFIX/include/gnuradio/{{ oot_name }}/api.h  # [not win]
     - if not exist %PREFIX%\\Library\\include\\gnuradio\\{{ oot_name }}\\api.h exit 1  # [win]
 
@@ -86,7 +87,7 @@ about:
   # of the license text file within the source directory, e.g. "LICENSE".
   # See https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#license-file
 
-  #home: https://github.com/<username>/gr-howto
+  #home: https://github.com/<FIXME>/gr-howto
   #license: GPL-3.0-or-later
   #license_file: LICENSE
   #summary: GNU Radio howto module