From dc51e9bf28997eb9cf9fb32f23e502593cda6369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 26 Nov 2019 14:53:24 -0300 Subject: [PATCH 1/4] tools: Create build folder under tmp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- tools/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/compile.sh b/tools/compile.sh index ce0874d87..4fdcf0d22 100755 --- a/tools/compile.sh +++ b/tools/compile.sh @@ -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="" From 0c5ebb92401333e5d84fd251baaab6cdbf35f0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Wed, 27 Nov 2019 09:52:32 -0300 Subject: [PATCH 2/4] runtests: Use new build folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- tools/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/runtests.sh b/tools/runtests.sh index 07747c063..af6bee53e 100755 --- a/tools/runtests.sh +++ b/tools/runtests.sh @@ -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) From d48e9b5719e327aa65d8e40b600cbb713266bfe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Wed, 27 Nov 2019 12:16:48 -0300 Subject: [PATCH 3/4] qml: Remove qmldir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- qml/qmldir | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 qml/qmldir diff --git a/qml/qmldir b/qml/qmldir deleted file mode 100644 index e69de29bb..000000000 From 121db2d52748da3f4ba9b74755a37fec216dde56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Wed, 27 Nov 2019 12:16:59 -0300 Subject: [PATCH 4/4] resources: Remove lost qmldir file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- resources.qrc | 1 - 1 file changed, 1 deletion(-) diff --git a/resources.qrc b/resources.qrc index 91ae1a872..0d8069a60 100644 --- a/resources.qrc +++ b/resources.qrc @@ -1,6 +1,5 @@ - qml/qmldir qml/Chart.qml qml/ConnectionMenu.qml qml/DepthAxis.qml