From 0ace2439a2b20eaacae92ec01fccdc9314599341 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 00:35:00 +0000
Subject: [PATCH 1/9] Add appveyor configuration file
---
appveyor.yml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
create mode 100644 appveyor.yml
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..8b159b6b
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,64 @@
+version: 2.2.0.{build}
+
+os: Visual Studio 2015
+
+branches:
+ except:
+ - /.*travis.*/
+skip_commits:
+ message: /travis/
+ files:
+ - .travis.yml
+
+environment:
+ global:
+ APPVEYOR_SAVE_CACHE_ON_ERROR: true
+ CYG_ROOT: C:/MinGW/msys/1.0
+ EVENT_TESTS_PARALLEL: 20
+ EVENT_BUILD_PARALLEL: 10
+ matrix:
+ - Platform: Cygwin32
+ - Platform: MinGW32
+ PlatformToolset: 4.8.5
+ - Platform: MinGW64
+ PlatformToolset: 4.8.5
+ - Platform: MinGW32
+ PlatformToolset: 5.3.0
+ - Platform: MinGW64
+ PlatformToolset: 5.3.0
+ - Platform: Win32
+ PlatformToolset: v90
+ - Platform: Win32
+ PlatformToolset: v100
+ - Platform: Win32
+ PlatformToolset: v110
+ - Platform: Win32
+ PlatformToolset: v120
+ - Platform: Win32
+ PlatformToolset: v140
+ - Platform: x64
+ PlatformToolset: v140
+matrix:
+ allow_failures:
+ - EVENT_ALLOW_FAILURE: 1
+ fast_finish: true
+
+init:
+ - 'echo Building libhttpserver %version% for Windows'
+ - 'echo System architecture: %PLATFORM%'
+ - 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
+ - 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
+ - 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
+ - 'echo Cygwin root is: %CYG_ROOT%'
+install:
+ - C:\MinGW\bin\mingw-get install autotools autoconf automake
+build_script:
+ - ps: |
+ $env:PATH="$env:CYG_ROOT\bin;C:\MinGW\bin;$($env:PATH)"
+ bash -lc "echo 'C:\MinGW /mingw' > /etc/fstab"
+ bash -lc "echo 'C:\OpenSSL-Win32 /ssl' >> /etc/fstab"
+ $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
+ bash -lc "exec 0</dev/null; exec 2>&1; cd $env:APPVEYOR_BUILD_FOLDER; bash -x ./bootstrap && mkdir -p build && cd build && ../configure && make"
+
+cache:
+ - build
From b66fd4039f2bc885c01109a7ec996d392da656d7 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 01:11:29 +0000
Subject: [PATCH 2/9] Simplify appveyor script
---
appveyor.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 8b159b6b..ef545009 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,7 +13,6 @@ skip_commits:
environment:
global:
APPVEYOR_SAVE_CACHE_ON_ERROR: true
- CYG_ROOT: C:/MinGW/msys/1.0
EVENT_TESTS_PARALLEL: 20
EVENT_BUILD_PARALLEL: 10
matrix:
@@ -41,7 +40,6 @@ environment:
matrix:
allow_failures:
- EVENT_ALLOW_FAILURE: 1
- fast_finish: true
init:
- 'echo Building libhttpserver %version% for Windows'
@@ -54,9 +52,9 @@ install:
- C:\MinGW\bin\mingw-get install autotools autoconf automake
build_script:
- ps: |
- $env:PATH="$env:CYG_ROOT\bin;C:\MinGW\bin;$($env:PATH)"
+ $env:PATH="$env:C:\cygwin\bin;C:\MinGW\bin;$($env:PATH)"
+ bash -lc "echo 'C:\cygwin /cygwin' > /etc/fstab"
bash -lc "echo 'C:\MinGW /mingw' > /etc/fstab"
- bash -lc "echo 'C:\OpenSSL-Win32 /ssl' >> /etc/fstab"
$env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
bash -lc "exec 0</dev/null; exec 2>&1; cd $env:APPVEYOR_BUILD_FOLDER; bash -x ./bootstrap && mkdir -p build && cd build && ../configure && make"
From 73f84dac006b7417f9331c7c3c7566a762506bdf Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 01:21:38 +0000
Subject: [PATCH 3/9] Disable cache in appveyor
---
appveyor.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index ef545009..feed38c7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -57,6 +57,3 @@ build_script:
bash -lc "echo 'C:\MinGW /mingw' > /etc/fstab"
$env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
bash -lc "exec 0</dev/null; exec 2>&1; cd $env:APPVEYOR_BUILD_FOLDER; bash -x ./bootstrap && mkdir -p build && cd build && ../configure && make"
-
-cache:
- - build
From cd12b13cb678f5893e5e9ab7d4c4c97c79e6d5e9 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 01:41:02 +0000
Subject: [PATCH 4/9] Use AC_INCLUDES_DEFAULT
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 03e5634f..f5d5783d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,14 +79,14 @@ esac
# Checks for header files.
AC_HEADER_STDC
+
+AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h sys/types.h], [], [AC_MSG_ERROR([Compiling libhttpserver requires standard UNIX headers files])], [AC_INCLUDES_DEFAULT])
+
AC_CHECK_HEADER([stdint.h],[],[AC_MSG_ERROR("stdint.h not found")])
AC_CHECK_HEADER([inttypes.h],[],[AC_MSG_ERROR("inttypes.h not found")])
-AC_CHECK_HEADER([errno.h],[],[AC_MSG_ERROR("errno.h not found")])
AC_CHECK_HEADER([unistd.h],[],[AC_MSG_ERROR("unistd.h not found")])
AC_CHECK_HEADER([ctype.h],[],[AC_MSG_ERROR("cctype not found")])
AC_CHECK_HEADER([regex.h],[],[AC_MSG_ERROR("regex.h not found")])
-AC_CHECK_HEADER([sys/stat.h],[],[AC_MSG_ERROR("sys/stat.h not found")])
-AC_CHECK_HEADER([sys/types.h],[],[AC_MSG_ERROR("sys/types.h not found")])
AC_CHECK_HEADER([$NETWORK_HEADER],[],[AC_MSG_ERROR("$NETWORK_HEADER not found")])
AC_CHECK_HEADER([signal.h],[],[AC_MSG_ERROR("signal.h not found")])
From 0ab6088f50bed99005e90c7e5eeaa2c4f5130f68 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 01:46:56 +0000
Subject: [PATCH 5/9] Re-ordering checked libraries
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f5d5783d..30f56fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ esac
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h sys/types.h], [], [AC_MSG_ERROR([Compiling libhttpserver requires standard UNIX headers files])], [AC_INCLUDES_DEFAULT])
+AC_CHECK_HEADERS([sys/stat.h sys/types.h fcntl.h math.h errno.h limits.h stdio.h locale.h], [], [AC_MSG_ERROR([Compiling libhttpserver requires standard UNIX headers files])], [AC_INCLUDES_DEFAULT])
AC_CHECK_HEADER([stdint.h],[],[AC_MSG_ERROR("stdint.h not found")])
AC_CHECK_HEADER([inttypes.h],[],[AC_MSG_ERROR("inttypes.h not found")])
From c326c9519e1d9bbcbd337b6573d80a8aeb30dad8 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 02:40:48 +0000
Subject: [PATCH 6/9] Re-align appveyor script with the suggested one
---
appveyor.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index feed38c7..76c2431e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,9 +12,9 @@ skip_commits:
environment:
global:
- APPVEYOR_SAVE_CACHE_ON_ERROR: true
EVENT_TESTS_PARALLEL: 20
EVENT_BUILD_PARALLEL: 10
+ CYG_ROOT: C:/MinGW/msys/1.0
matrix:
- Platform: Cygwin32
- Platform: MinGW32
@@ -49,11 +49,10 @@ init:
- 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
- 'echo Cygwin root is: %CYG_ROOT%'
install:
- - C:\MinGW\bin\mingw-get install autotools autoconf automake
+ - C:\MinGW\bin\mingw-get install gcc g++ autotools autoconf automake
build_script:
- ps: |
- $env:PATH="$env:C:\cygwin\bin;C:\MinGW\bin;$($env:PATH)"
- bash -lc "echo 'C:\cygwin /cygwin' > /etc/fstab"
+ $env:PATH="$env:C:\CYG_ROOT\bin;C:\MinGW\bin;$($env:PATH)"
bash -lc "echo 'C:\MinGW /mingw' > /etc/fstab"
$env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
bash -lc "exec 0</dev/null; exec 2>&1; cd $env:APPVEYOR_BUILD_FOLDER; bash -x ./bootstrap && mkdir -p build && cd build && ../configure && make"
From c4d0fb527aea8632610d56428d2c069cbabadbf9 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 02:44:10 +0000
Subject: [PATCH 7/9] Add m4 to the list of packages
---
appveyor.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/appveyor.yml b/appveyor.yml
index 76c2431e..3768a624 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -49,7 +49,7 @@ init:
- 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
- 'echo Cygwin root is: %CYG_ROOT%'
install:
- - C:\MinGW\bin\mingw-get install gcc g++ autotools autoconf automake
+ - C:\MinGW\bin\mingw-get install gcc g++ autotools autoconf automake m4
build_script:
- ps: |
$env:PATH="$env:C:\CYG_ROOT\bin;C:\MinGW\bin;$($env:PATH)"
From 1a13c8bb135bb57e1804a20c14a9037b0a1e843a Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 02:46:28 +0000
Subject: [PATCH 8/9] Add msys to appveyor
---
appveyor.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/appveyor.yml b/appveyor.yml
index 3768a624..fca46534 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -49,7 +49,7 @@ init:
- 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
- 'echo Cygwin root is: %CYG_ROOT%'
install:
- - C:\MinGW\bin\mingw-get install gcc g++ autotools autoconf automake m4
+ - C:\MinGW\bin\mingw-get install gcc g++ autotools autoconf automake msys-base msys-m4
build_script:
- ps: |
$env:PATH="$env:C:\CYG_ROOT\bin;C:\MinGW\bin;$($env:PATH)"
From 4ba5944c84ed376f982afd47d2400efa3346dad5 Mon Sep 17 00:00:00 2001
From: Sebastiano Merlino <electrictwister2000@gmail.com>
Date: Sun, 20 Jan 2019 02:51:40 +0000
Subject: [PATCH 9/9] Fix appveyor path
---
appveyor.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/appveyor.yml b/appveyor.yml
index fca46534..19c42d80 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -52,7 +52,7 @@ install:
- C:\MinGW\bin\mingw-get install gcc g++ autotools autoconf automake msys-base msys-m4
build_script:
- ps: |
- $env:PATH="$env:C:\CYG_ROOT\bin;C:\MinGW\bin;$($env:PATH)"
+ $env:PATH="$env;C:\MinGW\msys\1.0\bin;C:\CYG_ROOT\bin;C:\MinGW\bin;$($env:PATH)"
bash -lc "echo 'C:\MinGW /mingw' > /etc/fstab"
$env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
bash -lc "exec 0</dev/null; exec 2>&1; cd $env:APPVEYOR_BUILD_FOLDER; bash -x ./bootstrap && mkdir -p build && cd build && ../configure && make"