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
515c06f7
Commit
515c06f7
authored
4 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Missed some changes from commit
1e0ed93d
parent
4a58bd55
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
App/tools/driver.makefile
+4
-6
4 additions, 6 deletions
App/tools/driver.makefile
with
4 additions
and
6 deletions
App/tools/driver.makefile
+
4
−
6
View file @
515c06f7
...
...
@@ -167,9 +167,6 @@ MODULE=
PROJECT
=
PRJDIR
:=
$(
subst -,_,
$(
subst .,_,
$(
notdir
$(
patsubst %Lib,%,
$(
patsubst %/snl,%,
$(
patsubst %/src,%,
${
PWD
}))))))
PRJ
=
$(
strip
$(
or
${
MODULE
}
,
${
PROJECT
}
,
${
PRJDIR
}))
# To keep consistent between conda/nfs, we will force all modules to be lowercase.
PRJ
:=
$(
shell
echo
$(
PRJ
)
|
tr
'[:upper:]'
'[:lower:]'
)
export
PRJ
OS_CLASS_LIST
=
$(
BUILDCLASSES
)
...
...
@@ -497,8 +494,7 @@ ARCH_PARTS = ${T_A} $(subst -, ,${T_A}) ${OS_CLASS}
VAR_EXTENSIONS
=
${
EPICSVERSION
}
${
ARCH_PARTS
}
${
ARCH_PARTS:%
=
${
EPICSVERSION
}
_%
}
export
VAR_EXTENSIONS
REQ_tmp
=
${
REQUIRED
}
$(
foreach x,
${
VAR_EXTENSIONS
}
,
${
REQUIRED_
$x
})
REQ
=
$(
shell
echo
$(
REQ_tmp
)
|
tr
'[:upper:]'
'[:lower:]'
)
REQ
=
${
REQUIRED
}
$(
foreach x,
${
VAR_EXTENSIONS
}
,
${
REQUIRED_
$x
})
export
REQ
SRCS
+=
$(
foreach x,
${
VAR_EXTENSIONS
}
,
${
SOURCES_
$x
})
...
...
@@ -1063,4 +1059,6 @@ endif # EPICSVERSION defined
##
## Tuesday, June 30 2020 : Combine NFS E3 driver.makefile with conda version
##
##
Friday,
July
3
2020
\ No newline at end of file
## Friday, July 3 2020 : Force all module names to be lowercase, to allow consistency between conda/nfs startup scripts.
##
## $(DATE)
:
Removed the V3-specific code. Added metadata file.
\ No newline at end of file
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