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
87fc7f57
Commit
87fc7f57
authored
Jul 09, 2016
by
Don Gagne
Committed by
GitHub
Jul 09, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3765 from dagar/build_misc
more qgroundcontrol -> QGroundControl renaming
parents
710fffe1
e2cf05e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.appveyor.yml
.appveyor.yml
+2
-2
QGCInstaller.pri
QGCInstaller.pri
+1
-1
No files found.
.appveyor.yml
View file @
87fc7f57
...
...
@@ -45,7 +45,7 @@ install:
build_script
:
-
mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
-
cd %SHADOW_BUILD_DIR% && jom
-
if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\
qgroundcontrol-installer.exe %APPVEYOR_BUILD_FOLDER%\qgroundc
ontrol-installer.exe )
-
if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\
QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundC
ontrol-installer.exe )
# Generate the source server information to embed in the PDB
-
'
"C:\Program
Files
(x86)\Windows
Kits\8.1\Debuggers\x64\srcsrv\srctool.exe"
-r
-u
"%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb"
|
grep
qgroundcontrol
|
grep
-v
moc_
|
grep
-v
libs\\mavlink
|
grep
-v
build_windows_install
|
python
%APPVEYOR_BUILD_FOLDER%\deploy\genPDBsrcsrv.py
>
%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv'
# write the source server info
...
...
@@ -59,7 +59,7 @@ test_script:
-
if "%CONFIG%" EQU "debug" ( %SHADOW_BUILD_DIR%\debug\qgroundcontrol --unittest )
artifacts
:
-
path
:
qgroundc
ontrol-installer.exe
-
path
:
QGroundC
ontrol-installer.exe
name
:
qgcinstaller
-
path
:
symbols\**\*.*_
...
...
QGCInstaller.pri
View file @
87fc7f57
...
...
@@ -36,7 +36,7 @@ installer {
# easier to debug user crashes.
#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY $${DESTDIR_WIN}\\qgroundcontrol.pdb
#QMAKE_POST_LINK += $$escape_expand(\\n) del $${DESTDIR_WIN}\\qgroundcontrol.pdb
QMAKE_POST_LINK += $$escape_expand(\\n) cd $$BASEDIR_WIN && $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\
qgroundc
ontrol-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
QMAKE_POST_LINK += $$escape_expand(\\n) cd $$BASEDIR_WIN && $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\
QGroundC
ontrol-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
#QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
OTHER_FILES += deploy/qgroundcontrol_installer.nsi
...
...
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