Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hog
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Andrea Celentano
hog
Commits
40218885
Commit
40218885
authored
4 years ago
by
Francesco Gonnella
Browse files
Options
Downloads
Patches
Plain Diff
Just fix error and warning messages
parent
a5c90d0e
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
Tcl/hog.tcl
+6
-5
6 additions, 5 deletions
Tcl/hog.tcl
Tcl/integrated/post-implementation.tcl
+1
-4
1 addition, 4 deletions
Tcl/integrated/post-implementation.tcl
Tcl/integrated/pre-synthesis.tcl
+0
-2
0 additions, 2 deletions
Tcl/integrated/pre-synthesis.tcl
with
7 additions
and
11 deletions
Tcl/hog.tcl
+
6
−
5
View file @
40218885
...
...
@@ -968,14 +968,15 @@ proc GetHash {FILE path} {
## * FILE: list file or path containing the subset of files whose latest commit hash will be returned
# * path: the path the vhdl file are referred to in the list file (not used if FILE is a path or "ALL")
#
# if the special string "ALL" is used, returns the global hash
# if the special string "ALL" is used, returns the global hash
of the path specified in path
proc GetVer
{
FILE path
}
{
set SHA
[
GetHash $FILE $path
]
set path
[
file normalize $path
]
set status
[
catch
{
exec git tag --sort=taggerdate --contain $SHA
}
result
]
if
{
$status
== 0
}
{
if
{[
regexp
{
^ *$
}
$result
]}
{
if
[
catch
{
exec git tag --sort=-creatordate
}
last_tag
]
{
Msg CriticalWarning
"No Hog version tags found in this repository."
Msg CriticalWarning
"No Hog version tags found in this repository
(
$path
)
."
set ver v0.0.0
}
else
{
set tags
[
split $last_tag
"
\n
"
]
...
...
@@ -983,9 +984,9 @@ proc GetVer {FILE path} {
lassign
[
ExtractVersionFromTag $tag
]
M m p n mr
if
{
$mr
== -1
}
{
incr p
Msg Info
"No tag contains
$
SHA for
$
FILE, will use most recent tag
$tag.
As this is an official tag, patch will be incremented to
$p.
"
Msg Info
"No tag contains
$
SHA for
$
FILE
(
$path
)
, will use most recent tag
$tag.
As this is an official tag, patch will be incremented to
$p.
"
}
else
{
Msg Info
"No tag contains
$
SHA for
$
FILE, will use most recent tag
$tag.
As this is a candidate tag, the patch level will be kept at
$p.
"
Msg Info
"No tag contains
$
SHA for
$
FILE
(
$path
)
, will use most recent tag
$tag.
As this is a candidate tag, the patch level will be kept at
$p.
"
}
set ver v$M.$m.$p
...
...
@@ -1022,7 +1023,7 @@ proc GetVer {FILE path} {
set n
[
format %04X 0
]
set comm $SHA
}
else
{
Msg Warning
"Tag does not contain a properly formatted version:
$ver
"
Msg Warning
"Tag does not contain a properly formatted version:
$ver
in repository containing
$
FILE
"
set M
[
format %02X 0
]
set m
[
format %02X 0
]
set c
[
format %04X 0
]
...
...
This diff is collapsed.
Click to expand it.
Tcl/integrated/post-implementation.tcl
+
1
−
4
View file @
40218885
...
...
@@ -9,13 +9,10 @@ if { [exec git status --untracked-files=no --porcelain] eq "" } {
Msg Info
"Git working directory
[
pwd
]
clean."
lassign
[
GetVer ALL ./
]
version commit
}
else
{
Msg CriticalWarning
"Git working directory
[
pwd
]
not clean, commit hash
, official, and version will
be set to 0."
Msg CriticalWarning
"Git working directory
[
pwd
]
not clean,
git
commit hash be set to 0."
set commit
"0000000"
set version
"00000000"
}
puts $commit
# Set bitstream embedded variables
set_property BITSTREAM.CONFIG.USERID $commit
[
current_design
]
set_property BITSTREAM.CONFIG.USR_ACCESS $commit
[
current_design
]
...
...
This diff is collapsed.
Click to expand it.
Tcl/integrated/pre-synthesis.tcl
+
0
−
2
View file @
40218885
...
...
@@ -37,8 +37,6 @@ if {$flavour != ""} {
}
Msg Info
"Evaluating firmware date and, possibly, git commit hash..."
if
{
[
exec git status --untracked-files=no --porcelain
]
eq
""
}
{
Msg Info
"Git working directory
[
pwd
]
clean."
lassign
[
GetVer ALL ./
]
version commit
...
...
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