From c675488a99ec9bf18220138460509500bb3f1d5f Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 16 Jan 2021 10:43:14 +0800
Subject: [PATCH] reorganize JSON schema files

---
 MANIFEST.in                                                    | 2 +-
 .../coredevice_generic.schema.json}                            | 0
 artiq/{gateware => coredevice}/jsondesc.py                     | 2 +-
 artiq/frontend/artiq_ddb_template.py                           | 2 +-
 artiq/gateware/targets/kasli_generic.py                        | 3 ++-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename artiq/{gateware/targets/kasli_generic.schema.json => coredevice/coredevice_generic.schema.json} (100%)
 rename artiq/{gateware => coredevice}/jsondesc.py (91%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9182037f6..52fac08ba 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,4 +3,4 @@ graft artiq/examples
 include artiq/gui/logo*.svg
 include versioneer.py
 include artiq/_version.py
-include artiq/gateware/targets/kasli_generic.schema.json
+include artiq/coredevice/coredevice_generic.schema.json
diff --git a/artiq/gateware/targets/kasli_generic.schema.json b/artiq/coredevice/coredevice_generic.schema.json
similarity index 100%
rename from artiq/gateware/targets/kasli_generic.schema.json
rename to artiq/coredevice/coredevice_generic.schema.json
diff --git a/artiq/gateware/jsondesc.py b/artiq/coredevice/jsondesc.py
similarity index 91%
rename from artiq/gateware/jsondesc.py
rename to artiq/coredevice/jsondesc.py
index b936c3a43..58f14d8b0 100644
--- a/artiq/gateware/jsondesc.py
+++ b/artiq/coredevice/jsondesc.py
@@ -19,7 +19,7 @@ def extend_with_default(validator_class):
         validator_class, {"properties" : set_defaults},
     )
 
-schema_path = path.join(path.dirname(__file__), "targets/kasli_generic.schema.json")
+schema_path = path.join(path.dirname(__file__), "coredevice_generic.schema.json")
 with open(schema_path, "r") as f:
     schema = json.load(f)
 
diff --git a/artiq/frontend/artiq_ddb_template.py b/artiq/frontend/artiq_ddb_template.py
index 718d50511..932ecd321 100755
--- a/artiq/frontend/artiq_ddb_template.py
+++ b/artiq/frontend/artiq_ddb_template.py
@@ -7,7 +7,7 @@ from collections import defaultdict
 from itertools import count
 
 from artiq import __version__ as artiq_version
-from artiq.gateware import jsondesc
+from artiq.coredevice import jsondesc
 
 
 def process_header(output, description):
diff --git a/artiq/gateware/targets/kasli_generic.py b/artiq/gateware/targets/kasli_generic.py
index 168b14ee4..5d3e6671f 100755
--- a/artiq/gateware/targets/kasli_generic.py
+++ b/artiq/gateware/targets/kasli_generic.py
@@ -5,7 +5,8 @@ import argparse
 from misoc.integration.builder import builder_args, builder_argdict
 from misoc.targets.kasli import soc_kasli_args, soc_kasli_argdict
 
-from artiq.gateware import rtio, eem, jsondesc
+from artiq.coredevice import jsondesc
+from artiq.gateware import rtio, eem
 from artiq.gateware.rtio.phy import ttl_simple, ttl_serdes_7series, edge_counter
 from artiq.gateware.targets.kasli import StandaloneBase, MasterBase, SatelliteBase
 from artiq.build_soc import *