Commit: 1246c8ed45f285342d42d0546635f4cf5ebc7129 - Fs-scripts (git)

Commit MetaInfo

• Revision: 1246c8ed45f285342d42d0546635f4cf5ebc7129 (tree)
• Zeit: 2024-04-03 21:28:28
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

这文件啥时候出来的？

Ändern Zusammenfassung

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

Diff

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -50,6 +50,7 @@ find "${PATH_TO_HOST}/lib/" -name '*.prl' -maxdepth 1 -exec cp '{}' "${PATH_TO_T
 ) > "${PATH_TO_TARGET}/bin/qmake"
 
 chmod +x "${PATH_TO_TARGET}/bin/qmake"
+[ -e "${PATH_TO_TARGET}/bin/qmake6" ] && cp "${PATH_TO_TARGET}/bin/qmake" "${PATH_TO_TARGET}/bin/qmake6"
 
 (
 	echo '#!/bin/sh'
@@ -61,6 +62,7 @@ chmod +x "${PATH_TO_TARGET}/bin/qmake"
 ) > "${PATH_TO_TARGET}/bin/qtpaths"
 
 chmod +x "${PATH_TO_TARGET}/bin/qtpaths"
+[ -e "${PATH_TO_TARGET}/bin/qtpaths6" ] && cp "${PATH_TO_TARGET}/bin/qtpaths" "${PATH_TO_TARGET}/bin/qtpaths6"
 
 # judge if sed / gsed is GNU sed
 GNU_SED=

--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -49,6 +49,11 @@ Set qmake = fso.OpenTextFile(PATH_TO_TARGET & "\bin\qmake.bat", 2, True)
 qmake.WriteLine """%~dp0\..\host\bin\qmake"" -qtconf ""%~dp0\target_qt.conf"" %*"
 qmake.Close
 
+If fso.FileExists(PATH_TO_TARGET & "\bin\qmake6.bat") Then
+	fso.DeleteFile PATH_TO_TARGET & "\bin\qmake6.bat"
+	fso.CopyFile PATH_TO_TARGET & "\bin\qmake.bat", PATH_TO_TARGET & "\bin\qmake6.bat"
+End If
+
 fso.DeleteFile PATH_TO_TARGET & "\bin\qtpaths.bat"
 
 Dim qtpaths
@@ -56,6 +61,11 @@ Set qtpaths = fso.OpenTextFile(PATH_TO_TARGET & "\bin\qtpaths.bat", 2, True)
 qtpaths.WriteLine """%~dp0\..\host\bin\qtpaths"" -qtconf ""%~dp0\target_qt.conf"" %*"
 qtpaths.Close
 
+If fso.FileExists(PATH_TO_TARGET & "\bin\qtpaths6.bat") Then
+	fso.DeleteFile PATH_TO_TARGET & "\bin\qtpaths6.bat"
+	fso.CopyFile PATH_TO_TARGET & "\bin\qtpaths.bat", PATH_TO_TARGET & "\bin\qtpaths6.bat"
+End If
+
 Dim target_qtconf
 Dim target_qtconfold
 Set target_qtconf = fso.OpenTextFile(PATH_TO_TARGET & "\bin\target_qt.conf.new", 2, True)