From 5435c9698d4e8b3372d54ef9072ed5612cbf08c5 Mon Sep 17 00:00:00 2001 From: Minmin Gong Date: Fri, 30 Nov 2018 22:51:58 -0800 Subject: [PATCH] [BUILD] Change the build folder naming, put OS name in front of compiler name --- .appveyor.yml | 10 ++++------ .travis.yml | 2 +- BuildAll.py | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3021f02..ec7b60f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,8 +9,9 @@ configuration: - Release environment: - ARTIFACTS_ZIP_NAME: ShaderConductor-%COMPILER%-win-%PLATFORM%-%CONFIGURATION%-artifacts.zip - BUILD_DIR: ninja-%COMPILER%-win-%PLATFORM%-%CONFIGURATION% + COMBINATION: win-%COMPILER%-%PLATFORM%-%CONFIGURATION% + ARTIFACTS_ZIP_NAME: ShaderConductor-%COMBINATION%-artifacts.zip + BUILD_DIR: ninja-%COMBINATION% matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 COMPILER: vc140 @@ -18,10 +19,7 @@ environment: COMPILER: vc141 install: - - mkdir c:\ninja && cd c:\ninja - - appveyor-retry appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip - - 7z x ninja-win.zip - - set PATH=C:\ninja;%PATH% + - choco install ninja build_script: - cd %APPVEYOR_BUILD_FOLDER% diff --git a/.travis.yml b/.travis.yml index 908b839..c2b34fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,4 +94,4 @@ before_install: script: - python BuildAll.py ninja $COMPILER x64 Release - - ./Build/ninja-$COMPILER-$TRAVIS_OS_NAME-x64-Release/Bin/ShaderConductorTest + - ./Build/ninja-$TRAVIS_OS_NAME-$COMPILER-x64-Release/Bin/ShaderConductorTest diff --git a/BuildAll.py b/BuildAll.py index 0de120d..6ca534d 100644 --- a/BuildAll.py +++ b/BuildAll.py @@ -143,7 +143,7 @@ if __name__ == "__main__": multiConfig = (buildSys.find("vs") == 0) - buildDir = "Build/%s-%s-%s-%s" % (buildSys, compiler, hostPlatform, arch) + buildDir = "Build/%s-%s-%s-%s" % (buildSys, hostPlatform, compiler, arch) if not multiConfig: buildDir += "-%s" % configuration; if not os.path.exists(buildDir):