From 808243df47abdbebb93e3cb42d9593f950f662cf Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:04:48 +0000 Subject: [PATCH 01/35] Initial appveyor config --- appveyor.yml | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..e58f246e --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,103 @@ +version: 2.2.0.{build} + +branches: + except: + - /.*travis.*/ +skip_commits: + message: /travis/ + files: + - .travis.yml + +environment: + global: + EVENT_TESTS_PARALLEL: 20 + EVENT_BUILD_PARALLEL: 10 + MSYS_PATH: C:\msys64 + CYGWIN_PATH: C:\cygwin64 + MINGW_W64_5_3_0: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0 + MINGW_W64_6_3_0_I686: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1 + MINGW_W64_6_3_0_X86_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1 + MINGW_W64_7_3_0_X86_64: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0 + MINGW_W64_8_1_0_X86_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 + MINGW_W64_7_2_0_X86_64: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1 + matrix: + - os: Visual Studio 2013 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_5_3_0% + - os: Visual Studio 2013 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_6_3_0_I686% + - os: Visual Studio 2013 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_6_3_0_X86_64% + - os: Visual Studio 2013 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_7_3_0_X86_64% + - os: Visual Studio 2013 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_8_1_0_X86_64% + - os: Visual Studio 2013 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_7_2_0_X86_64% + - os: Visual Studio 2015 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_5_3_0% + - os: Visual Studio 2015 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_6_3_0_I686% + - os: Visual Studio 2015 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_6_3_0_X86_64% + - os: Visual Studio 2015 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_7_3_0_X86_64% + - os: Visual Studio 2015 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_8_1_0_X86_64% + - os: Visual Studio 2015 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_7_2_0_X86_64% + - os: Visual Studio 2017 + COMPILER: mingw + MINGW_PATH: %MINGW_W64_7_2_0_X86_64% + - os: Visual Studio 2015 + COMPILER: cygwin + - os: Visual Studio 2017 + COMPILER: cygwin + # - os: Visual Studio 2019 + # COMPILER: cygwin +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: + - |- + case $COMPILER in + mingw) + export msys2 = "$MSYS_PATH\msys2_shell.cmd -defterm -no-start" + export buildshell="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --" + export msys2+=" -msys2 -c "\"\$@"\" --" + $msys2 pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain + $msys2 pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl + export PATH=$MINGW_PATH/bin:$PATH + export MAKE=mingw32-make # so that Autotools can find it + ;; + esac + - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz + - tar -xzf libmicrohttpd-0.9.59.tar.gz + - cd libmicrohttpd-0.9.59 + - $buildshell ./configure --disable-examples --enable-poll=no + - $buildshell make + - $buildshell make install + - cd .. + - $buildshell ./bootstrap + - mkdir build + - cd build + - export MANIFEST_TOOL='no' + - $buildshell make +build_script: + - $buildshell make check + - $buildshell cat test/test-suite.log From 1417ae523a5430df2219a27afee4824f5d5d38df Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:06:51 +0000 Subject: [PATCH 02/35] Fix var reference --- appveyor.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e58f246e..5ba8477c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,47 +23,47 @@ environment: matrix: - os: Visual Studio 2013 COMPILER: mingw - MINGW_PATH: %MINGW_W64_5_3_0% + MINGW_PATH: $MINGW_W64_5_3_0 - os: Visual Studio 2013 COMPILER: mingw - MINGW_PATH: %MINGW_W64_6_3_0_I686% + MINGW_PATH: $MINGW_W64_6_3_0_I686 - os: Visual Studio 2013 COMPILER: mingw - MINGW_PATH: %MINGW_W64_6_3_0_X86_64% + MINGW_PATH: $MINGW_W64_6_3_0_X86_64 - os: Visual Studio 2013 COMPILER: mingw - MINGW_PATH: %MINGW_W64_7_3_0_X86_64% + MINGW_PATH: $MINGW_W64_7_3_0_X86_64 - os: Visual Studio 2013 COMPILER: mingw - MINGW_PATH: %MINGW_W64_8_1_0_X86_64% + MINGW_PATH: $MINGW_W64_8_1_0_X86_64 - os: Visual Studio 2013 COMPILER: mingw - MINGW_PATH: %MINGW_W64_7_2_0_X86_64% + MINGW_PATH: $MINGW_W64_7_2_0_X86_64 - os: Visual Studio 2015 COMPILER: mingw - MINGW_PATH: %MINGW_W64_5_3_0% + MINGW_PATH: $MINGW_W64_5_3_0 - os: Visual Studio 2015 COMPILER: mingw - MINGW_PATH: %MINGW_W64_6_3_0_I686% + MINGW_PATH: $MINGW_W64_6_3_0_I686 - os: Visual Studio 2015 COMPILER: mingw - MINGW_PATH: %MINGW_W64_6_3_0_X86_64% + MINGW_PATH: $MINGW_W64_6_3_0_X86_64 - os: Visual Studio 2015 COMPILER: mingw - MINGW_PATH: %MINGW_W64_7_3_0_X86_64% + MINGW_PATH: $MINGW_W64_7_3_0_X86_64 - os: Visual Studio 2015 COMPILER: mingw - MINGW_PATH: %MINGW_W64_8_1_0_X86_64% + MINGW_PATH: $MINGW_W64_8_1_0_X86_64 - os: Visual Studio 2015 COMPILER: mingw - MINGW_PATH: %MINGW_W64_7_2_0_X86_64% + MINGW_PATH: $MINGW_W64_7_2_0_X86_64 - os: Visual Studio 2017 COMPILER: mingw - MINGW_PATH: %MINGW_W64_7_2_0_X86_64% - - os: Visual Studio 2015 - COMPILER: cygwin - - os: Visual Studio 2017 - COMPILER: cygwin + MINGW_PATH: $MINGW_W64_7_2_0_X86_64 + # - os: Visual Studio 2015 + # COMPILER: cygwin + # - os: Visual Studio 2017 + # COMPILER: cygwin # - os: Visual Studio 2019 # COMPILER: cygwin init: From 66787fe6097b25606fdd2ba91a943b29497ce512 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:17:09 +0000 Subject: [PATCH 03/35] Fix command lines for windows --- appveyor.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5ba8477c..b6a32536 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,29 +75,28 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - |- - case $COMPILER in - mingw) - export msys2 = "$MSYS_PATH\msys2_shell.cmd -defterm -no-start" - export buildshell="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --" - export msys2+=" -msys2 -c "\"\$@"\" --" - $msys2 pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain - $msys2 pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl - export PATH=$MINGW_PATH/bin:$PATH - export MAKE=mingw32-make # so that Autotools can find it + if %COMPILER%==mingw( + set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" + set buildshell="%msys2% -mingw64 -full-path -here" + set msys2="%msys2% -msys2" + call %msys2% -c "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" + call %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" + set PATH=%MINGW_PATH%/bin;%PATH% + set MAKE=mingw32-make # so that Autotools can find it ;; - esac + ) - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - - $buildshell ./configure --disable-examples --enable-poll=no - - $buildshell make - - $buildshell make install + - call %buildshell% -c "./configure --disable-examples --enable-poll=no" + - call %buildshell% -c "make" + - call %buildshell% -c "make install" - cd .. - - $buildshell ./bootstrap + - call %buildshell% -c "./bootstrap" - mkdir build - cd build - export MANIFEST_TOOL='no' - - $buildshell make + - call %buildshell% -c "make" build_script: - - $buildshell make check - - $buildshell cat test/test-suite.log + - call %buildshell% -c "make check" + - call %buildshell% -c "cat test/test-suite.log" From dd295f126d28e1cbb2b6ca3b52c84128d44838b2 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:19:17 +0000 Subject: [PATCH 04/35] Fix if statement --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b6a32536..99ce8b7b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,7 +75,7 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - |- - if %COMPILER%==mingw( + if %COMPILER%==mingw ( set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" set buildshell="%msys2% -mingw64 -full-path -here" set msys2="%msys2% -msys2" From df46bfa85d661f84f16b994254056264873cdfb1 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:22:30 +0000 Subject: [PATCH 05/35] Fix if statement --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 99ce8b7b..d9a5099f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,7 +83,6 @@ install: call %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" set PATH=%MINGW_PATH%/bin;%PATH% set MAKE=mingw32-make # so that Autotools can find it - ;; ) - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz From e11ce03e3ae61bfed25425dff3fea6533c7bb8be Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:23:07 +0000 Subject: [PATCH 06/35] Fix if statement --- appveyor.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d9a5099f..195f4cd3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,15 +75,13 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - |- - if %COMPILER%==mingw ( - set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" - set buildshell="%msys2% -mingw64 -full-path -here" - set msys2="%msys2% -msys2" - call %msys2% -c "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" - call %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" - set PATH=%MINGW_PATH%/bin;%PATH% - set MAKE=mingw32-make # so that Autotools can find it - ) + set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" + set buildshell="%msys2% -mingw64 -full-path -here" + set msys2="%msys2% -msys2" + call %msys2% -c "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" + call %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" + set PATH=%MINGW_PATH%/bin;%PATH% + set MAKE=mingw32-make # so that Autotools can find it - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 528cf2cf2a1b69d930a87707eec7a62908d1e7af Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:27:03 +0000 Subject: [PATCH 07/35] Fix call statements --- appveyor.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 195f4cd3..4156b828 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,25 +75,25 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - |- - set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" - set buildshell="%msys2% -mingw64 -full-path -here" - set msys2="%msys2% -msys2" - call %msys2% -c "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" - call %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" - set PATH=%MINGW_PATH%/bin;%PATH% - set MAKE=mingw32-make # so that Autotools can find it + msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" + buildshell="%msys2% -mingw64 -full-path -here" + msys2="%msys2% -msys2" + %msys2% -c "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" + %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" + PATH=%MINGW_PATH%/bin;%PATH% + MAKE=mingw32-make # so that Autotools can find it - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - - call %buildshell% -c "./configure --disable-examples --enable-poll=no" - - call %buildshell% -c "make" - - call %buildshell% -c "make install" + - %buildshell% -c "./configure --disable-examples --enable-poll=no" + - %buildshell% -c "make" + - %buildshell% -c "make install" - cd .. - - call %buildshell% -c "./bootstrap" + - %buildshell% -c "./bootstrap" - mkdir build - cd build - export MANIFEST_TOOL='no' - - call %buildshell% -c "make" + - %buildshell% -c "make" build_script: - - call %buildshell% -c "make check" - - call %buildshell% -c "cat test/test-suite.log" + - %buildshell% -c "make check" + - %buildshell% -c "cat test/test-suite.log" From 46d6ac035bc4cd3484bc973d868bebcf20cd59ac Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:36:51 +0000 Subject: [PATCH 08/35] Fix call statements --- appveyor.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4156b828..3ce7a0da 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,25 +75,25 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - |- - msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" - buildshell="%msys2% -mingw64 -full-path -here" - msys2="%msys2% -msys2" + set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" + set buildshell="%msys2% -mingw64 -full-path -here" + set msys2="%msys2% -msys2" %msys2% -c "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" - PATH=%MINGW_PATH%/bin;%PATH% - MAKE=mingw32-make # so that Autotools can find it + set PATH=%MINGW_PATH%/bin;%PATH% + set MAKE=mingw32-make # so that Autotools can find it - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - - %buildshell% -c "./configure --disable-examples --enable-poll=no" - - %buildshell% -c "make" - - %buildshell% -c "make install" + - call %buildshell% -c "./configure --disable-examples --enable-poll=no" + - call %buildshell% -c "make" + - call %buildshell% -c "make install" - cd .. - - %buildshell% -c "./bootstrap" + - call %buildshell% -c "./bootstrap" - mkdir build - cd build - export MANIFEST_TOOL='no' - - %buildshell% -c "make" + - call %buildshell% -c "make" build_script: - - %buildshell% -c "make check" - - %buildshell% -c "cat test/test-suite.log" + - call %buildshell% -c "make check" + - call %buildshell% -c "cat test/test-suite.log" From 7a0907b8b0b28686732d7e9c5f94421ece77a3a4 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:45:55 +0000 Subject: [PATCH 09/35] Use bash --- appveyor.yml | 68 +++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 54 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3ce7a0da..548d1f84 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,45 +21,7 @@ environment: MINGW_W64_8_1_0_X86_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 MINGW_W64_7_2_0_X86_64: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1 matrix: - - os: Visual Studio 2013 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_5_3_0 - - os: Visual Studio 2013 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_6_3_0_I686 - - os: Visual Studio 2013 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_6_3_0_X86_64 - - os: Visual Studio 2013 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_7_3_0_X86_64 - - os: Visual Studio 2013 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_8_1_0_X86_64 - - os: Visual Studio 2013 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_7_2_0_X86_64 - - os: Visual Studio 2015 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_5_3_0 - - os: Visual Studio 2015 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_6_3_0_I686 - - os: Visual Studio 2015 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_6_3_0_X86_64 - - os: Visual Studio 2015 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_7_3_0_X86_64 - - os: Visual Studio 2015 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_8_1_0_X86_64 - - os: Visual Studio 2015 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_7_2_0_X86_64 - - os: Visual Studio 2017 - COMPILER: mingw - MINGW_PATH: $MINGW_W64_7_2_0_X86_64 + - os: Visual Studio 2019 # - os: Visual Studio 2015 # COMPILER: cygwin # - os: Visual Studio 2017 @@ -75,25 +37,23 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - |- - set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" - set buildshell="%msys2% -mingw64 -full-path -here" - set msys2="%msys2% -msys2" - %msys2% -c "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" - %msys2% -c "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" - set PATH=%MINGW_PATH%/bin;%PATH% - set MAKE=mingw32-make # so that Autotools can find it + #set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" + #set buildshell="%msys2% -mingw64 -full-path -here" + #set msys2="%msys2% -msys2" + set PATH="%MSYS_PATH%\usr\bin;%MINGW_PATH%\bin;%PATH%" + bash -lc "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" + bash -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - - call %buildshell% -c "./configure --disable-examples --enable-poll=no" - - call %buildshell% -c "make" - - call %buildshell% -c "make install" + - bash -lc "./configure --disable-examples --enable-poll=no" + - bash -lc "make" + - bash -lc "make install" - cd .. - - call %buildshell% -c "./bootstrap" + - bash -lc "./bootstrap" - mkdir build - cd build - - export MANIFEST_TOOL='no' - - call %buildshell% -c "make" + - bash -lc "MANIFEST_TOOL='no'; make" build_script: - - call %buildshell% -c "make check" - - call %buildshell% -c "cat test/test-suite.log" + - bash -lc "make check" + - bash -lc "cat test/test-suite.log" From c6022b7cdf4de818b96bfaef34df9e119f9ff0a3 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:46:33 +0000 Subject: [PATCH 10/35] Fix syntax --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 548d1f84..53dffd43 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,9 +37,6 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - |- - #set msys2="%MSYS_PATH%\msys2_shell.cmd -defterm -no-start" - #set buildshell="%msys2% -mingw64 -full-path -here" - #set msys2="%msys2% -msys2" set PATH="%MSYS_PATH%\usr\bin;%MINGW_PATH%\bin;%PATH%" bash -lc "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" bash -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" From df8e0918f5babc20d485ce942eebc51c456c7765 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:49:55 +0000 Subject: [PATCH 11/35] Fix syntax --- appveyor.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 53dffd43..455e48f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,19 +38,19 @@ init: install: - |- set PATH="%MSYS_PATH%\usr\bin;%MINGW_PATH%\bin;%PATH%" - bash -lc "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" - bash -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" + bash.exe -lc "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" + bash.exe -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - - bash -lc "./configure --disable-examples --enable-poll=no" - - bash -lc "make" - - bash -lc "make install" + - bash.exe -lc "./configure --disable-examples --enable-poll=no" + - bash.exe -lc "make" + - bash.exe -lc "make install" - cd .. - - bash -lc "./bootstrap" + - bash.exe -lc "./bootstrap" - mkdir build - cd build - - bash -lc "MANIFEST_TOOL='no'; make" + - bash.exe -lc "MANIFEST_TOOL='no'; make" build_script: - - bash -lc "make check" - - bash -lc "cat test/test-suite.log" + - bash.exe -lc "make check" + - bash.exe -lc "cat test/test-suite.log" From 406e97f1a6f88a4f5b60056edac701a32d583e46 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 23:52:49 +0000 Subject: [PATCH 12/35] Fix syntax --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 455e48f0..9a4495f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,6 +21,9 @@ environment: MINGW_W64_8_1_0_X86_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 MINGW_W64_7_2_0_X86_64: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1 matrix: + - os: Visual Studio 2013 + - os: Visual Studio 2015 + - os: Visual Studio 2017 - os: Visual Studio 2019 # - os: Visual Studio 2015 # COMPILER: cygwin From b64d9c8df6a4207b5ac876698dee560df094bac8 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 00:01:01 +0000 Subject: [PATCH 13/35] Fix syntax --- appveyor.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9a4495f9..a70338a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,10 +39,11 @@ init: - 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%' - 'echo Cygwin root is: %CYG_ROOT%' install: - - |- - set PATH="%MSYS_PATH%\usr\bin;%MINGW_PATH%\bin;%PATH%" - bash.exe -lc "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" - bash.exe -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" + - ps: |- + $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" + bash -lc "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" + bash -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" + $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From d30f05894ba2eb42b597b80e3cdb5bd009b1d3d6 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 00:05:40 +0000 Subject: [PATCH 14/35] Fix syntax --- appveyor.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a70338a0..917adac7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,20 +41,19 @@ init: install: - ps: |- $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" - bash -lc "pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain" bash -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - - bash.exe -lc "./configure --disable-examples --enable-poll=no" - - bash.exe -lc "make" - - bash.exe -lc "make install" + - bash -lc "echo $PWD && ls -l && ./configure --disable-examples --enable-poll=no" + - bash -lc "make" + - bash -lc "make install" - cd .. - - bash.exe -lc "./bootstrap" + - bash -lc "./bootstrap" - mkdir build - cd build - - bash.exe -lc "MANIFEST_TOOL='no'; make" + - bash -lc "MANIFEST_TOOL='no'; make" build_script: - - bash.exe -lc "make check" - - bash.exe -lc "cat test/test-suite.log" + - bash -lc "make check" + - bash -lc "cat test/test-suite.log" From 1e4d8fd16fa3ad21054222ebf6581f0896f00f3c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 00:14:40 +0000 Subject: [PATCH 15/35] Fix syntax --- appveyor.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 917adac7..3021905d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,15 +45,10 @@ install: $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - - cd libmicrohttpd-0.9.59 - - bash -lc "echo $PWD && ls -l && ./configure --disable-examples --enable-poll=no" - - bash -lc "make" - - bash -lc "make install" - - cd .. - - bash -lc "./bootstrap" + - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no && make && make install" + - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%') && ./bootstrap" - mkdir build - - cd build - - bash -lc "MANIFEST_TOOL='no'; make" + - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && MANIFEST_TOOL='no'; make" build_script: - - bash -lc "make check" - - bash -lc "cat test/test-suite.log" + - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && make check" + - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && cat test/test-suite.log" From 3a62719416d1ff0d52f0d22dec1840226cbc46c5 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 00:20:11 +0000 Subject: [PATCH 16/35] Fix syntax --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3021905d..ced7cc37 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,7 +48,7 @@ install: - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no && make && make install" - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%') && ./bootstrap" - mkdir build - - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && MANIFEST_TOOL='no'; make" + - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && MANIFEST_TOOL='no'; ../configure --disable-fastopen; make" build_script: - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && make check" - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && cat test/test-suite.log" From 5e30513eceefdc16f870c13db515ed1b531ccf86 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 00:43:34 +0000 Subject: [PATCH 17/35] Fix syntax --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ced7cc37..47732870 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,7 @@ install: $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no && make && make install" + - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install" - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%') && ./bootstrap" - mkdir build - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && MANIFEST_TOOL='no'; ../configure --disable-fastopen; make" From 6c0151008b503734182c902e8e8794185f9f2d76 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 01:33:09 +0000 Subject: [PATCH 18/35] Getting MSYS to install packages --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 47732870..a01d39e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,8 +40,9 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - ps: |- + C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh --sysupgrade --sysupgrade + C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" - bash -lc "pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl" $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz From 01032b2b5ff6c28ecc488acd0427cd4ff5ec1e78 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 01:41:03 +0000 Subject: [PATCH 19/35] Getting MSYS to install packages directly --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a01d39e6..33e1daab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,6 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - ps: |- - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh --sysupgrade --sysupgrade C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" From d466c8c33ef0778c0428256e2302f3210dfb52a5 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 01:45:29 +0000 Subject: [PATCH 20/35] Update msys registry first --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 33e1daab..4b6a959e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,6 +40,7 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - ps: |- + C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" From 9051f5f3672a23a8613b2f2a332738084a6e8794 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 01:47:06 +0000 Subject: [PATCH 21/35] Execute commands separately --- appveyor.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4b6a959e..8e71c2d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,11 +39,10 @@ init: - 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%' - 'echo Cygwin root is: %CYG_ROOT%' install: - - ps: |- - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl - $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" - $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" + - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl + - $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" + - $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install" From ac9f4a61aebfafa7e5c7e0eb9247eef2e14af725 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 01:51:04 +0000 Subject: [PATCH 22/35] Execute each pacman command separately --- appveyor.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8e71c2d6..0c926e3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,9 +40,19 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl - - $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" - - $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout libtool + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout automake + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout make + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf-archive + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout pkg-config + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-libsystre + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-doxygen + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-gnutls + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-graphviz + - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-curl + - pc: $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" + - pc: $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xzf libmicrohttpd-0.9.59.tar.gz - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install" From 24966908958bc54eb35bb43d2477cdfa83395db0 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 03:16:44 +0000 Subject: [PATCH 23/35] Simplify the appveyor file --- appveyor.yml | 57 ++++++++++++---------------------------------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0c926e3c..14a16c18 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.0.{build} +platform: x64 branches: except: @@ -9,28 +9,11 @@ skip_commits: - .travis.yml environment: - global: - EVENT_TESTS_PARALLEL: 20 - EVENT_BUILD_PARALLEL: 10 - MSYS_PATH: C:\msys64 - CYGWIN_PATH: C:\cygwin64 - MINGW_W64_5_3_0: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0 - MINGW_W64_6_3_0_I686: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1 - MINGW_W64_6_3_0_X86_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1 - MINGW_W64_7_3_0_X86_64: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0 - MINGW_W64_8_1_0_X86_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 - MINGW_W64_7_2_0_X86_64: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1 matrix: - - os: Visual Studio 2013 - - os: Visual Studio 2015 - - os: Visual Studio 2017 - - os: Visual Studio 2019 - # - os: Visual Studio 2015 - # COMPILER: cygwin - # - os: Visual Studio 2017 - # COMPILER: cygwin - # - os: Visual Studio 2019 - # COMPILER: cygwin + - compiler: msys2 + MINGW_PREFIX: /mingw32 + MINGW_CHOST: i686-w64-mingw32 + MSYS2_ARCH: i686 init: - 'echo Building libhttpserver %version% for Windows' - 'echo System architecture: %PLATFORM%' @@ -39,26 +22,12 @@ init: - 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%' - 'echo Cygwin root is: %CYG_ROOT%' install: - - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout libtool - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout automake - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout make - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout autoconf-archive - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout pkg-config - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-libsystre - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-doxygen - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-gnutls - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-graphviz - - C:\msys64\usr\bin\pacman -Syu --noconfirm --disable-download-timeout mingw-w64-x86_64-curl - - pc: $env:PATH="$env;C:\msys64\bin;C:\msys64\usr\bin;$($env:PATH)" - - pc: $env:APPVEYOR_BUILD_FOLDER = $env:APPVEYOR_BUILD_FOLDER -replace "\\", "/" - - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - - tar -xzf libmicrohttpd-0.9.59.tar.gz - - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install" - - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%') && ./bootstrap" - - mkdir build - - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && MANIFEST_TOOL='no'; ../configure --disable-fastopen; make" + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{autoconf,libtool,automake,make,autoconf-archive,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "tar -xzf libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen; make"' build_script: - - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && make check" - - bash -lc "cd $(echo '%APPVEYOR_BUILD_FOLDER%')/build && cat test/test-suite.log" + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && make check"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' From a7b40939f60db1d7fc4540226e5df5cc74179c74 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 03:18:08 +0000 Subject: [PATCH 24/35] Removed pre-installed packages --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 14a16c18..f654bf96 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ init: - 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%' - 'echo Cygwin root is: %CYG_ROOT%' install: - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{autoconf,libtool,automake,make,autoconf-archive,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "tar -xzf libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install"' From a17a37cc1531405647a4476b8fc2b9b0574350d2 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 03:24:08 +0000 Subject: [PATCH 25/35] Fix paths --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f654bf96..f7db681a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,8 +23,8 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "tar -xzf libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen; make"' From 65eee726c533736ea2db710410ab8310016c83b9 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 03:28:32 +0000 Subject: [PATCH 26/35] Use MinGW64 --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f7db681a..eb92dc60 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,9 +11,9 @@ skip_commits: environment: matrix: - compiler: msys2 - MINGW_PREFIX: /mingw32 - MINGW_CHOST: i686-w64-mingw32 - MSYS2_ARCH: i686 + MINGW_PREFIX: /mingw64 + MINGW_CHOST: x86_64-w64-mingw32 + MSYS2_ARCH: x86_64 init: - 'echo Building libhttpserver %version% for Windows' - 'echo System architecture: %PLATFORM%' From a45692a8c5458fc4260a6d618274c30b88289ce2 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 03:38:25 +0000 Subject: [PATCH 27/35] ls tools --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index eb92dc60..acb8aabc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,6 +22,7 @@ init: - 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%' - 'echo Cygwin root is: %CYG_ROOT%' install: + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "ls /C/msys64"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' From 4aea90d608d95e6c436ddcd0ef2760d087533a1a Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 03:48:54 +0000 Subject: [PATCH 28/35] change prefix --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index acb8aabc..aa10909b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,6 @@ skip_commits: environment: matrix: - compiler: msys2 - MINGW_PREFIX: /mingw64 MINGW_CHOST: x86_64-w64-mingw32 MSYS2_ARCH: x86_64 init: @@ -26,9 +25,9 @@ install: - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --enable-shared && make && make install"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen; make"' + - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' build_script: - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && make check"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' From b6c0757df723e747cdf137a9ce86176a7c46fbf6 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 04:00:31 +0000 Subject: [PATCH 29/35] Use msys shell --- appveyor.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index aa10909b..32985291 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,13 +21,12 @@ init: - 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%' - 'echo Cygwin root is: %CYG_ROOT%' install: - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "ls /C/msys64"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -msys2 -c "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' build_script: - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && make check"' - - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' From 973598ce0d79bc2c77794e3c9d800aa46752eeab Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 04:07:03 +0000 Subject: [PATCH 30/35] Fix command --- appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 32985291..850d1541 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,11 +22,11 @@ init: - 'echo Cygwin root is: %CYG_ROOT%' install: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -msys2 -c "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' build_script: - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' From ba0a0f6bd82d508fa6c0c7e57bf95a3cebac0527 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 04:17:38 +0000 Subject: [PATCH 31/35] Print some paths --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 850d1541..0085ff70 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,6 +26,7 @@ install: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "ls /C/msys64/include && ls /C/msys64/usr/include"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' build_script: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' From 6bd83b23359feeb9310928da1ae93c46f8e5afdd Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 04:24:18 +0000 Subject: [PATCH 32/35] print few paths --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0085ff70..d449ae24 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,8 @@ install: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "ls /C/msys64/include && ls /C/msys64/usr/include"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "ls /C/msys64/include"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "ls /C/msys64/usr/include"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' build_script: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' From 5ad630e294701e0ffb8974ab0fe2e98b37a74a9d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 04:30:43 +0000 Subject: [PATCH 33/35] fix the prefix --- appveyor.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d449ae24..995a0627 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,11 +24,9 @@ install: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -msys2 -c "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/ && make && make install"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/usr && make && make install"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "ls /C/msys64/include"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "ls /C/msys64/usr/include"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/; make"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/usr; make"' build_script: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' From 4e27ddc9babdd9252c9c5902b82df9726d3a5dc0 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 12 Jul 2020 04:39:24 +0000 Subject: [PATCH 34/35] add include and lib --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 995a0627..4504a6bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ install: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/usr && make && make install"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/usr; make"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/usr CXXFLAGS=-I/C/msys64/usr/include LDFLAGS=-L/C/msys64/usr/lib; make"' build_script: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"' From 9397b2dd1af648c7b074835b2b58407e3548c9ad Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 11 Jul 2020 21:47:23 -0700 Subject: [PATCH 35/35] isolate libmicrohttpd --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4504a6bf..4fc56074 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,9 +24,9 @@ install: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -msys2 -c "pacman --noconfirm --force -S --needed mingw-w64-$MSYS2_ARCH-{libtool,make,pkg-config,libsystre,doxygen,gnutls,graphviz,curl}"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && tar -xzf libmicrohttpd-0.9.59.tar.gz"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64/usr && make && make install"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/libmicrohttpd-0.9.59 && ./configure --disable-examples --enable-poll=no --prefix /C/msys64 && make && make install"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"' - - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64/usr CXXFLAGS=-I/C/msys64/usr/include LDFLAGS=-L/C/msys64/usr/lib; make"' + - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && MANIFEST_TOOL=no; ../configure --disable-fastopen --prefix /C/msys64 CXXFLAGS=-I/C/msys64/include LDFLAGS=-L/C/msys64/lib; make"' build_script: - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && make check"' - 'if "%compiler%"=="msys2" C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "cd $APPVEYOR_BUILD_FOLDER/build && cat test/test-suite.log"'