mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert Qt MOC hacks (#29528)

Browse Source 
* Revert "CI: prevent moc from running in cache population step (#29401)"

This reverts commit 34634b95aa15dc608315016c40857f3e16ca4ff9.

* Revert "SCons: respect cache read only (#29437)"

This reverts commit 77cb4da6381fdf94ea98c55d6fcc30db4d24dcf6.

* don't change moc path
old-commit-hash: 91dc8457ae8e9b188c8fe613be5b3aa2e86be276
This commit is contained in:
Adeeb Shihadeh
2023-08-22 11:16:58 -07:00
committed by GitHub
parent 0c17a4f4d0
commit b38403f2ca
5 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SConstruct
View File

@@ -1,5 +1,4 @@
import os
import shutil
import subprocess
import sys
import sysconfig
@@ -336,18 +335,6 @@ qt_env['CXXFLAGS'] += qt_flags
qt_env['LIBPATH'] += ['#selfdrive/ui']
qt_env['LIBS'] = qt_libs
# Have to respect cache-readonly
if GetOption('cache_readonly'):
local_moc_files_dir = Dir("#.moc_files").abspath
cache_moc_files_dir = cache_dir + "/moc_files"
if os.path.exists(local_moc_files_dir):
shutil.rmtree(local_moc_files_dir)
if os.path.exists(cache_moc_files_dir):
shutil.copytree(cache_moc_files_dir, local_moc_files_dir)
qt_env['QT3_MOCHPREFIX'] = local_moc_files_dir + "/moc_"
else:
qt_env['QT3_MOCHPREFIX'] = cache_dir + '/moc_files/moc_'
if GetOption("clazy"):
checks = [
"level0",