flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 02:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to ccache and clcache

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-06-12 19:30:51 +01:00
parent c5d4134ef9
commit 88f8e8130f
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mkspecs/features/common_pre.prf
View File

@@ -46,23 +46,6 @@ include(wordsize.pri)
contains(TEMPLATE, "vc.*"): QMAKE_CXXFLAGS *= /MP contains(TEMPLATE, "vc.*"): QMAKE_CXXFLAGS *= /MP
################################
# Cache intermediate files to improve build times
################################
swiftConfig(ccache) {
swiftConfig(profileRelease):error(profileRelease is incompatible with clcache)
msvc: QMAKE_CXX = clcache
else:macx: QMAKE_CXX = /usr/local/bin/ccache $$QMAKE_CXX
else:gcc: QMAKE_CXX = ccache $$QMAKE_CXX
unix {
QMAKE_CFLAGS_DEBUG *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=.
QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=.
QMAKE_CXXFLAGS_DEBUG *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=.
QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=.
}
}
################################ ################################
# Release build with debug info # Release build with debug info
################################ ################################

12
scripts/build.py
View File

@@ -37,7 +37,6 @@ class Builder:
""" """
print('Preparing environment ...') print('Preparing environment ...')
os.environ['PATH'] += os.pathsep + self._get_qt_binary_path() os.environ['PATH'] += os.pathsep + self._get_qt_binary_path()
self._ccache_prepare()
self._specific_prepare() self._specific_prepare()
print('Updating from datastore ...') print('Updating from datastore ...')
@@ -47,16 +46,6 @@ class Builder:
shared_path = os.path.abspath(os.path.join(source_path, 'resources', 'share')) shared_path = os.path.abspath(os.path.join(source_path, 'resources', 'share'))
datastore.update_shared(host, datastore_version, shared_path) datastore.update_shared(host, datastore_version, shared_path)
def _ccache_prepare(self):
os.environ['CCACHE_NODIRECT'] = '1'
os.environ['CLCACHE_NODIRECT'] = '1'
os.environ['CLCACHE_COMPRESS'] = '1'
os.environ['CLCACHE_OBJECT_CACHE_TIMEOUT_MS'] = str(10 * 60 * 1000)
os.environ['CLCACHE_DIR'] = 'C:\\clcache' # workaround https://github.com/frerich/clcache/issues/342
os.environ['CLCACHE_BASEDIR'] = os.environ['WORKSPACE']
os.environ['CCACHE_BASEDIR'] = os.environ['WORKSPACE']
os.environ['CCACHE_NOHASHDIR'] = '1'
def build(self, jobs, qmake_args, dev_build, eolInMonth): def build(self, jobs, qmake_args, dev_build, eolInMonth):
""" """
Run the build itself. Pass dev_build=True to enable a dev build Run the build itself. Pass dev_build=True to enable a dev build
@@ -80,7 +69,6 @@ class Builder:
print('Setting EOL date to ' + eolDate.strftime('%Y%m%d')) print('Setting EOL date to ' + eolDate.strftime('%Y%m%d'))
qmake_call += ['SWIFT_CONFIG.endOfLife=' + eolDate.strftime('%Y%m%d')] qmake_call += ['SWIFT_CONFIG.endOfLife=' + eolDate.strftime('%Y%m%d')]
qmake_call += ['SWIFT_CONFIG.ccache=true']
qmake_call += ['-r', os.pardir] qmake_call += ['-r', os.pardir]
subprocess.check_call(qmake_call, env=dict(os.environ)) subprocess.check_call(qmake_call, env=dict(os.environ))