Skip to content

Commit

Permalink
More changes to build configuration files
Browse files Browse the repository at this point in the history
- Removes definition of T_A in support Makefile
- Replaces RULES_DIR with RULES in support Makefile
- Adds gulpfile fn for cleaning motor build directories
  • Loading branch information
colbysparks committed Nov 15, 2024
1 parent bd6a629 commit d38d4cb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 0 additions & 1 deletion configure/CONFIG_SITE
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ CHECK_RELEASE = YES
#CROSS_OPT = NO

# Configure env variables for linking to zaber motion support package
MOTOR_ZABER_MOTION=$(MOTOR)/modules/motorZaberMotion
MOTOR_ZABER_MOTION_SUPPORT=$(MOTOR_ZABER_MOTION)/zaberMotionSupport/ZaberMotionCppSupport

# System architecture names copied from epics base-7.0.8.1/configure/CONFIG_SITE
Expand Down
1 change: 1 addition & 0 deletions configure/RELEASE
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# RELEASE - Location of external support modules
MOTOR_ZABER_MOTION = $(MOTOR)/modules/motorZaberMotion

# Use motor/module's generated release file when buidling inside motor
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
Expand Down
4 changes: 4 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ export const build_motor = async () => {
await exec(`make -C ${EPICS_SUPPORT}/motor`);
}

export const clean_motor = async () => {
await exec(`make realclean -C ${EPICS_SUPPORT}/motor`);
}

export const run_ioc = async () => {
const iocBootFolder = `${EPICS_SUPPORT}/motor/modules/motorZaberMotion/iocs/zaberMotionIOC/iocBoot/iocZaberMotion`;
await exec(`cd ${iocBootFolder} && ./st.cmd.${os.platform()}-${os_to_epics_arch()}`);
Expand Down
5 changes: 2 additions & 3 deletions zaberMotionSupport/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
T_A = $(EPICS_HOST_ARCH)

ifndef ZML_HOST_ARCH
$(error "motorZaberMotion: Unsupported architecture: $(T_A)")
$(error "motorZaberMotion: Unsupported architecture: $(EPICS_HOST_ARCH)")
endif

LIB_INSTALLS += $(wildcard ZaberMotionCppSupport/lib/$(ZML_HOST_ARCH)/*)

#=============================

include $(TOP)/configure/RULES_DIRS
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

0 comments on commit d38d4cb

Please sign in to comment.