Skip to content

Commit

Permalink
add WIP PMAC integration
Browse files Browse the repository at this point in the history
  • Loading branch information
jeonghanlee committed Aug 27, 2024
1 parent e59c496 commit 6549df7
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 1 deletion.
1 change: 1 addition & 0 deletions configure/CONFIG_MODS
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ SRC_GITURL_SNMP:=$(strip $(SRC_URL_JEONGHANLEE))/$(strip $(SRC_NAME_SNMP))
SRC_GITURL_MOTORSIM:=$(strip $(SRC_URL_MOTOR))/$(strip $(SRC_NAME_MOTORSIM))
SRC_GITURL_PYDEVSUP:=$(strip $(SRC_URL_MD))/$(strip $(SRC_NAME_PYDEVSUP))
SRC_GITURL_PVXS:=$(strip $(SRC_URL_MD))/$(strip $(SRC_NAME_PVXS))
SRC_GITURL_PMAC:=$(strip $(SRC_URL_PMAC))/$(strip $(SRC_NAME_PMAC))
#
MODS_INSTALL_LOCATIONS_VARS:=$(filter-out %_EPICS %_ %_BASE %_MODS, $(filter INSTALL_LOCATION_%, $(.VARIABLES)))
MODS_INSTALL_LOCATIONS:=$(foreach v, $(MODS_INSTALL_LOCATIONS_VARS), $($(v)))
Expand Down
1 change: 1 addition & 0 deletions configure/CONFIG_MODS_DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ mca_DEPS:=null.base build.asyn build.calc build.sscan build.busy build.scaler bu
measComp_DEPS:=null.base build.asyn build.calc build.sscan build.busy build.scaler build.sequencer build.autosave build.std build.mca
motor_DEPS:=null.base build.sequencer build.busy build.lua build.modbus
motorMotorSim_DEPS:=null.base build.motor
pmac_DEPS:=null.base build.asyn build.calc build.motor build.busy

7 changes: 7 additions & 0 deletions configure/RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,13 @@ SRC_NAME_PVXS:=pvxs
SRC_TAG_PVXS:=tags/1.3.1
SRC_VER_PVXS:=1.3.1
#
# https://github.com/DiamondLightSource/pmac
# 2024-07-15 dls-master
SRC_URL_PMAC:=https://github.com/DiamondLightSource
SRC_NAME_PMAC:=pmac
SRC_TAG_PMAC:=3d2e73f
SRC_VER_PMAC:=3d2e73fi
#
-include $(TOP)/../RELEASE.local
-include $(TOP)/configure/RELEASE.local
#
2 changes: 1 addition & 1 deletion configure/RULES_MODS_CONFIG
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MODS_ZERO_SHOW:=$(addsuffix .show, $(MODS_ZERO_VARS))
MODS_LIBERA_VARS:=conf.iocStats conf.retools conf.caPutLog conf.recsync conf.autosave conf.sncseq conf.sscan conf.pcas conf.asyn.libera
MODS_LIBERA_SHOW:=$(addsuffix .show, $(MODS_LIBERA_VARS))

MODS_ONE_VARS:=conf.calc conf.asyn conf.modbus conf.lua conf.std conf.StreamDevice conf.busy conf.scaler conf.mca conf.measComp conf.motor conf.motorMotorSim
MODS_ONE_VARS:=conf.calc conf.asyn conf.modbus conf.lua conf.std conf.StreamDevice conf.busy conf.scaler conf.mca conf.measComp conf.motor conf.motorMotorSim conf.pmac
MODS_ONE_SHOW:=$(addsuffix .show, $(MODS_ONE_VARS))

.PHONY: conf.release.modules conf.release.modules.show update.pvxs
Expand Down
50 changes: 50 additions & 0 deletions docs/README.newmodule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# New Module

I would like to add the following repository for the production environemnt.

https://github.com/DiamondLightSource/pmac

##

The commit is July 15, 2024 at the `dls-master` branch
In `configure/RELEASE`


```bash
# https://github.com/DiamondLightSource/pmac
# 2024-07-15 dls-master
SRC_URL_PMAC:=https://github.com/DiamondLightSource/pmac¶
SRC_NAME_PMAC:=pmac
SRC_TAG_PMAC:=3d2e73f
SRC_VER_PMAC:=3d2e73f
```

Edit `configure/CONFIG_MODS` if the module URL is not `github/epics-modules`

```
SRC_GITURL_PMAC:=$(strip $(SRC_URL_PMAC))/$(strip $(SRC_NAME_PMAC))
```

Edit `configure/CONFIG_MODS_DEPS`

```bash
pmac_DEPS:=null.base build.asyn build.calc build.motor build.busy¶
```



* Edit `configure/RULES_MODS_CONFIG`

Please consult `XXXApp/src/Makefile` to check its real dependency and add the proper configuration name in one of the following variables.

- `MOD_ZERO_VARS` : This module has only EPICS base dependency.
- `MOD_ONE_VARS` : This module has multiple EPICS modules dependencies.

pmac has asyn, calc, motor, busy dependencies. So add conf.pmc into MODS_ONE_VARS

```bash
MODS_ZERO_VARS:=conf.iocStats conf.MCoreUtils conf.retools conf.caPutLog conf.recsync conf.autosave conf.sncseq conf.ether_ip conf.sscan conf.snmp conf.opcua conf.pyDevSup
MODS_ONE_VARS:=conf.calc conf.asyn conf.modbus conf.lua conf.std conf.StreamDevice conf.busy conf.scaler conf.mca
```


0 comments on commit 6549df7

Please sign in to comment.