Commit: e2a1500414c2349321482370fb26171787affe3c - Fs-scripts (git)

Commit MetaInfo

• Revision: e2a1500414c2349321482370fb26171787affe3c (tree)
• Time: 2023-01-27 15:31:45
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

Merge branch 'master' of github.com:Fsu0413/Fs-scripts

Change Summary

• modified: Compile/lib/Configuration.lua
• modified: Compile/lib/qtCompile/conf.lua
• modified: qt6_deploy_host.sh
• modified: qt6_deploy_host.vbs

Incremental Difference

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -498,6 +498,16 @@ conf.Qt.generateConfTable = function(self, host, job)
 			for _, path in ipairs(opensslLibPath) do
 				ret.EXTRAINSTALL = ret.EXTRAINSTALL .. copyCmd .. repl.OPENSSLDIR .. confHost.pathSep .. path .. " " .. installRoot .. confHost.pathSep .. targetDir .. "\n"
 			end
+
+			-- for Qt 6.5+ links OpenSSL to QtBase
+			if (not confDetail.crossCompile) and (not staticBuild) then
+				if conf.hostToConfMap[host] == "win" then
+					table.insert(ret.path, repl.OPENSSLDIR .. confHost.pathSep .. "bin")
+				elseif string.sub(conf.hostToConfMap[host], 1, 3) == "mac" then
+					-- todo: is this needed?
+					-- ret.envSet.DYLD_LIBRARY_PATH = repl.OPENSSLDIR .. confHost.pathSep .. "lib"
+				end
+			end
 		end
 	end
 

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -2776,6 +2776,7 @@ conf.q6_2wx6m1st = {
 		-DBUILD_qtwebengine=OFF
 		-DBUILD_qtwebsockets=OFF
 		-DBUILD_qtwebview=OFF
+		-DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++"
 	]],
 }
 
@@ -2814,6 +2815,7 @@ conf.q6_2wx6m1sf = {
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
 		-DBUILD_qtopcua=OFF
+		-DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++"
 	]],
 }
 
@@ -2886,6 +2888,7 @@ conf.q6_2wx6m2sf = {
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
 		-DBUILD_qtopcua=OFF
+		-DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++"
 	]],
 }
 
@@ -3997,6 +4000,7 @@ conf.q6_4wx6g2st = {
 		-DBUILD_qtwebengine=OFF
 		-DBUILD_qtwebsockets=OFF
 		-DBUILD_qtwebview=OFF
+		-DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++"
 	]],
 }
 
@@ -4621,7 +4625,7 @@ conf.q6_5wx6v2 = {
 		-DFEATURE_system_sqlite=OFF
 		-DFEATURE_webengine_proprietary_codecs=ON
 		-DFEATURE_qtpdf_build=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 
@@ -4666,13 +4670,13 @@ conf.q6_5wx6v2st = {
 		-DBUILD_qtconnectivity=OFF
 		-DBUILD_qtdatavis3d=OFF
 		-DBUILD_qtdoc=OFF
+		-DBUILD_qtgrpc=OFF
 		-DBUILD_qthttpserver=OFF
 		-DBUILD_qtlanguageserver=OFF
 		-DBUILD_qtlocation=OFF
 		-DBUILD_qtlottie=OFF
 		-DBUILD_qtmqtt=OFF
 		-DBUILD_qtnetworkauth=OFF
-		-DBUILD_qtopcua=OFF
 		-DBUILD_qtpositioning=OFF
 		-DBUILD_qtquick3dphysics=OFF
 		-DBUILD_qtquicktimeline=OFF
@@ -4723,7 +4727,8 @@ conf.q6_5wx6v2sf = {
 		-DFEATURE_sql_sqlite=ON
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
+		-DBUILD_qtwebengine=OFF
 	]],
 }
 
@@ -4759,7 +4764,7 @@ conf.q6_5wx6v2_wa6v2 = {
 		-DFEATURE_sql_sqlite=ON
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 
@@ -4793,7 +4798,7 @@ conf.q6_5wx6g2 = {
 		-DFEATURE_sql_sqlite=ON
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 
@@ -4838,13 +4843,13 @@ conf.q6_5wx6g2st = {
 		-DBUILD_qtconnectivity=OFF
 		-DBUILD_qtdatavis3d=OFF
 		-DBUILD_qtdoc=OFF
+		-DBUILD_qtgrpc=OFF
 		-DBUILD_qthttpserver=OFF
 		-DBUILD_qtlanguageserver=OFF
 		-DBUILD_qtlocation=OFF
 		-DBUILD_qtlottie=OFF
 		-DBUILD_qtmqtt=OFF
 		-DBUILD_qtnetworkauth=OFF
-		-DBUILD_qtopcua=OFF
 		-DBUILD_qtpositioning=OFF
 		-DBUILD_qtquick3dphysics=OFF
 		-DBUILD_qtquicktimeline=OFF
@@ -4858,6 +4863,7 @@ conf.q6_5wx6g2st = {
 		-DBUILD_qtwebengine=OFF
 		-DBUILD_qtwebsockets=OFF
 		-DBUILD_qtwebview=OFF
+		-DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++"
 	]],
 }
 
@@ -4895,7 +4901,9 @@ conf.q6_5wx6g2sf = {
 		-DFEATURE_sql_sqlite=ON
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
+		-DBUILD_qtwebengine=OFF
+		-DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++"
 	]],
 }
 
@@ -4929,8 +4937,8 @@ conf.q6_5wx6u5 = {
 		-DFEATURE_sql_sqlite=ON
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
+		-DBUILD_qtgrpc=OFF
 		-DBUILD_qtwebengine=OFF
-		-DBUILD_qtopcua=OFF
 		-DCMAKE_C_COMPILER="x86_64-w64-mingw32-clang"
 		-DCMAKE_ASM_COMPILER="x86_64-w64-mingw32-clang"
 		-DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-clang++"
@@ -4967,8 +4975,8 @@ conf.q6_5wx6s5 = {
 		-DFEATURE_sql_sqlite=ON
 		-DFEATURE_sql_odbc=ON
 		-DFEATURE_system_sqlite=OFF
+		-DBUILD_qtgrpc=OFF
 		-DBUILD_qtwebengine=OFF
-		-DBUILD_qtopcua=OFF
 		-DCMAKE_C_COMPILER="x86_64-w64-mingw32-clang"
 		-DCMAKE_ASM_COMPILER="x86_64-w64-mingw32-clang"
 		-DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-clang++"
@@ -5010,13 +5018,13 @@ conf.q6_5lx6st = {
 		-DBUILD_qtconnectivity=OFF
 		-DBUILD_qtdatavis3d=OFF
 		-DBUILD_qtdoc=OFF
+		-DBUILD_qtgrpc=OFF
 		-DBUILD_qthttpserver=OFF
 		-DBUILD_qtlanguageserver=OFF
 		-DBUILD_qtlocation=OFF
 		-DBUILD_qtlottie=OFF
 		-DBUILD_qtmqtt=OFF
 		-DBUILD_qtnetworkauth=OFF
-		-DBUILD_qtopcua=OFF
 		-DBUILD_qtpositioning=OFF
 		-DBUILD_qtquick3dphysics=OFF
 		-DBUILD_qtquicktimeline=OFF
@@ -5068,7 +5076,7 @@ conf.q6_5mal = {
 		-DCMAKE_SKIP_BUILD_RPATH=OFF
 		-DCMAKE_SKIP_INSTALL_RPATH=OFF
 		-DFEATURE_framework=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 
@@ -5108,7 +5116,7 @@ conf.q6_5malnf = {
 		-DCMAKE_SKIP_BUILD_RPATH=OFF
 		-DCMAKE_SKIP_INSTALL_RPATH=OFF
 		-DFEATURE_framework=OFF
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 
@@ -5153,13 +5161,13 @@ conf.q6_5malst = {
 		-DBUILD_qtconnectivity=OFF
 		-DBUILD_qtdatavis3d=OFF
 		-DBUILD_qtdoc=OFF
+		-DBUILD_qtgrpc=OFF
 		-DBUILD_qthttpserver=OFF
 		-DBUILD_qtlanguageserver=OFF
 		-DBUILD_qtlocation=OFF
 		-DBUILD_qtlottie=OFF
 		-DBUILD_qtmqtt=OFF
 		-DBUILD_qtnetworkauth=OFF
-		-DBUILD_qtopcua=OFF
 		-DBUILD_qtpositioning=OFF
 		-DBUILD_qtquick3dphysics=OFF
 		-DBUILD_qtquicktimeline=OFF
@@ -5210,7 +5218,8 @@ conf.q6_5malsf = {
 		-DFEATURE_securetransport=ON
 		-DFEATURE_sql_sqlite=ON
 		-DFEATURE_system_sqlite=OFF
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
+		-DBUILD_qtwebengine=OFF
 	]],
 }
 
@@ -5243,7 +5252,7 @@ conf.q6_5wx6g2_aa6n5 = {
 		-DINPUT_openssl=linked
 		-DOPENSSL_ROOT_DIR=&OPENSSLDIR&
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 		-DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
 		-DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&\build\cmake\android.toolchain.cmake
 		-DANDROID_NATIVE_API_LEVEL=27
@@ -5282,7 +5291,7 @@ conf.q6_5wx6g2_ax6n5 = {
 		-DINPUT_openssl=linked
 		-DOPENSSL_ROOT_DIR=&OPENSSLDIR&
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 		-DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
 		-DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&\build\cmake\android.toolchain.cmake
 		-DANDROID_NATIVE_API_LEVEL=27
@@ -5320,7 +5329,7 @@ conf.q6_5lx6_aa6n5 = {
 		-DINPUT_openssl=linked
 		-DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 		-DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
 		-DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
 		-DANDROID_NATIVE_API_LEVEL=27
@@ -5357,7 +5366,7 @@ conf.q6_5lx6_ax6n5 = {
 		-DINPUT_openssl=linked
 		-DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 		-DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
 		-DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
 		-DANDROID_NATIVE_API_LEVEL=27
@@ -5394,7 +5403,7 @@ conf.q6_5mal_aa6n5 = {
 		-DINPUT_openssl=linked
 		-DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 		-DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
 		-DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
 		-DANDROID_NATIVE_API_LEVEL=27
@@ -5431,7 +5440,7 @@ conf.q6_5mal_ax6n5 = {
 		-DINPUT_openssl=linked
 		-DOPENSSL_ROOT_DIR=&OPENSSLDIR&/
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 		-DANDROID_SDK_ROOT=&ANDROIDSDKROOT&
 		-DCMAKE_TOOLCHAIN_FILE=&ANDROIDNDKROOT&/build/cmake/android.toolchain.cmake
 		-DANDROID_NATIVE_API_LEVEL=27
@@ -5468,7 +5477,7 @@ conf.q6_5wx6g2_W = {
 		-DFEATURE_opengles2=ON
 		-DFEATURE_ssl=OFF
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 
@@ -5498,7 +5507,7 @@ conf.q6_5lx6_W = {
 		-DFEATURE_opengles2=ON
 		-DFEATURE_ssl=OFF
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 
@@ -5528,7 +5537,7 @@ conf.q6_5mal_W = {
 		-DFEATURE_opengles2=ON
 		-DFEATURE_ssl=OFF
 		-DFEATURE_sql_sqlite=ON
-		-DBUILD_qtopcua=OFF
+		-DBUILD_qtgrpc=OFF
 	]],
 }
 

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -34,7 +34,7 @@ cp -R "${PATH_TO_HOST}/bin" "${PATH_TO_TARGET}/host/"
 [ -d "${PATH_TO_HOST}/libexec" ] && cp -R "${PATH_TO_HOST}/libexec" "${PATH_TO_TARGET}/host/"
 mkdir "${PATH_TO_TARGET}/host/lib"
 cp -R "${PATH_TO_HOST}/lib/cmake" "${PATH_TO_TARGET}/host/lib/"
-cp -R "${PATH_TO_HOST}/lib/metatypes" "${PATH_TO_TARGET}/host/lib/"
+[ -d "${PATH_TO_HOST}/lib/metatypes" ] && cp -R "${PATH_TO_HOST}/lib/metatypes" "${PATH_TO_TARGET}/host/lib/"
 find "${PATH_TO_HOST}/lib/" -name '*.prl' -maxdepth 1 -exec cp '{}' "${PATH_TO_TARGET}/host/lib" ';'
 
 # qmake tweak

--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -29,7 +29,7 @@ fso.CopyFolder PATH_TO_HOST & "\bin", PATH_TO_TARGET & "\host\bin"
 If fso.FolderExists(PATH_TO_HOST & "\libexec") Then fso.CopyFolder PATH_TO_HOST & "\libexec", PATH_TO_TARGET & "\host\libexec"
 fso.CreateFolder PATH_TO_TARGET & "\host\lib"
 fso.CopyFolder PATH_TO_HOST & "\lib\cmake", PATH_TO_TARGET & "\host\lib\cmake"
-fso.CopyFolder PATH_TO_HOST & "\lib\metatypes", PATH_TO_TARGET & "\host\lib\metatypes"
+If fso.FolderExists(PATH_TO_HOST & "\lib\metatypes") Then fso.CopyFolder PATH_TO_HOST & "\lib\metatypes", PATH_TO_TARGET & "\host\lib\metatypes"
 
 Dim hostlibdir, hostlibfile
 Set hostlibdir = fso.GetFolder(PATH_TO_HOST & "\lib")