From f6f8436e974cf63c17bcc34a932b490302547a3a Mon Sep 17 00:00:00 2001
From: James Myatt <james.myatt@tessella.com>
Date: Fri, 11 Sep 2015 12:20:44 +0100
Subject: [PATCH 1/7] Add initial version of  Appveyor build script

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

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..26615f2
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,25 @@
+version: '{branch}.{build}'
+os: Windows Server 2012 R2
+configuration:
+- Debug
+- Release
+platform: x64
+environment:
+  matrix:
+  - PlatformToolset: v140
+  - PlatformToolset: v120
+  - PlatformToolset: Windows7.1SDK
+build_script:
+- >
+  msbuild "json-c.vcxproj" /m /verbosity:normal
+  /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  /p:PlatformToolset=%PlatformToolset%
+artifacts:
+- path: Debug\*
+  name: Debug_x86
+- path: Release\*
+  name: Release_x86
+- path: x64\Debug\*
+  name: Debug_x64
+- path: x64\Release\*
+  name: Release_x64

From 17e11e2c92ef41eecc7a1ea1bc917f3dffb2d2d1 Mon Sep 17 00:00:00 2001
From: James Myatt <james.myatt@tessella.com>
Date: Fri, 11 Sep 2015 13:03:36 +0100
Subject: [PATCH 2/7] Appveyor: Allow failing builds against newest toolset

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

diff --git a/appveyor.yml b/appveyor.yml
index 26615f2..5567407 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,6 @@
 version: '{branch}.{build}'
 os: Windows Server 2012 R2
+
 configuration:
 - Debug
 - Release
@@ -9,11 +10,17 @@ environment:
   - PlatformToolset: v140
   - PlatformToolset: v120
   - PlatformToolset: Windows7.1SDK
+
 build_script:
 - >
   msbuild "json-c.vcxproj" /m /verbosity:normal
   /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   /p:PlatformToolset=%PlatformToolset%
+
+matrix:
+  allow_failures:
+    - PlatformToolset: v140
+
 artifacts:
 - path: Debug\*
   name: Debug_x86

From f786feac0a841f2f14ba9cdcf85ce62516215bba Mon Sep 17 00:00:00 2001
From: James Myatt <james@jamesmyatt.co.uk>
Date: Fri, 9 Oct 2015 23:46:19 +0100
Subject: [PATCH 3/7] Add Travis build script

---
 .travis.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..a57cdf3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+language: cpp
+
+compiler:
+  - gcc
+
+os:
+  - linux
+
+before_install:
+  - echo $LANG
+  - echo $LC_ALL
+
+install:
+  - sh autogen.sh
+
+before_script:
+  - ./configure
+
+script:
+  - make
+  - make install
+
+after_success:
+  - make check

From 88dedb88244b6a7351531d9e0823383dba9ebe22 Mon Sep 17 00:00:00 2001
From: James Myatt <james@jamesmyatt.co.uk>
Date: Fri, 9 Oct 2015 23:48:06 +0100
Subject: [PATCH 4/7] Travis: skip install step

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a57cdf3..dffe1c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ before_script:
 
 script:
   - make
-  - make install
 
 after_success:
   - make check

From 82030cd0af58166a29f4a2ec016c5f709290bb2f Mon Sep 17 00:00:00 2001
From: James Myatt <james@jamesmyatt.co.uk>
Date: Fri, 9 Oct 2015 23:50:51 +0100
Subject: [PATCH 5/7] Travis: add osx and clang builds

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index dffe1c7..70e20eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,11 @@ language: cpp
 
 compiler:
   - gcc
+  - clang
 
 os:
   - linux
+  - osx
 
 before_install:
   - echo $LANG

From fd43c2b99a47ac840aaca39a3e58fe5b1994a0c4 Mon Sep 17 00:00:00 2001
From: James Myatt <james.myatt@tessella.com>
Date: Thu, 5 Nov 2015 13:41:42 +0000
Subject: [PATCH 6/7] Appveyor: Create artefact with library and include files
 only

---
 appveyor.yml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5567407..537f9b5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,18 +15,28 @@ build_script:
 - >
   msbuild "json-c.vcxproj" /m /verbosity:normal
   /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  /p:PlatformToolset=%PlatformToolset%
+  /p:PlatformToolset=%PlatformToolset% /p:OutDir=lib\
+
+after_build:
+- md include\json-c
+- copy json.h include\json-c\*
+- copy debug.h include\json-c\*
+- copy linkhash.h include\json-c\*
+- copy arraylist.h include\json-c\*
+- copy json_util.h include\json-c\*
+- copy json_object.h include\json-c\*
+- copy json_tokener.h include\json-c\*
+- copy json_object_iterator.h include\json-c\*
+- copy json_c_version.h include\json-c\*
+- copy json_inttypes.h include\json-c\*
+- copy json_config.h include\json-c\*
+- copy json_object_private.h include\json-c\*
+- 7z a json-c.lib.zip lib\json-c.lib include\json-c\*.h
 
 matrix:
   allow_failures:
     - PlatformToolset: v140
 
 artifacts:
-- path: Debug\*
-  name: Debug_x86
-- path: Release\*
-  name: Release_x86
-- path: x64\Debug\*
-  name: Debug_x64
-- path: x64\Release\*
-  name: Release_x64
+- path: json-c.lib.zip
+  name: json-c.lib.zip

From 239c146a4b63b8a30cb0590b5a91a664c4278af6 Mon Sep 17 00:00:00 2001
From: James Myatt <james.myatt@tessella.com>
Date: Thu, 5 Nov 2015 13:50:30 +0000
Subject: [PATCH 7/7] Appveyor: Visual Studio v140 no longer fails

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

diff --git a/appveyor.yml b/appveyor.yml
index 537f9b5..592169c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,10 +33,6 @@ after_build:
 - copy json_object_private.h include\json-c\*
 - 7z a json-c.lib.zip lib\json-c.lib include\json-c\*.h
 
-matrix:
-  allow_failures:
-    - PlatformToolset: v140
-
 artifacts:
 - path: json-c.lib.zip
   name: json-c.lib.zip