Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
633178ef
Commit
633178ef
authored
Aug 29, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "set QGC version from git"
parent
f10e77cb
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
31 additions
and
65 deletions
+31
-65
.gitignore
.gitignore
+0
-2
QGCApplication.pro
QGCApplication.pro
+1
-2
ubuntu_ppa
deploy/ubuntu_ppa
+8
-19
git_version.pri
git_version.pri
+0
-26
qgroundcontrol.pro
qgroundcontrol.pro
+0
-5
QGCApplication.cc
src/QGCApplication.cc
+4
-7
QGCConfig.h
src/QGCConfig.h
+17
-0
MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.cc
+1
-1
git_version.h
src/git_version.h
+0
-3
No files found.
.gitignore
View file @
633178ef
...
@@ -67,5 +67,3 @@ ui_*
...
@@ -67,5 +67,3 @@ ui_*
*.so*
*.so*
*.moc
*.moc
*.prl
*.prl
git_version.cpp
git_version.obj
QGCApplication.pro
View file @
633178ef
...
@@ -18,10 +18,9 @@
...
@@ -18,10 +18,9 @@
#
-------------------------------------------------
#
-------------------------------------------------
include
(
QGCCommon
.
pri
)
include
(
QGCCommon
.
pri
)
include
(
git_version
.
pri
)
TARGET
=
qgroundcontrol
TARGET
=
qgroundcontrol
TEMPLATE
=
app
TEMPLATE
=
app
#
Load
additional
config
flags
from
user_config
.
pri
#
Load
additional
config
flags
from
user_config
.
pri
exists
(
user_config
.
pri
)
:
infile
(
user_config
.
pri
,
CONFIG
)
{
exists
(
user_config
.
pri
)
:
infile
(
user_config
.
pri
,
CONFIG
)
{
...
...
deploy/ubuntu_ppa
100755 → 100644
View file @
633178ef
#! /bin/bash
#! /bin/bash
tmpdir
=
`
mktemp
-d
`
version
=
"2.4"
long_version
=
`
git describe
--always
--tags
`
rsync
-av
--delete
--exclude
=
.git ~/git/qgroundcontrol/ ~/tmp/qgroundcontrol-
${
version
}
/
short_version
=
`
git describe
--always
--tags
|
cut
-d
"-"
-f
1,2
`
version
=
${
long_version
:1
}
cd
~/tmp
dir_version
=
${
short_version
:1
}
tar
pczf qgroundcontrol_
${
version
}
.orig.tar.gz qgroundcontrol-
${
version
}
echo
$version
debchange
-v
${
version
}
--distribution
trusty
cd
~/tmp/qgroundcontrol-
${
version
}
/
qmake
-r
qgroundcontrol.pro
make git_ver
rsync
-av
--delete
--exclude
={
.git,build-release,release,Makefile
\*
}
.
${
tmpdir
}
/qgroundcontrol-
${
dir_version
}
/
cd
${
tmpdir
}
tar
pczf qgroundcontrol_
${
dir_version
}
.orig.tar.gz qgroundcontrol-
${
dir_version
}
cd
${
tmpdir
}
/qgroundcontrol-
${
dir_version
}
/
debuild
-S
debuild
-S
dput ppa:qgroundcontrol/ppa
${
tmpdir
}
/qgroundcontrol_
${
version
}
_source.changes
dput ppa:qgroundcontrol/ppa qgroundcontrol_
${
version
}
-0ubuntu1_source
.changes
# test building the source deb locally
# test building the source deb locally
#
debuild --prepend-path=/usr/lib/ccache -sa
debuild
--prepend-path
=
/usr/lib/ccache
-sa
git_version.pri
deleted
100644 → 0
View file @
f10e77cb
# set the QGC version from git
exists ($$PWD/.git) {
GIT_DESCRIBE = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)
WindowsBuild {
QGC_GIT_VER = echo extern \"C\" { const char *git_version() { return \"$$GIT_DESCRIBE\"; } } > git_version.cpp
LIBS += git_version.obj
} else {
QGC_GIT_VER = echo \"extern \\\"C\\\" { const char *git_version() { return \\\"$$GIT_DESCRIBE\\\"; } }\" > git_version.cpp
LIBS += git_version.o
}
}
WindowsBuild {
LIBS += git_version.obj
} else {
LIBS += git_version.o
}
CONFIG(debug) {
GIT_VERSION_CXXFLAGS = $$QMAKE_CXXFLAGS_DEBUG
} else {
GIT_VERSION_CXXFLAGS = $$QMAKE_CXXFLAGS_RELEASE
}
QMAKE_PRE_LINK += $$QGC_GIT_VER && $$QMAKE_CXX -c $$GIT_VERSION_CXXFLAGS git_version.cpp
qgroundcontrol.pro
View file @
633178ef
...
@@ -22,8 +22,6 @@ CONFIG += ordered
...
@@ -22,8 +22,6 @@ CONFIG += ordered
SUBDIRS
=
.
/
QGCLocationPlugin
.
pro
SUBDIRS
=
.
/
QGCLocationPlugin
.
pro
SUBDIRS
+=
.
/
QGCApplication
.
pro
SUBDIRS
+=
.
/
QGCApplication
.
pro
include
(
git_version
.
pri
)
QGCApplication
.
depends
=
QGCLocationPlugin
QGCApplication
.
depends
=
QGCLocationPlugin
message
(
Qt
version
$$
[
QT_VERSION
])
message
(
Qt
version
$$
[
QT_VERSION
])
...
@@ -32,6 +30,3 @@ message(Qt version $$[QT_VERSION])
...
@@ -32,6 +30,3 @@ message(Qt version $$[QT_VERSION])
error
(
"Unsupported Qt version, 5.4+ is required"
)
error
(
"Unsupported Qt version, 5.4+ is required"
)
}
}
message
(
QGroundControl
version
$$
{
GIT_DESCRIBE
})
git_ver
.
commands
=
$$
QGC_GIT_VER
QMAKE_EXTRA_TARGETS
+=
git_ver
src/QGCApplication.cc
View file @
633178ef
...
@@ -48,7 +48,6 @@ GST_PLUGIN_STATIC_DECLARE(QTVIDEOSINK_NAME);
...
@@ -48,7 +48,6 @@ GST_PLUGIN_STATIC_DECLARE(QTVIDEOSINK_NAME);
G_END_DECLS
G_END_DECLS
#endif
#endif
#include "git_version.h"
#include "configuration.h"
#include "configuration.h"
#include "QGC.h"
#include "QGC.h"
#include "QGCApplication.h"
#include "QGCApplication.h"
...
@@ -256,12 +255,10 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
...
@@ -256,12 +255,10 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
setOrganizationName
(
QGC_ORG_NAME
);
setOrganizationName
(
QGC_ORG_NAME
);
setOrganizationDomain
(
QGC_ORG_DOMAIN
);
setOrganizationDomain
(
QGC_ORG_DOMAIN
);
QString
versionString
(
git_version
());
// Version string is build from component parts. Format is:
// stable versions are on tags (v1.2.3)
// vMajor.Minor.BuildNumber BuildType
// development versions are full git describe versions (v1.2.3-18-g879e8b3)
QString
versionString
(
"v%1.%2.%3 %4"
);
if
(
versionString
.
length
()
>
8
)
{
versionString
=
versionString
.
arg
(
QGC_APPLICATION_VERSION_MAJOR
).
arg
(
QGC_APPLICATION_VERSION_MINOR
).
arg
(
QGC_APPLICATION_VERSION_BUILDNUMBER
).
arg
(
QGC_APPLICATION_VERSION_BUILDTYPE
);
versionString
.
append
(
" (Development)"
);
}
this
->
setApplicationVersion
(
versionString
);
this
->
setApplicationVersion
(
versionString
);
// Set settings format
// Set settings format
...
...
src/QGCConfig.h
View file @
633178ef
...
@@ -18,4 +18,21 @@
...
@@ -18,4 +18,21 @@
#define QGC_ORG_NAME "QGroundControl.org"
#define QGC_ORG_NAME "QGroundControl.org"
#define QGC_ORG_DOMAIN "org.qgroundcontrol"
#define QGC_ORG_DOMAIN "org.qgroundcontrol"
#define QGC_APPLICATION_VERSION_MAJOR 2
#define QGC_APPLICATION_VERSION_MINOR 7
// The following #definess can be overriden from the command line so that automated build systems can
// add additional build identification.
// Only comes from command line
//#define QGC_APPLICATION_VERSION_COMMIT "..."
#ifndef QGC_APPLICATION_VERSION_BUILDNUMBER
#define QGC_APPLICATION_VERSION_BUILDNUMBER 1
#endif
#ifndef QGC_APPLICATION_VERSION_BUILDTYPE
#define QGC_APPLICATION_VERSION_BUILDTYPE "(Stable)"
#endif
#endif // QGC_CONFIGURATION_H
#endif // QGC_CONFIGURATION_H
src/comm/MAVLinkProtocol.cc
View file @
633178ef
...
@@ -190,7 +190,7 @@ void MAVLinkProtocol::_linkStatusChanged(LinkInterface* link, bool connected)
...
@@ -190,7 +190,7 @@ void MAVLinkProtocol::_linkStatusChanged(LinkInterface* link, bool connected)
// Send command to start MAVLink
// Send command to start MAVLink
// XXX hacky but safe
// XXX hacky but safe
// Start NSH
// Start NSH
const
char
init
[]
=
{
0x0d
,
0x0d
,
0x0d
,
0x0d
};
const
char
init
[]
=
{
0x0d
,
0x0d
,
0x0d
};
link
->
writeBytes
(
init
,
sizeof
(
init
));
link
->
writeBytes
(
init
,
sizeof
(
init
));
const
char
*
cmd
=
"sh /etc/init.d/rc.usb
\n
"
;
const
char
*
cmd
=
"sh /etc/init.d/rc.usb
\n
"
;
link
->
writeBytes
(
cmd
,
strlen
(
cmd
));
link
->
writeBytes
(
cmd
,
strlen
(
cmd
));
...
...
src/git_version.h
deleted
100644 → 0
View file @
f10e77cb
extern
"C"
{
const
char
*
git_version
();
}
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