From 52602ed8accedd6ed71a4ec83fa52543e2cdc12d Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 09:42:27 -0400
Subject: [PATCH 1/7] Adding VS 2017 64 bit to Appveyor build matrix

---
 appveyor.yml | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b2e1dad..b477a93 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,25 @@
 
 version: 2.0.{build}
 
-image: 
-  - Visual Studio 2013
+matrix: 
+  allow_failures:
+  #GROUP: (SUPPORTED/EXPERIMENTAL)
+  #EXPERIMENTAL is allowed to fail under build matrix
+  - GROUP: "EXPERIMENTAL"
+
+environment: 
+  matrix:
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    VS_VERSION: "10 2010"
+    ARCH: Win32
+    GROUP: "SUPPORTED"
+    BOOST_ROOT:"C:/Libraries/boost"
+    # New build on Visual Studio 15 2017
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    VS_VERSION: "15 2017"
+    ARCH: Win64
+    GROUP: "EXPERIMENTAL"
+    BOOST_ROOT:"C:/Libraries/boost_1_67_0"
 
 # called before repo cloning
 init: 
@@ -18,9 +35,14 @@ init:
   - set BUILD_HOME=buildprod
   - set TEST_HOME=nrtestsuite
   - set NRTEST_SCRIPT=C:\Python27\Scripts
-  - set GENERATOR="Visual Studio 10 2010"
-  - set BOOST_ROOT="C:\\Libraries\\boost"
-  - set BOOST_LIB="C:\\Libraries\\boost\\lib32-msvc-12.0"
+  - if "%ARCH%"=="Win64" (set VS_ARCH=Win64)
+  - set GENERATOR="Visual Studio %VS_VERSION%%VS_ARCH%"
+  # See values set
+  - echo %APPVEYOR_BUILD_WORKER_IMAGE%
+  - echo %ARCH%
+  - echo %BUILD_HOME%
+  - echo %GENERATOR%
+  - echo %BOOST_ROOT%
 
 # called after repo clone
 install: 
@@ -32,7 +54,6 @@ before_build:
   - cd %BUILD_HOME%
   - cmake -G %GENERATOR% 
     -DBOOST_ROOT="%BOOST_ROOT%"
-    -DBOOST_LIBRARYDIR="%BOOST_LIB%"
     -DBoost_USE_STATIC_LIBS="ON" ..
 
 # run custom build script

From 6358db92cdf767d410568651ca67084706746b8a Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 09:49:25 -0400
Subject: [PATCH 2/7] Fixing typo

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index b477a93..73e5902 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,7 +22,7 @@ environment:
     ARCH: Win32
     GROUP: "SUPPORTED"
     BOOST_ROOT:"C:/Libraries/boost"
-    # New build on Visual Studio 15 2017
+  # New build on Visual Studio 15 2017
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     VS_VERSION: "15 2017"
     ARCH: Win64

From bb5fe49f37dceb78d33f853149483e6c434aa905 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 09:56:22 -0400
Subject: [PATCH 3/7] Fixing typo

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 73e5902..212d933 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,13 +21,13 @@ environment:
     VS_VERSION: "10 2010"
     ARCH: Win32
     GROUP: "SUPPORTED"
-    BOOST_ROOT:"C:/Libraries/boost"
+    BOOST_ROOT: "C:/Libraries/boost"
   # New build on Visual Studio 15 2017
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     VS_VERSION: "15 2017"
     ARCH: Win64
     GROUP: "EXPERIMENTAL"
-    BOOST_ROOT:"C:/Libraries/boost_1_67_0"
+    BOOST_ROOT: "C:/Libraries/boost_1_67_0"
 
 # called before repo cloning
 init: 

From a10a38853ab2f3ae278fde19b04f03023a6885e0 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 09:59:51 -0400
Subject: [PATCH 4/7] Fixing another typo

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 212d933..6712a59 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ init:
   - set TEST_HOME=nrtestsuite
   - set NRTEST_SCRIPT=C:\Python27\Scripts
   - if "%ARCH%"=="Win64" (set VS_ARCH=Win64)
-  - set GENERATOR="Visual Studio %VS_VERSION%%VS_ARCH%"
+  - set GENERATOR="Visual Studio %VS_VERSION% %VS_ARCH%"
   # See values set
   - echo %APPVEYOR_BUILD_WORKER_IMAGE%
   - echo %ARCH%

From 03fee3a344aaf7def775625f7f077a1ba1c24b72 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 10:06:06 -0400
Subject: [PATCH 5/7] Fixing another typo

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6712a59..2b34713 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,7 +35,7 @@ init:
   - set BUILD_HOME=buildprod
   - set TEST_HOME=nrtestsuite
   - set NRTEST_SCRIPT=C:\Python27\Scripts
-  - if "%ARCH%"=="Win64" (set VS_ARCH=Win64)
+  - if "%ARCH%"=="Win64" (set VS_ARCH= Win64)
   - set GENERATOR="Visual Studio %VS_VERSION% %VS_ARCH%"
   # See values set
   - echo %APPVEYOR_BUILD_WORKER_IMAGE%

From 5af1ebfdf745069505e499df42c1885e4e65f25b Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 10:18:33 -0400
Subject: [PATCH 6/7] Simplifying env vars in appveyor matrix

---
 appveyor.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2b34713..1acd2fa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,14 +18,12 @@ matrix:
 environment: 
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-    VS_VERSION: "10 2010"
-    ARCH: Win32
+    GENERATOR: "Visual Studio 10 2010"
     GROUP: "SUPPORTED"
     BOOST_ROOT: "C:/Libraries/boost"
   # New build on Visual Studio 15 2017
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    VS_VERSION: "15 2017"
-    ARCH: Win64
+    GENERATOR: "Visual Studio 15 2017 Win64"
     GROUP: "EXPERIMENTAL"
     BOOST_ROOT: "C:/Libraries/boost_1_67_0"
 
@@ -35,11 +33,8 @@ init:
   - set BUILD_HOME=buildprod
   - set TEST_HOME=nrtestsuite
   - set NRTEST_SCRIPT=C:\Python27\Scripts
-  - if "%ARCH%"=="Win64" (set VS_ARCH= Win64)
-  - set GENERATOR="Visual Studio %VS_VERSION% %VS_ARCH%"
   # See values set
   - echo %APPVEYOR_BUILD_WORKER_IMAGE%
-  - echo %ARCH%
   - echo %BUILD_HOME%
   - echo %GENERATOR%
   - echo %BOOST_ROOT%

From 9c586bb3f604552d918a7ad68f8857e2924cf653 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 23 May 2018 10:28:23 -0400
Subject: [PATCH 7/7] Adding quotes around call to generator var

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1acd2fa..c7e97ea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,7 +47,7 @@ install:
 before_build:
   - mkdir %BUILD_HOME%
   - cd %BUILD_HOME%
-  - cmake -G %GENERATOR% 
+  - cmake -G "%GENERATOR%" 
     -DBOOST_ROOT="%BOOST_ROOT%"
     -DBoost_USE_STATIC_LIBS="ON" ..