Merge pull request #13299 from rraallvv/scons_cache

Enable SCons shared cache for AppVeyor CI (master)
This commit is contained in:
Rémi Verschelde 2017-11-26 15:09:02 +01:00 committed by GitHub
commit 051f761a87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions

View file

@ -1,7 +1,9 @@
os: Visual Studio 2015 os: Visual Studio 2015
environment: environment:
HOME: "%HOMEDRIVE%%HOMEPATH%"
PYTHON: C:\Python27 PYTHON: C:\Python27
SCONS_CACHE: "%HOME%\\scons_cache"
matrix: matrix:
- VS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat - VS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
GD_PLATFORM: windows GD_PLATFORM: windows
@ -9,6 +11,9 @@ environment:
TARGET: release_debug TARGET: release_debug
ARCH: amd64 ARCH: amd64
cache:
- "%SCONS_CACHE%"
install: install:
- SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- pip install --egg scons # it will fail on AppVeyor without --egg flag - pip install --egg scons # it will fail on AppVeyor without --egg flag

View file

@ -434,6 +434,11 @@ if selected_platform in platform_list:
if (True): # FIXME: detect GLES3 if (True): # FIXME: detect GLES3
env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.gen.h',src_suffix = '.glsl') } ) env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.gen.h',src_suffix = '.glsl') } )
scons_cache_path = os.environ.get("SCONS_CACHE")
if scons_cache_path != None:
CacheDir(scons_cache_path)
print("Scons cache enabled... (path: '" + scons_cache_path + "')")
Export('env') Export('env')
# build subdirs, the build order is dependent on link order. # build subdirs, the build order is dependent on link order.