Commit: 7d92fc216f401590ec02574d5500592e05a4af20 - Fs-scripts (git)

Commit MetaInfo

• Revision: 7d92fc216f401590ec02574d5500592e05a4af20 (tree)
• Time: 2022-11-19 18:56:23
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

CMake tweak of cross builds

Change Summary

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

Incremental Difference

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -29,13 +29,15 @@ if [ ! -e "${PATH_TO_HOST}/bin/qt-cmake" ]; then
 	exit 1
 fi
 
-mkdir $PATH_TO_TARGET/host
-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/
-find $PATH_TO_HOST/lib/ -name \*.prl -maxdepth 1 -exec cp '{}' $PATH_TO_TARGET/host/lib ';'
+mkdir "${PATH_TO_TARGET}/host"
+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/"
+find "${PATH_TO_HOST}/lib/" -name '*.prl' -maxdepth 1 -exec cp '{}' "${PATH_TO_TARGET}/host/lib" ';'
+
+# qmake tweak
 
 (
 	echo '#!/bin/sh'
@@ -44,16 +46,26 @@ find $PATH_TO_HOST/lib/ -name \*.prl -maxdepth 1 -exec cp '{}' $PATH_TO_TARGET/h
 	echo "script_dir_path=\`(cd \"\$script_dir_path\"; /bin/pwd)\`"
 	echo
 	echo "\$script_dir_path/../host/bin/qmake -qtconf \"\$script_dir_path/target_qt.conf\" \$*"
-) > $PATH_TO_TARGET/bin/qmake
+) > "${PATH_TO_TARGET}/bin/qmake"
+
+chmod +x "${PATH_TO_TARGET}/bin/qmake"
+
+(
+	echo '#!/bin/sh'
+	echo
+	echo "script_dir_path=\`dirname \$0\`"
+	echo "script_dir_path=\`(cd \"\$script_dir_path\"; /bin/pwd)\`"
+	echo
+	echo "\$script_dir_path/../host/bin/qtpaths -qtconf \"\$script_dir_path/target_qt.conf\" \$*"
+) > "${PATH_TO_TARGET}/bin/qtpaths"
+
+chmod +x "${PATH_TO_TARGET}/bin/qtpaths"
 
-chmod +x $PATH_TO_TARGET/bin/qmake
+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 is broken even if we have tried to tweak it
-# Temporarily put these things off until we found a solution
+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"
 
-# Currently all we know is that:
-# Qt provides toolchain file which we'd use
-# some variable should be modified using 'sed'-like program

--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -26,6 +26,7 @@ End If
 
 fso.CreateFolder PATH_TO_TARGET & "\host"
 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"
@@ -38,6 +39,8 @@ For Each hostlibfile In hostlibdir.Files
 	End If
 Next
 
+' qmake tweak
+
 fso.DeleteFile PATH_TO_TARGET & "\bin\qmake.bat"
 
 Dim qmake
@@ -45,6 +48,13 @@ 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
 
+fso.DeleteFile PATH_TO_TARGET & "\bin\qtpaths.bat"
+
+Dim qtpaths
+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
+
 Dim target_qtconf
 Dim target_qtconfold
 Set target_qtconf = fso.OpenTextFile(PATH_TO_TARGET & "\bin\target_qt.conf.new", 2, True)
@@ -64,6 +74,28 @@ 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 is broken even if we have tried to tweak it
-' Temporarily put these things off until we found a solution
+' CMake tweak
+
+Dim Qt6Dependencies_cmake
+Dim Qt6Dependencies_cmakeold
+Set Qt6Dependencies_cmake = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake.new", 2, True)
+Set Qt6Dependencies_cmakeold = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake", 1, False)
+
+Do until Qt6Dependencies_cmakeold.AtEndOfStream 
+	Dim line
+	line = Qt6Dependencies_cmakeold.ReadLine
+	If Left(Trim(line), 38) = "set(__qt_platform_initial_qt_host_path" Then line = "set(__qt_platform_initial_qt_host_path ""${Qt6_DIR}/../../../host"")"
+	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 ""${Qt6_DIR}/../../../host/lib/cmake"")"
+	Qt6Dependencies_cmake.WriteLine line
+Loop
+
+Qt6Dependencies_cmake.Close
+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"
 
+' lib/cmake/Qt6/QtBuildInternalsExtra.cmake
+' Is this need to be modified? This is the install directory!
+' Our Qt builds are relocatable so it seems like there is no need for modifying it
+'     set(qtbi_orig_staging_prefix "")