trikset · MinyazevR · Jul 11, 2024 · Jul 12, 2024 · Jul 12, 2024 · Jul 12, 2024
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -144,12 +144,12 @@ stages:
     strategy:
       matrix:
         macOSRelease:
-          imageName: 'macOS-11'
-          QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
+          imageName: 'macOS-12'
+          QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
           EXECUTOR: "time"
         macOSDebug:
-          imageName: 'macOS-11'
-          QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=silent CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
+          imageName: 'macOS-12'
+          QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
           CONFIG: debug
           TESTS: $ALL_TESTS
           EXECUTOR: "time"
@@ -199,11 +199,11 @@ stages:
     strategy:
       matrix:
         MacOS release + tests:
-          imageName: 'macOS-11'
+          imageName: 'macOS-12'
           QMAKE_EXTRA: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
           EXECUTOR: "time"
         macOS debug + tests:
-          imageName: 'macOS-11'
+          imageName: 'macOS-12'
           QMAKE_EXTRA: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=silent CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
           CONFIG: debug
           TESTS: $ALL_TESTS
@@ -249,7 +249,7 @@ stages:
       QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
       EXECUTOR: "time"
     pool:
-      vmImage: 'macOS-11'
+      vmImage: 'macOS-12'
 
     steps:
     - ${{ parameters.checkoutStep }}

diff --git a/buildScripts/azure/build_internal.sh b/buildScripts/azure/build_internal.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 #This is a magic fix for macOS, but old Linux /usr/bin/env has no -S option, thus we cannot use shabang line
 #An obsolete bash (v3) does not support `exec {varname}<>`, thus we want to use zsh
 if ! ( eval 'exec {somevar}<>$(mktemp)' ) ; then
@@ -25,7 +27,7 @@ ccache -sz
 export PKG_CONFIG_PATH=$(python3.${TRIK_PYTHON3_VERSION_MINOR}-config --prefix)/lib/pkgconfig
 rm -f .qmake.cache
 { echo -n 'Remove broken object files ' ; find . -name '*.o' -type f -print0 | xargs -0 file --mime-type | grep -v 'application/x-object' | cut -f 1 -d ':' | xargs -t rm -f _RM_REQUIRES_ARGUMENTS_BUT_BSD_XARGS_IS_MISSING_R_PARAMETER_ARGUMENT || : ; echo Done ; }
-qmake -Wall PYTHON3_VERSION_MINOR=$TRIK_PYTHON3_VERSION_MINOR CONFIG+=$CONFIG $QMAKE_EXTRA $PROJECT.pro
+qmake -d -Wall PYTHON3_VERSION_MINOR=$TRIK_PYTHON3_VERSION_MINOR CONFIG+=$CONFIG $QMAKE_EXTRA $PROJECT.pro
 make -j2 qmake_all 2>&1 | tee -a build.log
 ccache -s
 make -j2 all 2>&1 | tee -a build.log

diff --git a/buildScripts/azure/install_Darwin.sh b/buildScripts/azure/install_Darwin.sh
@@ -15,6 +15,7 @@
     "$TRIK_PYTHON" -m aqt install-qt -m qtscript -O "$HOME/Qt" mac desktop "${TRIK_QT_VERSION}"
     [ -d $HOME/qtifw ] || env TRIK_QT_INSTALL_DIR="$HOME/qtifw" "$(dirname $(realpath ${BASH_SOURCE[0]}))"/install_qtifw_mac.sh
     # Force SDK version compatible with Qt 5.12
-    sudo xcode-select -s /Applications/Xcode_11.7.app/Contents/Developer
+    system_profiler -json SPDeveloperToolsDataType | jq '.SPDeveloperToolsDataType[].spdevtools_path' || :
+    sudo xcode-select -s /Applications/Xcode_13.1.app/Contents/Developer
     xcodebuild -showsdks
     xcrun -sdk macosx --show-sdk-path
diff --git a/global.pri b/global.pri
@@ -216,18 +216,35 @@ gcc:versionAtLeast(QT_VERSION, 5.15.0):QMAKE_CXXFLAGS *= -Wno-deprecated-declara
 
 clang {
 	#treat git submodules as system path
-	SYSTEM_INCLUDE_PREFIX_OPTION += $$system(git submodule status 2>/dev/null | sed $$shell_quote('s/^.[0-9a-fA-F]* \\([^ ]*\\).*$/--system-header-prefix=\\1/g'))
+	SYSTEM_INCLUDE_PREFIX_OPTION += $$system(git submodule status 2>/dev/null | sed $$shell_quote('s/^.[0-9a-fA-F]* \\([^ ]*\\).*$/-isystem=\\1/g'))
 
 	#treat Qt includes as system headers
 	SYSTEM_INCLUDE_PREFIX_OPTION *= --system-header-prefix=$$[QT_INSTALL_HEADERS]
-	QMAKE_CXXFLAG += -Wno-nullability-completeness -Wno-error=nullability-extension
+	# QMAKE_CXXFLAG += -Wno-nullability-completeness -Wno-error=nullability-extension
+
+	for(module, QT) {
+	    equals(module, "testlib"): module = test
+	    moduleList = $$split(module, )
+	    SYSTEM_INCLUDE_PREFIX_OPTION += --system-header-prefix=Qt$$upper($$take_first(moduleList))$$join(moduleList, )
+	}
+	unset(moduleList)
+
+	for(module, QT) {
+	    equals(module, "testlib"): module = test
+	    moduleList = $$split(module, )
+	    SYSTEM_INCLUDE_PREFIX_OPTION += \
+		-isystem$$shell_quote($$[QT_INSTALL_LIBS]/Qt$$upper(\
+			      $$take_first(moduleList))$$join(moduleList, )).framework/Headers/
+	}
+	unset(moduleList)
 }
 
 #gcc {
 	#treat Qt includes as system headers
 	SYSTEM_INCLUDE_PREFIX_OPTION *= -isystem $$[QT_INSTALL_HEADERS]
 #}
 
+# QMAKE_CXXFLAGS += -pedantic-errors -Wextra -Werror
 QMAKE_CXXFLAGS *= $$SYSTEM_INCLUDE_PREFIX_OPTION
 
 false:clang {

diff --git a/plugins/robots/checker/patcher/patcher.pro b/plugins/robots/checker/patcher/patcher.pro
@@ -14,6 +14,9 @@
 
 TARGET = patcher
 
+QT -= gui
+QT += xml
+
 include(../../../../global.pri)
 
 links(qrrepo qrutils)
@@ -22,9 +25,6 @@ includes(qrrepo)
 
 TEMPLATE = app
 
-QT -= gui
-QT += xml
-
 CONFIG += cmdline
 
 SOURCES += \

diff --git a/plugins/robots/checker/twoDModelRunner/twoDModelRunner.pro b/plugins/robots/checker/twoDModelRunner/twoDModelRunner.pro
@@ -15,10 +15,11 @@
 TARGET = 2D-model
 TEMPLATE = app
 CONFIG += cmdline
-include(../../../../global.pri)
 
 QT += widgets
 
+include(../../../../global.pri)
+
 includes(plugins/robots/interpreters/interpreterCore \
 		plugins/robots/common/kitBase \
 		plugins/robots/common/twoDModel \

diff --git a/plugins/robots/common/ev3Kit/ev3Kit.pri b/plugins/robots/common/ev3Kit/ev3Kit.pri
@@ -14,6 +14,8 @@
 
 QT += widgets
 
+include(../../../../global.pri)
+
 links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \
 		robots-utils robots-kit-base robots-2d-model qextserialport \
 		)

diff --git a/plugins/robots/common/kitBase/kitBase.pri b/plugins/robots/common/kitBase/kitBase.pri
@@ -14,6 +14,8 @@
 
 QT += widgets xml
 
+include(../../../../global.pri)
+
 links(qrkernel qrutils qrtext qrgui-preferences-dialog robots-utils)
 includes(qrtext plugins/robots/utils)
 

diff --git a/plugins/robots/common/kitBase/kitBase.pro b/plugins/robots/common/kitBase/kitBase.pro
@@ -15,6 +15,4 @@
 TARGET = robots-kit-base
 TEMPLATE = lib
 
-include(../../../../global.pri)
-
 include(kitBase.pri)
diff --git a/plugins/robots/common/nxtKit/nxtKit.pri b/plugins/robots/common/nxtKit/nxtKit.pri
@@ -14,6 +14,8 @@
 
 QT += widgets
 
+include(../../../../global.pri)
+
 includes(plugins/robots/common/nxtKit \
 		plugins/robots/common/kitBase \
 		plugins/robots/common/twoDModel \

diff --git a/plugins/robots/common/pioneerKit/pioneerKit.pri b/plugins/robots/common/pioneerKit/pioneerKit.pri
@@ -14,6 +14,8 @@
 
 QT += widgets
 
+include(../../../../global.pri)
+
 includes(plugins/robots/common/pioneerKit \
 		plugins/robots/common/kitBase \
 		plugins/robots/utils \

diff --git a/plugins/robots/common/pioneerKit/pioneerKit.pro b/plugins/robots/common/pioneerKit/pioneerKit.pro
@@ -16,6 +16,4 @@ TARGET = robots-pioneer-kit
 
 TEMPLATE = lib
 
-include(../../../../global.pri)
-
 include(pioneerKit.pri)
diff --git a/plugins/robots/common/trikKit/trikKit.pri b/plugins/robots/common/trikKit/trikKit.pri
@@ -14,6 +14,8 @@
 
 QT += widgets
 
+include(../../../../global.pri)
+
 includes(plugins/robots/common/trikKit \
 		plugins/robots/common/kitBase \
 		plugins/robots/utils \

diff --git a/plugins/robots/common/twoDModel/twoDModel.pri b/plugins/robots/common/twoDModel/twoDModel.pri
@@ -14,6 +14,8 @@
 
 QT += widgets xml svg
 
+include(../../../../global.pri)
+
 DEFINES += TWO_D_MODEL_LIBRARY
 
 links(qrkernel qrutils qrgui-tool-plugin-interface qrgui-controller robots-utils robots-kit-base Box2D)

diff --git a/plugins/robots/generators/ev3/ev3GeneratorBase/ev3GeneratorBase.pro b/plugins/robots/generators/ev3/ev3GeneratorBase/ev3GeneratorBase.pro
@@ -16,10 +16,10 @@ TARGET = robots-ev3-generator-base
 
 TEMPLATE = lib
 
-include(../../../../../global.pri)
-
 QT += widgets
 
+include(../../../../../global.pri)
+
 CONFIG += trikqscintilla2
 
 includes(plugins/robots/generators/ev3/ev3GeneratorBase \

diff --git a/plugins/robots/generators/ev3/ev3RbfGenerator/ev3RbfGenerator.pro b/plugins/robots/generators/ev3/ev3RbfGenerator/ev3RbfGenerator.pro
@@ -16,10 +16,10 @@ TARGET = robots-ev3-rbf-generator
 
 TEMPLATE = lib
 
-include(../../../../../global.pri)
-
 QT += widgets
 
+include(../../../../../global.pri)
+
 CONFIG += plugin trikqscintilla2
 
 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/

diff --git a/plugins/robots/generators/nxt/nxtGeneratorBase/nxtGeneratorBase.pro b/plugins/robots/generators/nxt/nxtGeneratorBase/nxtGeneratorBase.pro
@@ -16,10 +16,10 @@ TARGET = robots-nxt-generator-base
 
 TEMPLATE = lib
 
-include(../../../../../global.pri)
-
 QT += widgets
 
+include(../../../../../global.pri)
+
 CONFIG += trikqscintilla2
 
 includes(plugins/robots/generators/nxt/nxtGeneratorBase \

diff --git a/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCGenerator.pro b/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCGenerator.pro
@@ -17,10 +17,10 @@ TARGET = robots-nxt-osek-c-generator
 TEMPLATE = lib
 CONFIG += plugin trikqscintilla2
 
-include(../../../../../global.pri)
-
 QT += widgets
 
+include(../../../../../global.pri)
+
 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/
 
 includes(plugins/robots/generators/nxt/nxtGeneratorBase \

diff --git a/plugins/robots/generators/nxt/nxtRussianCGenerator/nxtRussianCGenerator.pro b/plugins/robots/generators/nxt/nxtRussianCGenerator/nxtRussianCGenerator.pro
@@ -17,10 +17,10 @@ TARGET = robots-nxt-russian-c-generator
 TEMPLATE = lib
 CONFIG += plugin trikqscintilla2
 
-include(../../../../../global.pri)
-
 QT += widgets
 
+include(../../../../../global.pri)
+
 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/
 
 includes(plugins/robots/generators/nxt/nxtGeneratorBase \

diff --git a/plugins/robots/generators/pioneer/pioneerLuaGenerator/pioneerLuaGenerator.pro b/plugins/robots/generators/pioneer/pioneerLuaGenerator/pioneerLuaGenerator.pro
@@ -17,10 +17,10 @@ TARGET = robots-pioneer-lua-generator
 TEMPLATE = lib
 CONFIG += plugin trikqscintilla2
 
-include(../../../../../global.pri)
-
 QT += widgets network
 
+include(../../../../../global.pri)
+
 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/
 
 includes( \

diff --git a/plugins/robots/generators/trik/trikFSharpGeneratorLibrary/trikFSharpGeneratorLibrary.pro b/plugins/robots/generators/trik/trikFSharpGeneratorLibrary/trikFSharpGeneratorLibrary.pro
@@ -18,10 +18,10 @@ TEMPLATE = lib
 
 CONFIG += trikqscintilla2
 
-include(../../../../../global.pri)
-
 QT += widgets network
 
+include(../../../../../global.pri)
+
 DEFINES += ROBOTS_TRIK_FSHARP_GENERATOR_LIBRARY
 
 includes( \

diff --git a/plugins/robots/generators/trik/trikGeneratorBase/trikGeneratorBase.pro b/plugins/robots/generators/trik/trikGeneratorBase/trikGeneratorBase.pro
@@ -16,10 +16,10 @@ TARGET = robots-trik-generator-base
 
 TEMPLATE = lib
 
-include(../../../../../global.pri)
-
 QT += widgets
 
+include(../../../../../global.pri)
+
 CONFIG += trikqscintilla2
 
 includes(plugins/robots/generators/generatorBase \

diff --git a/...ns/robots/generators/trik/trikPascalABCGeneratorLibrary/trikPascalABCGeneratorLibrary.pro b/...ns/robots/generators/trik/trikPascalABCGeneratorLibrary/trikPascalABCGeneratorLibrary.pro
@@ -16,10 +16,10 @@ TARGET = robots-trik-pascal-abc-generator-library
 
 TEMPLATE = lib
 
-include(../../../../../global.pri)
-
 QT += widgets network
 
+include(../../../../../global.pri)
+
 CONFIG += trikqscintilla2
 
 includes(plugins/robots/generators/trik/trikGeneratorBase \

diff --git a/plugins/robots/generators/trik/trikPythonGeneratorLibrary/trikPythonGeneratorLibrary.pro b/plugins/robots/generators/trik/trikPythonGeneratorLibrary/trikPythonGeneratorLibrary.pro
@@ -16,12 +16,12 @@ TARGET = robots-trik-python-generator-library
 
 TEMPLATE = lib
 
+QT += widgets network
+
 include(../../../../../global.pri)
 
 CONFIG += trikqscintilla2
 
-QT += widgets network
-
 includes(plugins/robots/generators/trik/trikGeneratorBase \
 		plugins/robots/generators/generatorBase \
 		plugins/robots/common/kitBase \

diff --git a/plugins/robots/generators/trik/trikQtsGeneratorLibrary/trikQtsGeneratorLibrary.pro b/plugins/robots/generators/trik/trikQtsGeneratorLibrary/trikQtsGeneratorLibrary.pro
@@ -16,10 +16,10 @@ TARGET = robots-trik-qts-generator-library
 
 TEMPLATE = lib
 
-include(../../../../../global.pri)
-
 QT += widgets network
 
+include(../../../../../global.pri)
+
 CONFIG += trikqscintilla2
 
 includes(plugins/robots/generators/trik/trikGeneratorBase \

diff --git a/plugins/robots/generators/trik/trikV62FSharpGenerator/trikV62FSharpGenerator.pro b/plugins/robots/generators/trik/trikV62FSharpGenerator/trikV62FSharpGenerator.pro
@@ -18,10 +18,10 @@ TEMPLATE = lib
 
 CONFIG += plugin trikqscintilla2
 
-include(../../../../../global.pri)
-
 QT += widgets network
 
+include(../../../../../global.pri)
+
 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/
 
 includes(\

diff --git a/plugins/robots/generators/trik/trikV62PascalABCGenerator/trikV62PascalABCGenerator.pro b/plugins/robots/generators/trik/trikV62PascalABCGenerator/trikV62PascalABCGenerator.pro
@@ -18,10 +18,10 @@ TEMPLATE = lib
 
 CONFIG += plugin trikqscintilla2
 
-include(../../../../../global.pri)
-
 QT += widgets network
 
+include(../../../../../global.pri)
+
 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/
 
 includes( \

diff --git a/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pri b/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pri
@@ -14,6 +14,8 @@
 
 QT += widgets network
 
+include(../../../../../global.pri)
+
 CONFIG += trikqscintilla2
 
 includes( \

diff --git a/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pro b/plugins/robots/generators/trik/trikV62PythonGenerator/trikV62PythonGenerator.pro
@@ -17,8 +17,6 @@ TARGET = robots-trik-v62-python-generator
 TEMPLATE = lib
 CONFIG += plugin
 
-include(../../../../../global.pri)
-
 DESTDIR = $$DESTDIR/plugins/tools/kitPlugins/
 
 include(trikV62PythonGenerator.pri)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,4 @@ TARGET = robots-pioneer-kit

		TEMPLATE = lib

		include(../../../../global.pri)

		include(pioneerKit.pri)