move ibek yaml files to /epics/ibek

epics-containers · Oct 30, 2023 · f7d82de · f7d82de
1 parent ea9da7e
commit f7d82de
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -154,6 +154,7 @@
     logo=dict(
         text=project,
     ),
+    navigation_with_keys=True,
     use_edit_page_button=True,
     github_url=f"https://github.com/{github_user}/{github_repo}",
     icon_links=[

diff --git a/src/ibek/globals.py b/src/ibek/globals.py
@@ -27,8 +27,7 @@
 
 # Folder containing templates for IOC src etc.
 TEMPLATES = Path(__file__).parent / "templates"
-# Folder containing symlinks to useful files
-SYMLINKS = EPICS_ROOT / "links"
+IBEK_FILES = EPICS_ROOT / "ibek"
 
 IOC_DBDS = SUPPORT / "configure/dbd_list"
 IOC_LIBS = SUPPORT / "configure/lib_list"

diff --git a/src/ibek/ioc_cmds/assets.py b/src/ibek/ioc_cmds/assets.py
@@ -6,7 +6,7 @@
 
 import typer
 
-from ibek.globals import EPICS_ROOT, IOC_FOLDER, SYMLINKS
+from ibek.globals import EPICS_ROOT, IBEK_FILES, IOC_FOLDER
 
 
 def get_ioc_source() -> Path:
@@ -69,7 +69,7 @@ def extract_assets(destination: Path, source: Path, extras: List[Path], defaults
         default_assets = [
             get_ioc_source() / "ibek-support",
             source / "support" / "configure",
-            SYMLINKS,
+            IBEK_FILES,
             IOC_FOLDER,
             Path("/venv"),
         ]

diff --git a/src/ibek/support_cmds/commands.py b/src/ibek/support_cmds/commands.py
@@ -17,12 +17,12 @@
 from typing_extensions import Annotated
 
 from ibek.globals import (
+    IBEK_FILES,
     IOC_DBDS,
     IOC_LIBS,
     RELEASE,
     RUNTIME_DEBS,
     SUPPORT,
-    SYMLINKS,
     NaturalOrderGroup,
 )
 from ibek.support import Support
@@ -256,7 +256,7 @@ def generate_links(
 
     support_yaml = from_path.glob("*/*.ibek.support.yaml")
 
-    to_path = SYMLINKS / "ibek"
+    to_path = IBEK_FILES
     to_path.mkdir(parents=True, exist_ok=True)
     for yaml in support_yaml:
         link_from = to_path / yaml.name

diff --git a/src/ibek/templates/ioc/start.sh b/src/ibek/templates/ioc/start.sh
@@ -74,7 +74,7 @@ if [ -f ${ibek_src} ]; then
     final_ioc_startup=/tmp/st.cmd
 
     # get ibek the support yaml files this ioc's support modules
-    defs=/epics/links/ibek/*.ibek.support.yaml
+    defs=/epics/ibek/*.ibek.support.yaml
     ibek runtime generate ${ibek_src} ${defs} --out ${final_ioc_startup} --db-out ${db_src}
 
     # build expanded database using msi