From 2b18943947356b39e78158148c6d962a6fe866e4 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 6 Jun 2017 13:34:23 +0800
Subject: [PATCH] conda: use new noarch system

---
 conda/artiq-dev/meta.yaml |  2 +-
 conda/artiq/build.sh      |  5 -----
 conda/artiq/meta.yaml     | 12 +++++++++++-
 setup.py                  | 36 ++++++++++++++++++------------------
 4 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100755 conda/artiq/build.sh

diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index a3f65b87b..c81baa953 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -6,7 +6,7 @@ source:
   git_url: ../..
 
 build:
-  noarch_python: true
+  noarch: python
   number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
   string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
 
diff --git a/conda/artiq/build.sh b/conda/artiq/build.sh
deleted file mode 100755
index b2b5e3dd0..000000000
--- a/conda/artiq/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-ARTIQ_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq
-
-$PYTHON setup.py install --single-version-externally-managed --record=record.txt
diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index 7fdade74c..287bce62e 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -5,10 +5,20 @@ package:
 source:
   git_url: ../..
 
+{% set data = load_setup_py_data() %}
+
 build:
-  noarch_python: true
+  noarch: python
   number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
   string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
+  entry_points:
+    # NOTE: conda-build cannot distinguish between console and gui scripts
+    {% for entry_point_type, entry_points in data.get("entry_points", dict()).items() -%}
+    {% for entry_point in entry_points -%}
+    - {{ entry_point }}
+    {% endfor %}
+    {% endfor %}
+  script: $PYTHON setup.py install --single-version-externally-managed --record=record.txt
 
 requirements:
   build:
diff --git a/setup.py b/setup.py
index 44830f1f6..fbd75bce5 100755
--- a/setup.py
+++ b/setup.py
@@ -19,27 +19,27 @@ requirements = [
 ]
 
 console_scripts = [
-    "artiq_client=artiq.frontend.artiq_client:main",
-    "artiq_compile=artiq.frontend.artiq_compile:main",
-    "artiq_coreanalyzer=artiq.frontend.artiq_coreanalyzer:main",
-    "artiq_coreconfig=artiq.frontend.artiq_coreconfig:main",
-    "artiq_corelog=artiq.frontend.artiq_corelog:main",
-    "artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main",
-    "artiq_influxdb=artiq.frontend.artiq_influxdb:main",
-    "artiq_master=artiq.frontend.artiq_master:main",
-    "artiq_mkfs=artiq.frontend.artiq_mkfs:main",
-    "artiq_rpctool=artiq.frontend.artiq_rpctool:main",
-    "artiq_run=artiq.frontend.artiq_run:main",
-    "artiq_flash=artiq.frontend.artiq_flash:main",
-    "lda_controller=artiq.frontend.lda_controller:main",
-    "novatech409b_controller=artiq.frontend.novatech409b_controller:main",
-    "pdq2_controller=artiq.frontend.pdq2_controller:main",
-    "thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
+    "artiq_client = artiq.frontend.artiq_client:main",
+    "artiq_compile = artiq.frontend.artiq_compile:main",
+    "artiq_coreanalyzer = artiq.frontend.artiq_coreanalyzer:main",
+    "artiq_coreconfig = artiq.frontend.artiq_coreconfig:main",
+    "artiq_corelog = artiq.frontend.artiq_corelog:main",
+    "artiq_ctlmgr = artiq.frontend.artiq_ctlmgr:main",
+    "artiq_influxdb = artiq.frontend.artiq_influxdb:main",
+    "artiq_master = artiq.frontend.artiq_master:main",
+    "artiq_mkfs = artiq.frontend.artiq_mkfs:main",
+    "artiq_rpctool = artiq.frontend.artiq_rpctool:main",
+    "artiq_run = artiq.frontend.artiq_run:main",
+    "artiq_flash = artiq.frontend.artiq_flash:main",
+    "lda_controller = artiq.frontend.lda_controller:main",
+    "novatech409b_controller = artiq.frontend.novatech409b_controller:main",
+    "pdq2_controller = artiq.frontend.pdq2_controller:main",
+    "thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main",
 ]
 
 gui_scripts = [
-    "artiq_browser=artiq.frontend.artiq_browser:main",
-    "artiq_dashboard=artiq.frontend.artiq_dashboard:main",
+    "artiq_browser = artiq.frontend.artiq_browser:main",
+    "artiq_dashboard = artiq.frontend.artiq_dashboard:main",
 ]
 
 setup(