Revert Qt MOC hacks (#29528)

* 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
-16
View File
@@ -1,16 +0,0 @@
#!/usr/bin/env bash
set -e
# delete outdated moc files
scons --dry-run --taskmastertrace /tmp/tasktrace.log >/dev/null
MOC_EXISTING_PROD="$(find /tmp/scons_cache/moc_files -type f | sort)"
MOC_CURRENT_PROD="$(egrep -o "'[^']*moc_files[^']*'" /tmp/tasktrace.log | sed "s/'//g" | sort | uniq)"
MOC_JUNK="$(comm -23 <(echo "$MOC_EXISTING_PROD") <(echo "$MOC_CURRENT_PROD"))"
echo "$MOC_JUNK" | xargs -I{} rm {}
rm /tmp/tasktrace.log
# delete cache except for moc files
rm -rf $(find /tmp/scons_cache -maxdepth 1 ! -name moc_files ! -name scons_cache)
# repopulate cache
scons --dry-run --cache-populate >/dev/null