[BUILD] Change the build folder naming, put OS name in front of compiler name

.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%

.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

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):