Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: Create build folder under tmp #837

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

tools: Create build folder under tmp #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc51e9b
tools: Create build folder under tmp
patrickelectric Nov 26, 2019
0c5ebb9
runtests: Use new build folder
patrickelectric Nov 27, 2019
d48e9b5
qml: Remove qmldir
patrickelectric Nov 27, 2019
121db2d
resources: Remove lost qmldir file
patrickelectric Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed qml/qmldir
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
<file alias="qmldir">qml/qmldir</file>
<file alias="Chart.qml">qml/Chart.qml</file>
<file alias="ConnectionMenu.qml">qml/ConnectionMenu.qml</file>
<file alias="DepthAxis.qml">qml/DepthAxis.qml</file>
Expand Down
2 changes: 1 addition & 1 deletion tools/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bold=$(tput bold)
normal=$(tput sgr0)
scriptpath="$( cd "$(dirname "$0")" ; pwd -P )"
projectpath=${scriptpath}/..
buildfolder=${projectpath}/build
buildfolder=/tmp/build
deployfolder=${buildfolder}/deploy
scriptname=$(basename "$0")
qtdefines=""
Expand Down
2 changes: 1 addition & 1 deletion tools/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ xvfb-run --server-args="-screen 0 1024x768x24" $build_test/pingviewer || exit 1
echob "Do runtime test:"
${scriptpath}/compile.sh --autokill --no-deploy --debug || exit 1
export DISPLAY=:99.0
build_folder="$projectpath/build"
build_folder="/tmp/build"
xvfb-run --server-args="-screen 0 1024x768x24" ${build_folder}/pingviewer || exit 1
echob "Checking for warning messages.."
last_log=$(ls -dt ~/Documents/PingViewer/Gui_Log/* | head -n1)
Expand Down