Commit: fd4911796032b566fec99605d7bbdb43cdf1d8fc - Fs-scripts (git)

Commit MetaInfo

• Revision: fd4911796032b566fec99605d7bbdb43cdf1d8fc (tree)
• Time: 2022-11-19 23:15:12
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

我草

Change Summary

• modified: qt6_deploy_host.sh
• modified: qt6_deploy_host.vbs

Incremental Difference

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -61,11 +61,24 @@ chmod +x "${PATH_TO_TARGET}/bin/qmake"
 
 chmod +x "${PATH_TO_TARGET}/bin/qtpaths"
 
-sed -i -e 's,^HostPrefix=.*$,HostPrefix=../host,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
-sed -i -e 's,^HostData=.*$,HostData=..,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
+sed -i '' -e 's,^HostPrefix=.*$,HostPrefix=../host,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
+sed -i '' -e 's,^HostData=.*$,HostData=..,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
 
-# CMake tweak
+# CMake tweak / Qt 6.4.1 +
 
-sed -i -e 's,^set(__qt_platform_initial_qt_host_path[[:space:]].*$,set(__qt_platform_initial_qt_host_path "${Qt6_DIR}/../../../host"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
-sed -i -e 's,^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]].*$,set(__qt_platform_initial_qt_host_path "${Qt6_DIR}/../../../host/lib/cmake"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
+sed -i '' -e 's,^set(__qt_platform_initial_qt_host_path[[:space:]].*$,set(__qt_platform_initial_qt_host_path "${Qt6_DIR}/../../../host"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
+sed -i '' -e 's,^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]].*$,set(__qt_platform_initial_qt_host_path_cmake_dir "${Qt6_DIR}/../../../host/lib/cmake"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
 
+# CMake tweak / Qt 6.2.4
+
+sed -i '' -e '/^set(__qt_toolchain_initial_qt_host_path[[:space:]]*$/{N
+c\
+set(__qt_platform_initial_qt_host_path "${CMAKE_CURRENT_LIST_DIR}/../../../host")
+d
+}' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
+
+sed -i '' -e '/^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]]*$/{N
+c\
+set(__qt_platform_initial_qt_host_path_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake")
+d
+}' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"

--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -75,7 +75,7 @@ target_qtconfold.Close
 fso.DeleteFile PATH_TO_TARGET & "\bin\target_qt.conf"
 fso.MoveFile PATH_TO_TARGET & "\bin\target_qt.conf.new", PATH_TO_TARGET & "\bin\target_qt.conf"
 
-' CMake tweak
+' CMake tweak / Qt 6.4.1 +
 
 Dim Qt6Dependencies_cmake
 Dim Qt6Dependencies_cmakeold
@@ -95,6 +95,32 @@ Qt6Dependencies_cmakeold.Close
 fso.DeleteFile PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake"
 fso.MoveFile PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake.new", PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake"
 
+' CMake tweak / Qt 6.2.4
+
+Dim qt_toolchain_cmake
+Dim qt_toolchain_cmakeold
+Set qt_toolchain_cmake = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake.new", 2, True)
+Set qt_toolchain_cmakeold = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake", 1, False)
+
+Do until qt_toolchain_cmakeold.AtEndOfStream 
+	line = qt_toolchain_cmakeold.ReadLine
+	If Left(Trim(line), 38) = "set(__qt_platform_initial_qt_host_path" Then
+		line = "set(__qt_platform_initial_qt_host_path ""${CMAKE_CURRENT_LIST_DIR}/../../../host"")"
+		qt_toolchain_cmakeold.ReadLine ' Qt 6.2.4 intentionally put the path to next line. It should be skipped.
+	End If
+	If Left(Trim(line), 48) = "set(__qt_platform_initial_qt_host_path_cmake_dir" Then
+		line = "set(__qt_platform_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
+		qt_toolchain_cmakeold.ReadLine
+	End If
+	qt_toolchain_cmake.WriteLine line
+Loop
+
+qt_toolchain_cmake.Close
+qt_toolchain_cmakeold.Close
+
+fso.DeleteFile PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake"
+fso.MoveFile PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake.new", PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake"
+
 ' lib/cmake/Qt6/QtBuildInternalsExtra.cmake
 ' Does this need to be modified? This is the install directory!
 ' Our Qt builds are relocatable so it seems like there is no way that the file needs to be modified