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
Iterations
Wiki
Jira
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
ESS EPICS Environment
wrappers
e3-require
Commits
86e6e2aa
Commit
86e6e2aa
authored
3 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Fixed inconsistent variable naming
parent
17dad862
No related branches found
Branches containing commit
No related tags found
1 merge request
!83
E3-752: Fetch dependencies recursively
Pipeline
#110039
passed
3 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
require-ess/tools/driver.makefile
+12
-12
12 additions, 12 deletions
require-ess/tools/driver.makefile
with
12 additions
and
12 deletions
require-ess/tools/driver.makefile
+
12
−
12
View file @
86e6e2aa
...
@@ -442,18 +442,18 @@ select = $(strip $(call -select,$(strip $2),$1,$3))
...
@@ -442,18 +442,18 @@ select = $(strip $(call -select,$(strip $2),$1,$3))
str-eq
=
$(
if
$(
subst x
$1
,,x
$2
)
,,t
)
str-eq
=
$(
if
$(
subst x
$1
,,x
$2
)
,,t
)
_
MODULES
:=
MODULES
:=
_
PROCESSED_MODULES
:=
PROCESSED_MODULES
:=
REQ
:=
REQ
:=
INSTALLED_MODULES
:=
$(
sort
$(
notdir
$(
wildcard
$(
E3_SITEMODS_PATH
)
/
*
$(
EPICS_MODULES
)
/
*
)))
INSTALLED_MODULES
:=
$(
sort
$(
notdir
$(
wildcard
$(
E3_SITEMODS_PATH
)
/
*
$(
EPICS_MODULES
)
/
*
)))
# Converts all of the X_DEP_VERSIONs to x_VERSION and records them
# Converts all of the X_DEP_VERSIONs to x_VERSION and records them
define
fetch_module_versions
define
fetch_module_versions
_
lm
:=
$$(
shell
echo
$1
|
tr
'[:upper:]'
'[:lower:]'
)
lm
:=
$$(
shell
echo
$1
|
tr
'[:upper:]'
'[:lower:]'
)
ifneq
($$(strip $$(filter $(INSTALLED_MODULES),$$(
_
lm))),)
ifneq
($$(strip $$(filter $(INSTALLED_MODULES),$$(lm))),)
$$(
_
lm)_VERSION
:=
$(
$1_DEP_VERSION$2
)
$$(lm)_VERSION
:=
$(
$1_DEP_VERSION$2
)
_
MODULES
+=
$$(
_
lm
)
MODULES
+=
$$(
lm
)
REQ
+=
$$(
_
lm
)
REQ
+=
$$(
lm
)
else
else
$
$(
warning
Invalid dependency
"
$1_DEP_VERSION$2
"
;
pruning
)
$
$(
warning
Invalid dependency
"
$1_DEP_VERSION$2
"
;
pruning
)
endif
endif
...
@@ -471,16 +471,16 @@ endef
...
@@ -471,16 +471,16 @@ endef
# Used to recurse through versions: recursively fetches all of the dependencies from the given module
# Used to recurse through versions: recursively fetches all of the dependencies from the given module
define
update_dep_versions
define
update_dep_versions
m
:=
$$(
firstword
$$(
_
MODULES
))
m
:=
$$(
firstword
$$(
MODULES
))
_
PROCESSED_MODULES
+=
$$
m
PROCESSED_MODULES
+=
$$
m
$$m_TBL
:=
$$(
call fetch_deps,
$$
m
)
$$m_TBL
:=
$$(
call fetch_deps,
$$
m
)
$$m_DEPS
:=
$$(
call
select
,1,
$$(
$$
m_TBL
)
,1
)
$$m_DEPS
:=
$$(
call
select
,1,
$$(
$$
m_TBL
)
,1
)
_
MODULES
:=
$$(
filter-out
$$(
_
PROCESSED_MODULES
)
,
$$(
_
MODULES
)
$$(
$$
m_DEPS
))
MODULES
:=
$$(
filter-out
$$(
PROCESSED_MODULES
)
,
$$(
MODULES
)
$$(
$$
m_DEPS
))
$$(foreach mm,$$($$m_DEPS),$$(eval $$(mm)_VERSION
:
= $$(call select
,
2
,
$$($$m_TBL)
,
$$$$(call str-eq
,
$$$$1
,
$$(mm)))))
$$(foreach mm,$$($$m_DEPS),$$(eval $$(mm)_VERSION
:
= $$(call select
,
2
,
$$($$m_TBL)
,
$$$$(call str-eq
,
$$$$1
,
$$(mm)))))
endef
endef
$(
call
while
,
$$(
_
MODULES
)
,
$(
update_dep_versions
))
$(
call
while
,
$$(
MODULES
)
,
$(
update_dep_versions
))
$(
foreach
m,
$(
_
PROCESSED_MODULES
)
,
$(
eval export
$m_VERSION
))
$(
foreach
m,
$(
PROCESSED_MODULES
)
,
$(
eval export
$m_VERSION
))
debug
::
debug
::
@
echo
"===================== Pass 3: T_A =
$(
T_A
)
====================="
@
echo
"===================== Pass 3: T_A =
$(
T_A
)
====================="
...
...
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