From 0a719401395d89ca4801bcdae29481c3a285364c Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Tue, 26 Dec 2017 17:54:46 -0500
Subject: [PATCH] apply correct usage of paths and similar

---
 appveyor.yml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 52c653e2..b65fe256 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -81,6 +81,7 @@ matrix:
       LUA_VERSION: 5.2.4
 
 init:
+# # Ninja
   # make sure we have Ninja
 - set top_level=%cd%
 - cd ..
@@ -89,9 +90,23 @@ init:
 - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip"
 - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
 - 7z x ninja.zip -o%cd%\ninja
-- set PATH=%cd%\ninja;%PATH%
 - cd "%top_level%"
-# configure the generator appropriately
+# # PATH
+  # manipulations to manupulations need to be done here
+- set python_path=C:\Python36
+- set mingw_path=
+- set llvm_path=
+- if "%MINGW_VERSION%"=="5.3.0" (set mingw_path=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0)
+- if "%MINGW_VERSION%"=="6.3.0" (if "%PLATFORM%"=="x64" (set mingw_path=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1) else ( set mingw_path=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1))
+- if "%LLVM_VERSION%"=="4.0.0" (set llvm_path=C:\Program Files\LLVM\bin)
+- if "%PLATFORM%"=="x64" (set python_path=C:\Python36-x64)
+- set PATH="%python_path%";%PATH%
+- set PATH=%mingw_path%;%PATH%
+- set PATH=%llvm_path%;%PATH%
+- set PATH=%top_level%\tools\ninja;%PATH%
+- echo PATH=%PATH%
+# # Generators and CMake arguments
+  # configure the generator appropriately
 - set arch=
 - set parallelism=
 - set logger=
@@ -103,28 +118,19 @@ init:
 - if "%MINGW_VERSION%"=="5.3.0" (set CMAKE_GENERATOR=Ninja%%set build_type=-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++.exe -DCMAKE_C_COMPILER=gcc.exe)
 - if "%MINGW_VERSION%"=="6.3.0" (set CMAKE_GENERATOR=Ninja&&set build_type=-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++.exe -DCMAKE_C_COMPILER=gcc.exe)
 - if "%LLVM_VERSION%"=="4.0.0" (set CMAKE_GENERATOR=Ninja&&set build_type=-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang-cl.exe -DCMAKE_C_COMPILER=clang-cl.exe)
-# print out useful information
+# # Last printouts
+  # print out generator information
+- echo cmake generator is `%CMAKE_GENERATOR%` using special flags logger=`%logger%` parallelism=`%parallelism%`
+  # print out useful tool information
 - ninja --version
 - cmake --version
 - if DEFINED LLVM_VERSION (clang-cl.exe -v)
 - if DEFINED MINGW_VERSION (g++.exe --version)
-- echo cmake generator is `%CMAKE_GENERATOR%` using special flags logger=`%logger%` parallelism=`%parallelism%`
 
 # We need to use CMAKE_BUILD_TYPE=Release since there are no "configuration"
 # toolsets for Ninja or Makefiles as far as cmake is concerned, so 
 # the --config / -C switches on builds do nothing...!
 before_build:
-- set python_path=C:\Python36
-- set mingw_path=
-- set llvm_path=
-- if "%MINGW_VERSION%"=="5.3.0" (set mingw_path=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0)
-- if "%MINGW_VERSION%"=="6.3.0" (if "%PLATFORM%"=="x64" (set mingw_path=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1) else ( set mingw_path=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1))
-- if "%LLVM_VERSION%"=="4.0.0" (set llvm_path=C:\Program Files\LLVM\bin)
-- if "%PLATFORM%"=="x64" (set python_path=C:\Python36-x64)
-- set PATH="%python_path%";%PATH%
-- set PATH=%mingw_path%;%PATH%
-- set PATH=%llvm_path%;%PATH%
-- echo PATH=%PATH%
 - md build-sol2
 - cd build-sol2
 - cmake .. -G "%CMAKE_GENERATOR%" %build_type% -DLUA_VERSION="%LUA_VERSION%" -DBUILD_LUA=ON -DBUILD_LUA_AS_DLL=OFF -DTESTS=ON -DEXAMPLES=ON -DSINGLE=ON -DTESTS_EXAMPLES=ON -DTESTS_SINGLE=ON