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
55c63d1f
Commit
55c63d1f
authored
Aug 14, 2019
by
Peter Barker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vagrant: write out scripts to do the building
This allows for easier iterative development on the virtual machine.
parent
2f3a46e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
4 deletions
+31
-4
Vagrantfile
Vagrantfile
+31
-4
No files found.
Vagrantfile
View file @
55c63d1f
...
...
@@ -67,11 +67,38 @@ Vagrant.configure(2) do |config|
su - vagrant -c 'rm -rf %{shadow_build_dir}'
su - vagrant -c 'mkdir -p %{shadow_build_dir}'
su - vagrant -c "cd %{shadow_build_dir}; LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir} PATH=%{qt_deps_bin_unpack_dir}:
\$
PATH qmake -r %{pro} CONFIG+=
\$
{CONFIG} CONFIG+=WarningsAsErrorsOn -spec %{spec}"
su - vagrant -c "cd %{shadow_build_dir}; LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir} PATH=%{qt_deps_bin_unpack_dir}:
\$
PATH make -j${JOBS}"
#su - vagrant -c 'mkdir -p %{shadow_build_dir}/release/package'
#su - vagrant -c 'cd %{project_root_dir}; ./deploy/create_linux_appimage.sh %{project_root_dir} %{shadow_build_dir}/release %{shadow_build_dir}/release/package'
# write out a pair of scripts to make rebuilding on the VM easy:
su - vagrant -c "cat <<QMAKE >do-qmake.sh
#!/bin/bash
set -e
set -x
cd %{shadow_build_dir}
export LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir}
export PATH=%{qt_deps_bin_unpack_dir}:
\$
PATH
qmake -r %{pro} CONFIG+=
\$
{CONFIG} CONFIG+=WarningsAsErrorsOn -spec %{spec}
QMAKE
"
su - vagrant -c "cat <<MAKE >do-make.sh
#!/bin/bash
set -e
set -x
cd %{shadow_build_dir}
export LD_LIBRARY_PATH=%{qt_deps_lib_unpack_dir}
export PATH=%{qt_deps_bin_unpack_dir}:
\$
PATH
make -j${JOBS}
MAKE
"
su - vagrant -c "chmod +x do-qmake.sh do-make.sh"
# now run the scripts:
su - vagrant -c ./do-qmake.sh
su - vagrant -c ./do-make.sh
SHELL
...
...
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