Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
978ea608
Commit
978ea608
authored
Jan 17, 2014
by
yoogx
Browse files
* Update circuitry to get current revision to git
parent
bd56a3d6
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/main/ocarina-configuration.adb.in
View file @
978ea608
...
...
@@ -68,7 +68,7 @@ package body Ocarina.Configuration is
@
AADL_VERSION
@;
pragma
Style_Checks
(
Off
);
S
VN
_Revision
:
constant
String
:=
"Working Copy from @S
VN
_REVISION@"
;
S
CM
_Revision
:
constant
String
:=
"Working Copy from @S
CM
_REVISION@"
;
pragma
Style_Checks
(
On
);
--
We
keep
the
repository
version
as
"(Working Copy) from ..."
to
--
distinguish
modified
versions
.
When
packaging
Ocarina
,
we
...
...
@@ -245,13 +245,13 @@ package body Ocarina.Configuration is
end Ocarina_Version;
--------------------------
-- Ocarina_
SVN_
Revision --
-- Ocarina_Revision --
--------------------------
function Ocarina_
SVN_
Revision return String is
function Ocarina_Revision return String is
begin
return S
VN
_Revision;
end Ocarina_
SVN_
Revision;
return S
CM
_Revision;
end Ocarina_Revision;
---------------------------------
-- Ocarina_Last_Configure_Date --
...
...
src/main/ocarina-configuration.ads
View file @
978ea608
...
...
@@ -40,7 +40,7 @@ package Ocarina.Configuration is
procedure
Reset_Modules
;
function
Ocarina_Version
return
String
;
function
Ocarina_
SVN_
Revision
return
String
;
function
Ocarina_Revision
return
String
;
function
Ocarina_Last_Configure_Date
return
String
;
function
Ocarina_Last_Configure_Year
return
String
;
-- Version control routines
...
...
src/main/ocarina_cmd.adb
View file @
978ea608
...
...
@@ -1299,7 +1299,7 @@ procedure Ocarina_Cmd is
begin
Write_Line
(
"Ocarina "
&
Ocarina_Version
&
" ("
&
Ocarina_
SVN_
Revision
&
")"
);
&
" ("
&
Ocarina_Revision
&
")"
);
if
Ocarina_Last_Configure_Date
/=
""
then
Write_Line
(
"Build date: "
&
Ocarina_Last_Configure_Date
);
...
...
support/revision_utils.m4
View file @
978ea608
...
...
@@ -8,22 +8,22 @@ AC_DEFUN([AM_REVISION_UTILS],
[
# Take the current SVN revision
AC_MSG_CHECKING(whether this is a
n
S
VN
working copy)
AC_MSG_CHECKING(whether this is a S
CM
working copy)
temp_s
vn
_output=`
LANG=C svn info [$1] 2>/dev/null | grep "^Revision:" | awk '{print $NF}'
`
temp_s
cm
_output=`
(cd $srcdir; git rev-parse --short HEAD)
`
if test x"${temp_s
vn
_output}" = x""; then
if test x"${temp_s
cm
_output}" = x""; then
# This means we are NOT working on a repository copy, the value of
# S
VN
_REVISION will not be taken into account.
# S
CM
_REVISION will not be taken into account.
S
VN
_REVISION=""
S
CM
_REVISION=""
AC_MSG_RESULT(no.)
else
S
VN
_REVISION="r${temp_s
vn
_output}"
AC_MSG_RESULT(yes: ${S
VN
_REVISION}.)
S
CM
_REVISION="r${temp_s
cm
_output}"
AC_MSG_RESULT(yes: ${S
CM
_REVISION}.)
fi
AC_SUBST(S
VN
_REVISION)
AC_SUBST(S
CM
_REVISION)
# Take the configure full date
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment