From 81f0efea9b0861521e87aa3cfe2ec0a813738e5e Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Mon, 26 Feb 2018 15:09:23 +0000
Subject: [PATCH] conda: use a single artiq-board package.

---
 conda/artiq-board/build.sh             | 14 +++++++++++++
 conda/artiq-board/meta.yaml            | 29 ++++++++++++++++++++++++++
 conda/artiq-kc705-nist_clock/build.sh  | 14 -------------
 conda/artiq-kc705-nist_clock/meta.yaml | 23 --------------------
 conda/artiq-kc705-nist_qc2/build.sh    | 14 -------------
 conda/artiq-kc705-nist_qc2/meta.yaml   | 23 --------------------
 conda/artiq-kc705-phaser/build.sh      | 14 -------------
 conda/artiq-kc705-phaser/meta.yaml     | 23 --------------------
 8 files changed, 43 insertions(+), 111 deletions(-)
 create mode 100644 conda/artiq-board/build.sh
 create mode 100644 conda/artiq-board/meta.yaml
 delete mode 100644 conda/artiq-kc705-nist_clock/build.sh
 delete mode 100644 conda/artiq-kc705-nist_clock/meta.yaml
 delete mode 100644 conda/artiq-kc705-nist_qc2/build.sh
 delete mode 100644 conda/artiq-kc705-nist_qc2/meta.yaml
 delete mode 100644 conda/artiq-kc705-phaser/build.sh
 delete mode 100644 conda/artiq-kc705-phaser/meta.yaml

diff --git a/conda/artiq-board/build.sh b/conda/artiq-board/build.sh
new file mode 100644
index 000000000..3df4c52e5
--- /dev/null
+++ b/conda/artiq-board/build.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
+[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
+
+SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-${ARTIQ_VARIANT}
+mkdir -p $SOC_PREFIX
+
+V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H ${ARTIQ_VARIANT} --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
+cp misoc_${ARTIQ_VARIANT}_kc705/gateware/top.bit $SOC_PREFIX
+cp misoc_${ARTIQ_VARIANT}_kc705/software/bios/bios.bin $SOC_PREFIX
+cp misoc_${ARTIQ_VARIANT}_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
+
+wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit
diff --git a/conda/artiq-board/meta.yaml b/conda/artiq-board/meta.yaml
new file mode 100644
index 000000000..e182bd0d0
--- /dev/null
+++ b/conda/artiq-board/meta.yaml
@@ -0,0 +1,29 @@
+package:
+  name: artiq-board
+  version: {{ environ["GIT_DESCRIBE_TAG"] }}
+
+source:
+  git_url: ../..
+
+build:
+  noarch: python
+  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
+  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
+  script_env:
+    - ARTIQ_TARGET
+    - ARTIQ_VARIANT
+  ignore_prefix_files: True
+
+outputs:
+  - name: artiq-{{ environ["ARTIQ_TARGET"] }}-{{ environ["ARTIQ_VARIANT"] }}
+
+requirements:
+  build:
+    - artiq-dev {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
+  run:
+    - artiq {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
+
+about:
+  home: https://m-labs.hk/artiq
+  license: LGPL
+  summary: 'Bitstream, BIOS and firmware for the {{ environ.get("ARTIQ_TARGET") }}-{{ environ.get("ARTIQ_VARIANT") }} board variant'
diff --git a/conda/artiq-kc705-nist_clock/build.sh b/conda/artiq-kc705-nist_clock/build.sh
deleted file mode 100644
index f4787644d..000000000
--- a/conda/artiq-kc705-nist_clock/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
-[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
-
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_clock
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H nist_clock --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
-cp misoc_nist_clock_kc705/gateware/top.bit $SOC_PREFIX
-cp misoc_nist_clock_kc705/software/bios/bios.bin $SOC_PREFIX
-cp misoc_nist_clock_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
-
-wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit
diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml
deleted file mode 100644
index 1db897a6d..000000000
--- a/conda/artiq-kc705-nist_clock/meta.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-package:
-  name: artiq-kc705-nist_clock
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for NIST_CLOCK on the KC705 board'
diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh
deleted file mode 100644
index 8402c9ea8..000000000
--- a/conda/artiq-kc705-nist_qc2/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
-[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
-
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_qc2
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kc705_dds -H nist_qc2 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
-cp misoc_nist_qc2_kc705/gateware/top.bit $SOC_PREFIX
-cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX
-cp misoc_nist_qc2_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
-
-wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit
diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml
deleted file mode 100644
index 009f0b630..000000000
--- a/conda/artiq-kc705-nist_qc2/meta.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-package:
-  name: artiq-kc705-nist_qc2
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for NIST_QC2 on the KC705 board'
diff --git a/conda/artiq-kc705-phaser/build.sh b/conda/artiq-kc705-phaser/build.sh
deleted file mode 100644
index 756e878bd..000000000
--- a/conda/artiq-kc705-phaser/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
-[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
-
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-phaser
-mkdir -p $SOC_PREFIX
-
-V=1 $PYTHON -m artiq.gateware.targets.kc705_phaser --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
-cp misoc_phaser_kc705/gateware/top.bit $SOC_PREFIX
-cp misoc_phaser_kc705/software/bios/bios.bin $SOC_PREFIX
-cp misoc_phaser_kc705/software/runtime/runtime.{elf,fbi} $SOC_PREFIX
-
-wget -P $SOC_PREFIX https://raw.githubusercontent.com/jordens/bscan_spi_bitstreams/single-tap/bscan_spi_xc7k325t.bit
diff --git a/conda/artiq-kc705-phaser/meta.yaml b/conda/artiq-kc705-phaser/meta.yaml
deleted file mode 100644
index 687bd4989..000000000
--- a/conda/artiq-kc705-phaser/meta.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-package:
-  name: artiq-kc705-phaser
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
-
-source:
-  git_url: ../..
-
-build:
-  noarch: python
-  ignore_prefix_files: True
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
-
-requirements:
-  build:
-    - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-  run:
-    - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }}
-
-about:
-  home: https://m-labs.hk/artiq
-  license: LGPL
-  summary: 'Bitstream, BIOS and runtime for Phaser on the KC705 board'