Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-pco
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-pco
Commits
25128db8
Commit
25128db8
authored
Nov 07, 2018
by
Roberto Arturo Homs-Regojo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor - file VERSION is not longer used
parent
886ce2e2
Pipeline
#6196
passed with stages
in 5 minutes and 13 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
8 deletions
+13
-8
build/msvc/9.0/liblimapco/liblimapco.vcproj
build/msvc/9.0/liblimapco/liblimapco.vcproj
+0
-4
doc/VERSION.log
doc/VERSION.log
+12
-0
setId
setId
+0
-2
src/PcoCamera.cpp
src/PcoCamera.cpp
+1
-2
No files found.
build/msvc/9.0/liblimapco/liblimapco.vcproj
View file @
25128db8
...
...
@@ -734,10 +734,6 @@
RelativePath=
"..\..\..\..\useSdk118"
>
</File>
<File
RelativePath=
"..\..\..\..\VERSION"
>
</File>
<File
RelativePath=
"..\..\..\..\doc\VERSION.log"
>
...
...
doc/VERSION.log
View file @
25128db8
2018/11/07 15:51:37 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.23] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2018-11-06 16:20:36 +0100] head[886ce2e][886ce2e2c02ed9d089b3525f2a0667a02fdf3c2b] ref[ (HEAD -> master, gitlab/master)] at [2018/11/07 15:51:36] $"
#define LIMA_GIT_VERSION "$Id: LIMA rev[2018-09-10 16:04:44 +0200] head[9127a24a][9127a24a52ff5863b7ce03f39198fa4e643b9ebc] ref[ (HEAD -> core-1.7, gitlab/core-1.7, github/core-1.7)] at [2018/11/07 15:51:36] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2018-01-12 12:04:00 +0100] head[8175ab6][8175ab6cef2b729d69449e2845483df01262ee04] ref[ (HEAD)] at [2018/11/07 15:51:36] $"
#define LIBCONFIG_GIT_VERSION "$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, github/master, github/HEAD, master)] at [2018/11/07 15:51:36] $"
#define TANGO_GIT_VERSION "$Id: TANGO rev[2018-05-23 11:04:34 +0200] head[c209ba6][c209ba61ce1dfa3c9038543909978fc89082d365] ref[ (HEAD -> core-1.7, gitlab/core-1.7, github/core-1.7)] at [2018/11/07 15:51:36] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2018-02-20 19:16:00 +0100] head[043e98c][043e98cdab4c87a0e61dc0c89b46008785d13bf8] ref[ (HEAD -> master)] at [2018/11/07 15:51:36] $"
2018/09/14 13:26:40 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
...
...
setId
View file @
25128db8
...
...
@@ -16,7 +16,6 @@ LOG="./doc/VERSION.log"
DT
=
`
date
+
"%Y/%m/%d %H:%M:%S"
`
PCOLIMAVER
=
`
head
-1
VERSION
`
PCOREV
=
`
git log
-n
1
--date
=
iso
--format
=
format:
"rev[%ad] head[%h][%H] ref[%d]"
HEAD
||
echo
"ERROR"
`
LIMAREV
=
`
cd
../..
;
git log
-n
1
--date
=
iso
--format
=
format:
"rev[%ad] head[%h][%H] ref[%d]"
HEAD
||
echo
"ERROR"
`
PROCLIBREV
=
`
cd
../../third-party/Processlib
;
git log
-n
1
--date
=
iso
--format
=
format:
"rev[%ad] head[%h][%H] ref[%d]"
HEAD
||
echo
"ERROR"
`
...
...
@@ -27,7 +26,6 @@ SPECREV=`cd ../../applications/spec ; git log -n 1 --date=iso --format=format:"r
{
head
-1
${
SDK_WIN_H
}
head
-1
${
SDK_LIN_H
}
echo
"#define PCO_LIMA_VERSION
\"\$
Id: PCOLIMA [
${
PCOLIMAVER
}
]
\$\"
"
echo
"#define PCO_GIT_VERSION
\"\$
Id: PCO
${
PCOREV
}
at [
${
DT
}
]
\$\"
"
echo
"#define LIMA_GIT_VERSION
\"\$
Id: LIMA
${
LIMAREV
}
at [
${
DT
}
]
\$\"
"
echo
"#define PROCLIB_GIT_VERSION
\"\$
Id: PROCLIB
${
PROCLIBREV
}
at [
${
DT
}
]
\$\"
"
...
...
src/PcoCamera.cpp
View file @
25128db8
...
...
@@ -108,8 +108,7 @@ char * _timestamp_gitversion(char *buffVersion, int len)
LIBCONFIG_GIT_VERSION
,
LIMA_GIT_VERSION
,
TANGO_GIT_VERSION
,
SPEC_GIT_VERSION
,
PCO_LIMA_VERSION
SPEC_GIT_VERSION
);
return
buffVersion
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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