From 2dbe7e8b5a2253f05babf67d04ee08215092fd51 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 2 Jul 2021 13:17:05 +0200 Subject: [PATCH] build-examples: fix conda-prep-env instructions Signed-off-by: Alessandro Comodi --- .github/scripts/build-examples.sh | 2 +- docs/building-examples.rst | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/scripts/build-examples.sh b/.github/scripts/build-examples.sh index 904d0c0..8896c23 100755 --- a/.github/scripts/build-examples.sh +++ b/.github/scripts/build-examples.sh @@ -54,7 +54,7 @@ fi # activate conda and enter example dir -snippets="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env,conda-act-env,enter-dir-$fpga_family" +snippets="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env-$fpga_family,conda-act-env,enter-dir-$fpga_family" # Xilinx 7-Series examples if [ "$fpga_family" = "xc7" ]; then diff --git a/docs/building-examples.rst b/docs/building-examples.rst index 11b499c..8e1317f 100644 --- a/docs/building-examples.rst +++ b/docs/building-examples.rst @@ -29,11 +29,23 @@ Select your FPGA family: Next, prepare the environment: -.. code-block:: bash - :name: conda-prep-env +.. tabs:: - export PATH="$INSTALL_DIR/$FPGA_FAM/quicklogic-arch-defs/bin:$PATH"; - source "$INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" + .. group-tab:: Artix-7 + + .. code-block:: bash + :name: conda-prep-env-xc7 + + export PATH="$INSTALL_DIR/$FPGA_FAM/install/bin:$PATH"; + source "$INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" + + .. group-tab:: EOS S3 + + .. code-block:: bash + :name: conda-prep-env-eos-s3 + + export PATH="$INSTALL_DIR/$FPGA_FAM/quicklogic-arch-defs/bin:$PATH"; + source "$INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" Finally, enter your working Conda environment: