diff --git a/scripts/coding_style.sh b/scripts/coding_style.sh index 8c1cbd8f2..7ad48201a 100755 --- a/scripts/coding_style.sh +++ b/scripts/coding_style.sh @@ -31,11 +31,6 @@ format_sources echo "running astyle for *.h ..." format_headers - -echo "running astyle for plugins ..." -cd ../plugins -format_sources -format_headers read -p "Press [ENTER] to close terminal" exit diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh index 05bb06218..02022ee2a 100755 --- a/scripts/cppcheck.sh +++ b/scripts/cppcheck.sh @@ -16,8 +16,5 @@ echo "cppcheck..." cd ../src check_code -cd ../plugins -check_code - read -p "Press [ENTER] to close terminal" exit diff --git a/scripts/plugin_translations.sh b/scripts/plugin_translations.sh index 9200af0d9..b8c0f0631 100755 --- a/scripts/plugin_translations.sh +++ b/scripts/plugin_translations.sh @@ -1,6 +1,6 @@ #!/bin/bash -lupdate ../plugins/TestPlugin/TestPlugin.pro -no-obsolete +lupdate ../src/plugins/TestPlugin/TestPlugin.pro -no-obsolete read -p "Press [ENTER] to close terminal" exit diff --git a/scripts/translations_update.sh b/scripts/translations_update.sh index 5a73a7ea4..a39df9da8 100755 --- a/scripts/translations_update.sh +++ b/scripts/translations_update.sh @@ -7,8 +7,8 @@ fi ## circular inclusions workaround - we comment that buggy line sed -i 's/include(3rdparty/##temp/g' ../src/src.pro -lupdate $ARGUMENTS ../src/src.pro -lupdate $ARGUMENTS ../src/src.pro -ts ../translations/empty.ts +lupdate $ARGUMENTS ../src/main/main.pro +lupdate $ARGUMENTS ../src/main/main.pro -ts ../translations/empty.ts ## uncomment it now sed -i 's/##temp/include(3rdparty/g' ../src/src.pro diff --git a/src/defines.pri b/src/defines.pri index 458cfd0a1..aab603d39 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -53,7 +53,7 @@ equals(d_portable, "true") { DEFINES += PORTABLE_BUILD } DEFINES += USE_DATADIR=\\\"""$$data_folder/"\\\"" #Git revision - rev = $$system(sh $$PWD/../scripts/getrevision.sh) + rev = $$system(cd ../ && sh $$PWD/../scripts/getrevision.sh) !equals(rev, ""): DEFINES += GIT_REVISION=\\\"""$$rev"\\\"" }