Skip to content
Snippets Groups Projects
Commit b7b2f8d3 authored by Simon Rose's avatar Simon Rose
Browse files

Fixing dependencies between build, install, etc.

parent 263c1539
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ E3_BASE_INSTALL_LOCATION_STARTUP:=$(E3_BASE_INSTALL_LOCATION)/startup
GIT_REMOTE_NAME=$(shell git remote | head -n 1)
RM = rm -f
E3_BASE_METADATA=$(E3_BASE_INSTALL_LOCATION)/base_meta.yaml
E3_BASE_METADATA=$(E3_BUILD_LOCATION)/base_meta.yaml
# This regex is meant to remove any credentials that are part of the https url, if the wrapper was cloned in that way.
# It replaces anything of the form https://user[:password]@url with https://url.
......
......@@ -57,15 +57,24 @@ rebuild: distclean init patch build
## Build EPICS BASE(s) according to $(E3_BASE_VERSION)
build: conf
build: conf build_epics $(E3_BASE_METADATA)
.PHONY: build_epics
build_epics:
$(QUIET) $(MAKE) -C $(E3_BASE_SRC_PATH)
.PHONY: install
## Install EPICS Base to $(E3_BASE_INSTALL_LOCATION)
install: build
$(QUIET) cp --recursive $(E3_BUILD_LOCATION)/ $(E3_BASE_INSTALL_LOCATION)
install: $(E3_EPICS_PATH) $(E3_BUILD_LOCATION)
$(QUIET) cp --recursive $(E3_BUILD_LOCATION) $(E3_EPICS_PATH)
$(E3_BUILD_LOCATION):
${MAKE} build
$(E3_EPICS_PATH):
$(QUIET) mkdir $@
conf: $(E3_BASE_VERSION) $(E3_BASE_METADATA)
conf: $(E3_BASE_VERSION)
$(E3_BASE_VERSION):
......@@ -83,7 +92,7 @@ endif
$(E3_BASE_INSTALL_LOCATION):
$(QUIET) install -m 755 -d $@
$(E3_BASE_METADATA): $(E3_BASE_INSTALL_LOCATION)
$(E3_BASE_METADATA):
@echo "wrapper_url: '$(E3_BASE_GIT_URL)'" > $@
@echo "wrapper_git_desc: '$(E3_BASE_GIT_DESC)'" >> $@
@echo "wrapper_diffs: $(E3_BASE_GIT_STATUS)" >> $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment