Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guillermo Arroyo Gomez
e3-base
Commits
b7b2f8d3
Commit
b7b2f8d3
authored
3 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Fixing dependencies between build, install, etc.
parent
263c1539
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure/E3/CONFIG_BASE
+1
-1
1 addition, 1 deletion
configure/E3/CONFIG_BASE
configure/E3/RULES_BASE
+14
-5
14 additions, 5 deletions
configure/E3/RULES_BASE
with
15 additions
and
6 deletions
configure/E3/CONFIG_BASE
+
1
−
1
View file @
b7b2f8d3
...
...
@@ -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_B
ASE_INSTALL
_LOCATION)/base_meta.yaml
E3_BASE_METADATA=$(E3_B
UILD
_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.
...
...
This diff is collapsed.
Click to expand it.
configure/E3/RULES_BASE
+
14
−
5
View file @
b7b2f8d3
...
...
@@ -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)" >> $@
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment