From dd980008f712ce5b46b95afc6068a0b2121581e5 Mon Sep 17 00:00:00 2001
From: simon-p-r <simon.ricaldone@circabs.com>
Date: Sun, 9 Jul 2017 22:20:35 +0100
Subject: [PATCH 1/5] add appveyor

---
 appveyor.yml | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..db5f2a4
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,82 @@
+os: Visual Studio 2015
+
+# ENABLE_CUSTOM_COMPILER_FLAGS - on by default
+# ENABLE_SANITIZERS - off by default
+# ENABLE_PUBLIC_SYMBOLS - on by default
+# BUILD_SHARED_LIBS - on by default
+# ENABLE_TARGET_EXPORT - on by default
+# ENABLE_CJSON_UTILS - off by default
+# ENABLE_CJSON_TEST -on by default
+# ENABLE_VALGRIND - off by default
+# ENABLE_FUZZING - off by default
+
+environment:
+  matrix:
+    - GENERATOR: "Visual Studio 14 2015"
+      BUILD_SHARED_LIBS: ON
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 14 2015"
+      BUILD_SHARED_LIBS: OFF
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 12 2013"
+      BUILD_SHARED_LIBS: ON
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 12 2013"
+      BUILD_SHARED_LIBS: OFF
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 11 2012"
+      BUILD_SHARED_LIBS: ON
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 11 2012"
+      BUILD_SHARED_LIBS: OFF
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 10 2010"
+      BUILD_SHARED_LIBS: ON
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 10 2010"
+      BUILD_SHARED_LIBS: OFF
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 9 2008"
+      BUILD_SHARED_LIBS: ON
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+    - GENERATOR: "Visual Studio 9 2008"
+      BUILD_SHARED_LIBS: OFF
+      ENABLE_CJSON_TEST: OFF
+      ENABLE_CJSON_UTILS: ON
+
+
+platform:
+  - x86
+  - x64
+
+configuration:
+  - Release
+
+
+build_script:
+  - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
+  - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_CJSON_TEST=%ENABLE_CJSON_TEST%  -H. -Bbuild
+  - cmake --build build --config "%CONFIGURATION%"
+
+
+on_failure:
+  - ps: if(Test-Path builds/CMakeFiles/CMakeOutput.log) { cat builds/CMakeFiles/CMakeOutput.log }
+  - ps: if(Test-Path builds/CMakeFiles/CMakeError.log) { cat builds/CMakeFiles/CMakeError.log }
\ No newline at end of file

From 824e1b2a99793341f97195209896169b8b33b0a7 Mon Sep 17 00:00:00 2001
From: simon-p-r <simon.ricaldone@circabs.com>
Date: Mon, 10 Jul 2017 10:38:21 +0100
Subject: [PATCH 2/5] patch for Visual Studio 9 2008 x64 failed builds

---
 appveyor-patch.ps1 | 11 +++++++++++
 appveyor.yml       |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 appveyor-patch.ps1

diff --git a/appveyor-patch.ps1 b/appveyor-patch.ps1
new file mode 100644
index 0000000..34d2163
--- /dev/null
+++ b/appveyor-patch.ps1
@@ -0,0 +1,11 @@
+# Script to patch Appveyor build environment for Visual Studio 2008 64bit
+
+$url = "https://github.com/menpo/condaci/raw/master/vs2008_patch.zip"
+$output = "$pwd\build\vs2008_patch.zip"
+
+(New-Object System.Net.WebClient).DownloadFile($url, $output)
+
+7z -e "$pwd\build\vs2008_patch.zip"
+cmd.exe /c "$pwd\build\vs2008_patch\setup_x64.bat"
+
+
diff --git a/appveyor.yml b/appveyor.yml
index db5f2a4..f9c586a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -72,6 +72,7 @@ configuration:
 
 
 build_script:
+  - ps: if($env:PLATFORM -eq "x64" -And $GENERATOR -eq 'Visual Studio 9 2008') { .\appveyor-patch.ps1 }
   - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
   - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_CJSON_TEST=%ENABLE_CJSON_TEST%  -H. -Bbuild
   - cmake --build build --config "%CONFIGURATION%"

From c6f7f78cbbf8d549d833bd5f261e74303829cb7f Mon Sep 17 00:00:00 2001
From: simon-p-r <simon.ricaldone@circabs.com>
Date: Mon, 10 Jul 2017 10:50:55 +0100
Subject: [PATCH 3/5] added copy to powershell script

---
 appveyor-patch.ps1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor-patch.ps1 b/appveyor-patch.ps1
index 34d2163..b380d53 100644
--- a/appveyor-patch.ps1
+++ b/appveyor-patch.ps1
@@ -8,4 +8,6 @@ $output = "$pwd\build\vs2008_patch.zip"
 7z -e "$pwd\build\vs2008_patch.zip"
 cmd.exe /c "$pwd\build\vs2008_patch\setup_x64.bat"
 
+copy C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat
+
 

From 2caa884f6a786c900754c25a19083e21db756b68 Mon Sep 17 00:00:00 2001
From: simon-p-r <simon.ricaldone@circabs.com>
Date: Sat, 15 Jul 2017 09:03:13 +0100
Subject: [PATCH 4/5] removed x64 Visual Studio 9 2008 build

---
 .gitignore         |  1 +
 appveyor-patch.ps1 | 13 -------------
 appveyor.yml       |  4 +++-
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 appveyor-patch.ps1

diff --git a/.gitignore b/.gitignore
index 33424d9..e2e312b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ cJSON_test_utils
 libcjson.so.*
 libcjson_utils.so.*
 *.orig
+.vscode
diff --git a/appveyor-patch.ps1 b/appveyor-patch.ps1
deleted file mode 100644
index b380d53..0000000
--- a/appveyor-patch.ps1
+++ /dev/null
@@ -1,13 +0,0 @@
-# Script to patch Appveyor build environment for Visual Studio 2008 64bit
-
-$url = "https://github.com/menpo/condaci/raw/master/vs2008_patch.zip"
-$output = "$pwd\build\vs2008_patch.zip"
-
-(New-Object System.Net.WebClient).DownloadFile($url, $output)
-
-7z -e "$pwd\build\vs2008_patch.zip"
-cmd.exe /c "$pwd\build\vs2008_patch\setup_x64.bat"
-
-copy C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat
-
-
diff --git a/appveyor.yml b/appveyor.yml
index f9c586a..e23eb64 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -66,13 +66,15 @@ environment:
 platform:
   - x86
   - x64
+  exclude:
+  - platform: x64
+    GENERATOR: "Visual Studio 9 2008"
 
 configuration:
   - Release
 
 
 build_script:
-  - ps: if($env:PLATFORM -eq "x64" -And $GENERATOR -eq 'Visual Studio 9 2008') { .\appveyor-patch.ps1 }
   - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
   - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_CJSON_TEST=%ENABLE_CJSON_TEST%  -H. -Bbuild
   - cmake --build build --config "%CONFIGURATION%"

From f0f3e55d485ece89153f947a5f57f3dbd8877958 Mon Sep 17 00:00:00 2001
From: simon-p-r <simon.ricaldone@circabs.com>
Date: Sat, 15 Jul 2017 09:06:10 +0100
Subject: [PATCH 5/5] fixed appveyor script

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

diff --git a/appveyor.yml b/appveyor.yml
index e23eb64..464bf03 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -66,6 +66,7 @@ environment:
 platform:
   - x86
   - x64
+matrix:
   exclude:
   - platform: x64
     GENERATOR: "Visual Studio 9 2008"