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
cab9eb16
Commit
cab9eb16
authored
4 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Added wrapper data to metadata file
parent
ac9aad92
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
+16
-4
16 additions, 4 deletions
App/tools/driver.makefile
with
16 additions
and
4 deletions
App/tools/driver.makefile
+
16
−
4
View file @
cab9eb16
...
@@ -174,6 +174,10 @@ export ARCH_FILTER
...
@@ -174,6 +174,10 @@ export ARCH_FILTER
export
EXCLUDE_ARCHS
export
EXCLUDE_ARCHS
export
MAKE_FIRST
export
MAKE_FIRST
export
${PRJ}_E3_GIT_URL
export
${PRJ}_E3_GIT_DESC
export
${PRJ}_E3_GIT_STATUS
# Some shell commands:
# Some shell commands:
RMDIR
=
rm
-rf
RMDIR
=
rm
-rf
LN
=
ln
-s
LN
=
ln
-s
...
@@ -506,9 +510,13 @@ export BINS
...
@@ -506,9 +510,13 @@ export BINS
export
CFG
export
CFG
${PRJ}_GIT_HASH
:=
$(
shell git rev-parse
--short
HEAD
)
# These variables are written into a .yaml file in the installed module directory to keep track of
export
${PRJ}_GIT_HASH
# metadata for which module was compiled.
${PRJ}_GIT_STATUS
:=
$(
shell git status
--porcelain
|
grep
-v
"
\.
Makefile"
|
sed
's/\(.*\)/ - \1/'
)
${PRJ}_GIT_DESC
:=
$(
shell git describe
--tags
2> /dev/null | git rev-parse HEAD
)
export
${PRJ}_GIT_DESC
# The sed is a bit hacky here, but it's needed to add a prefix to each line which make doesn't seem to do well.
${PRJ}_GIT_STATUS
:=
$(
shell git status
--porcelain
|
grep
-v
"
\.
Makefile"
|
sed
's/^/ - /'
)
export
${PRJ}_GIT_STATUS
export
${PRJ}_GIT_STATUS
else
# in O.*
else
# in O.*
...
@@ -1003,7 +1011,11 @@ ${EXPORTFILE}: $(filter-out $(basename ${EXPORTFILE})$(OBJ),${LIBOBJS})
...
@@ -1003,7 +1011,11 @@ ${EXPORTFILE}: $(filter-out $(basename ${EXPORTFILE})$(OBJ),${LIBOBJS})
${METAFILE}
:
${METAFILE}
:
@
echo
"module_git_hash:
$(${
PRJ
}
_GIT_HASH
)
"
>
$@
@
echo
"wrapper_url:
$(${
PRJ
}
_E3_GIT_URL
)
"
>
$@
@
echo
"wrapper_git_desc:
$(${
PRJ
}
_E3_GIT_DESC
)
"
>>
$@
@
echo
"wrapper_diffs:"
>>
$@
@
echo
"
$(${
PRJ
}
_E3_GIT_STATUS
)
"
>>
$@
@
echo
"module_git_desc:
$(${
PRJ
}
_GIT_DESC
)
"
>>
$@
@
echo
"module_diffs:"
>>
$@
@
echo
"module_diffs:"
>>
$@
@
echo
"
$(${
PRJ
}
_GIT_STATUS
)
"
>>
$@
@
echo
"
$(${
PRJ
}
_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