Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
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
Anders Lindh Olsson
e3-require
Commits
49e1b87a
Commit
49e1b87a
authored
3 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Minor cleanup
parent
75a5dbfc
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure/E3/CONFIG_EPICS
+1
-11
1 addition, 11 deletions
configure/E3/CONFIG_EPICS
configure/E3/DECOUPLE_FLAGS
+1
-7
1 addition, 7 deletions
configure/E3/DECOUPLE_FLAGS
configure/module/RULES_TEST
+0
-1
0 additions, 1 deletion
configure/module/RULES_TEST
with
2 additions
and
19 deletions
configure/E3/CONFIG_EPICS
+
1
−
11
View file @
49e1b87a
...
@@ -43,17 +43,7 @@ export M_ADCORE
...
@@ -43,17 +43,7 @@ export M_ADCORE
export M_OPCUA
export M_OPCUA
## This is needed since the target "epics" (in configure/RULES_MODULE in most modules)
## This is needed since the target "epics" (in configure/RULES_MODULE in most modules)
## uses SUDOBASH to run the make process:
## uses SUDOBASH to run the make process
#
#.PHONY: epics
#epics:
# $(QUIET)echo "EPICS_BASE:=$(EPICS_BASE)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
# $(QUIET)echo "ASYN:=$(M_ASYN)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
# $(QUIET)echo "CHECK_RELEASE:=YES" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
# $(QUIET)echo "INSTALL_LOCATION:=$(M_DEVLIB2)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
# $(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
#
## And so that last line will only run if SUDOBASH is defined to be "bash -c"
SUDOBASH := bash -c
SUDOBASH := bash -c
### Exclude the following variables to display
### Exclude the following variables to display
...
...
This diff is collapsed.
Click to expand it.
configure/E3/DECOUPLE_FLAGS
+
1
−
7
View file @
49e1b87a
# Legacy file. Needed since <module>.Makefiles include the boilerplate code
# Legacy file. Needed since <module>.Makefiles include this.
#
# where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
# include ${E3_REQUIRE_TOOLS}/driver.makefile
# include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
#
# which fails if this file does not exist. TODO: Remove this line from all modules
This diff is collapsed.
Click to expand it.
configure/module/RULES_TEST
+
0
−
1
View file @
49e1b87a
.PHONY: test
.PHONY: test
test:
test:
pytest $(TEST_DIR) -v
pytest $(TEST_DIR) -v
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