From ad5fe59b06d389c9c0824fc6527570eab76ab0bb Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 9 Feb 2019 22:48:39 +0000 Subject: [PATCH 001/104] Enable windows build --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 68f2d125..e01415bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: cpp os: - linux - osx + - windows compiler: - gcc - clang @@ -20,6 +21,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 @@ -112,6 +114,10 @@ matrix: env: DEBUG="debug" COVERAGE="coverage" - compiler: clang env: LINKING='static' + - os: windows + env: DEBUG="debug" COVERAGE="coverage" + - os: windows + env: LINKING='static' include: - os: linux addons: From b97428454b6eeb8facbb2650c486b3c411da9cb7 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 9 Feb 2019 23:00:37 +0000 Subject: [PATCH 002/104] Forcing installation of threading models --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e01415bd..d82d4a03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From cf6f26f105f38d682cba3eedc65a742a2b6949e3 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 9 Feb 2019 23:09:15 +0000 Subject: [PATCH 003/104] Additional windows libraries --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d82d4a03..321dd8e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,8 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install cygwin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From e46e38139ceab118a310ee307153547a0d1a62d4 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 9 Feb 2019 23:46:45 +0000 Subject: [PATCH 004/104] Avoid setting paths on windows --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 321dd8e2..7114dd33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,10 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" - - export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib" - - export PATH=$PATH:/usr/local/lib - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib - - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install info install-info; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install codecov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi From 6365204de088f4feb05afb23b0fbac3f36d34bd3 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 10 Feb 2019 00:09:06 +0000 Subject: [PATCH 005/104] Try to use msys shell --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7114dd33..d985689a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,11 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install cygwin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then msys2_shell.cmd; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi @@ -21,10 +26,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install cygwin; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 84a1684a98b33ba4460475cd6c8e219040e8af7d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 01:42:28 +0000 Subject: [PATCH 006/104] Printing path on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d985689a..b968f30d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install cygwin; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then msys2_shell.cmd; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi @@ -26,6 +25,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi + - echo $PATH; - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 8d08f1555189135792616261fc9e962a492574fa Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 01:58:31 +0000 Subject: [PATCH 007/104] Printing variables and adding msys to travis path --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b968f30d..f484de7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,10 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=$PATH:/c/tools/msys64; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64; fi - echo $PATH; + - env - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 583fcbea3a81d6a7d261be9858ffde698a3fb032 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 02:14:37 +0000 Subject: [PATCH 008/104] Inverting priority between msys and mingww --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f484de7c..89c7d39b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=$PATH:/c/tools/msys64; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:$PATH; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64; fi - echo $PATH; - env From 1f38a1f0b4a2e2b3bb3374eba93d55301f34d5cd Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 02:35:31 +0000 Subject: [PATCH 009/104] Update path on windows builds --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89c7d39b..c7bfaf72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,10 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:$PATH; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:$PATH; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64/mingw64/bin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64/mingw32/bin; fi - echo $PATH; - env - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz From 930209aed5f81f6d2a58328e35aeaca1a506df46 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 02:49:03 +0000 Subject: [PATCH 010/104] Print msys content --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7bfaf72..fcf93d9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:$PATH; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/tools/msys64; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64/mingw64/bin; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64/mingw32/bin; fi - echo $PATH; From f52c85c56497b035b8b31327d9220a7f14423aa3 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 02:49:26 +0000 Subject: [PATCH 011/104] No need to install cygwin --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fcf93d9e..4dfa0936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ before_install: - eval "${MATRIX_EVAL}" - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install cygwin; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi From 703aa5604c7f06a8cea3207f313792a63e8f2a84 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 03:09:03 +0000 Subject: [PATCH 012/104] Fixing path variables in mingw --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dfa0936..f38dab67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,10 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:$PATH; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/tools/msys64; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64/mingw64/bin; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls /c/tools/msys64/mingw32/bin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:/c/tools/msys64/usr/bin:$PATH; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/c/tools/msys64/usr/lib"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXLAGS="$CXXLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi - echo $PATH; - env - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz From f72bda08b6eb6b13b51eafb2fa95e2cced5c1def Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 03:13:35 +0000 Subject: [PATCH 013/104] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f38dab67..f065b490 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:/c/tools/msys64/usr/bin:$PATH; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/c/tools/msys64/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXLAGS="$CXXLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi - echo $PATH; - env - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz From 98e9930a4b480fee598a4ed7b85ba9d094a9e738 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 03:22:14 +0000 Subject: [PATCH 014/104] Re-establish cygwin (to have shell commands) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f065b490..bc9f9bcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ before_install: - eval "${MATRIX_EVAL}" - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install cygwin; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi From 8cc9776e666f9eafb5101db279231d7f614ec1de Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 04:45:56 +0000 Subject: [PATCH 015/104] Avoid overriding path --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc9f9bcb..908df393 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ before_install: - eval "${MATRIX_EVAL}" - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install cygwin; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi @@ -25,7 +24,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:/c/tools/msys64/usr/bin:$PATH; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/c/tools/msys64/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi From a7195295e00c45529b2d5e21f690e81c2fb95753 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 05:18:30 +0000 Subject: [PATCH 016/104] Reconfiguring libraries in mingw --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 908df393..60836da5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,6 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install curl; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install mingw; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi @@ -24,14 +21,12 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/c/tools/msys64/usr/lib"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/c/tools/msys64/usr/include -I/c/tools/msys64/usr/include/arpa"; fi - - echo $PATH; - - env - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoreconf -i; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then automake --add-missing; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoconf; fi - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; else ./configure --disable-examples; fi - make - sudo make install From e01b52eda952401588327f5bf55b9e9edb79020c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 05:30:00 +0000 Subject: [PATCH 017/104] Install mingw base development kit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 60836da5..d6f61068 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S base-devel; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 85bb8ae885b2d7c310b6d6e21b7aae8ae9b48291 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 05:58:14 +0000 Subject: [PATCH 018/104] Print mingw path content --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6f61068..f1e5dd8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S base-devel; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin/; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From c6527d5e57d6d67b17368bac402a0bb81181b6f3 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 06:45:43 +0000 Subject: [PATCH 019/104] Print full mingw path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f1e5dd8f..8b7fecfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin/; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From ae01168f71cb7b0c86791dad94995a45231cd163 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 07:11:17 +0000 Subject: [PATCH 020/104] Install GnuWin --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b7fecfe..e7249053 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install gnuwin; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi @@ -21,7 +22,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From a32f996f405eedf6b96b48436f77290ae52b8db6 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 07:37:23 +0000 Subject: [PATCH 021/104] Add optional pacman software --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e7249053..e47f0399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install gnuwin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi @@ -22,6 +22,9 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi + - which env; + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then /c/tools/msys64/usr/bin/pacman.exe -Syuu; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then /c/tools/msys64/usr/bin/pacman.exe -S --needed base-devel; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 314dd980876892e065c6764acede336d313dd295 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 08:01:17 +0000 Subject: [PATCH 022/104] Set-up custom toolchain on windows --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e47f0399..9a652efe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,10 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:/c/tools/msys64/usr/bin; fi - which env; - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then /c/tools/msys64/usr/bin/pacman.exe -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then /c/tools/msys64/usr/bin/pacman.exe -S --needed base-devel; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain git; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 7b0d8417f94885854fac3401eeab3484306a5aeb Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 00:34:39 -0800 Subject: [PATCH 023/104] launch mingw shell --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a652efe..c143d99a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:/c/tools/msys64/usr/bin; fi - - which env; + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then mingw64; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain git; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz From 9140115a3cf8ec50ea466843fa8aeed41673a255 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 12:36:55 -0800 Subject: [PATCH 024/104] Print paths in windows --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c143d99a..3948c9fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install msys2; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi @@ -23,9 +22,10 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:/c/tools/msys64/usr/bin; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then mingw64; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain git; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /bin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /usr/bin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey/bin; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 From 81f8e867cda0e8e30479797ece1877dd26aedcbf Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 12:44:53 -0800 Subject: [PATCH 025/104] Do not reset path --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3948c9fb..48ec18f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/tools/msys64:/c/tools/msys64/mingw64/bin:/c/tools/msys64/mingw32/bin:/c/tools/msys64/usr/bin; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /bin; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /usr/bin; fi From a90dae843ccbaf63e73969db0d995d4d64b33d5d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 16:42:55 -0800 Subject: [PATCH 026/104] Manually adding msys on top of mingw --- .travis.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48ec18f6..dda0d85f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,17 +21,23 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /bin; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /usr/bin; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ls -R /c/ProgramData/chocolatey/bin; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then + curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys2-base-x86_64-20181211.tar.xz -o msys2-base-x86_64-20181211.tar.xz ; + tar xf msys2-base-x86_64-20181211.tar.xz ; + cp -R msys64/ /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; + fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - tar -xvzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoreconf -i; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then automake --add-missing; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoconf; fi - - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; else ./configure --disable-examples; fi + - if [[ "$ARM_ARCH_DIR" != "" ]]; then + ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; + elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then + ./configure --disable-examples; + else + ./configure --disable-examples; + fi - make - sudo make install - cd .. From c2b5076f58992005f3bc2c673faba15464edc92c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 16:57:57 -0800 Subject: [PATCH 027/104] Use correct format for msys package --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dda0d85f..a43e4cde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then - curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys2-base-x86_64-20181211.tar.xz -o msys2-base-x86_64-20181211.tar.xz ; - tar xf msys2-base-x86_64-20181211.tar.xz ; + curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; + tar -xvzf msys64.tar.gz ; cp -R msys64/ /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi From 35f611f4476777fa7f89ad2376db65202a887f29 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 17:04:31 -0800 Subject: [PATCH 028/104] No need for verbosity --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a43e4cde..faf26a95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,13 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; - tar -xvzf msys64.tar.gz ; + tar -xzf msys64.tar.gz ; cp -R msys64/ /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz - - tar -xvzf libmicrohttpd-0.9.59.tar.gz + - tar -xzf libmicrohttpd-0.9.59.tar.gz - cd libmicrohttpd-0.9.59 - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; From d84aa49ffc2e79280835329cebe7aca8fcd23a59 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 17:09:27 -0800 Subject: [PATCH 029/104] set path correctly for newly installed msys --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index faf26a95..6d3fadd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ before_install: curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; tar -xzf msys64.tar.gz ; cp -R msys64/ /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; + ls /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; + export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/usr/bin:$PATH ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel; fi From a59b8085458dcd09ac9f0bef2a672fa251a9b8d9 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 17:20:49 -0800 Subject: [PATCH 030/104] Copying msys directly within mingw root --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d3fadd8..f94ce932 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; tar -xzf msys64.tar.gz ; - cp -R msys64/ /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; + cp -R msys64/* /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; ls /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/usr/bin:$PATH ; fi From ea0d9d0c2c93412a09c52f11e549890377b3d160 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 17:55:05 -0800 Subject: [PATCH 031/104] Print /usr/src in mingw --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f94ce932..8f475968 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then + ls -R /usr/src/ ; curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; tar -xzf msys64.tar.gz ; cp -R msys64/* /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; From 2070dbcf492dce71433aaae30a2d9256007952b8 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 18:34:16 -0800 Subject: [PATCH 032/104] Override base /usr/bin in windows --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f475968..c0a81ee1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,11 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then - ls -R /usr/src/ ; curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; tar -xzf msys64.tar.gz ; - cp -R msys64/* /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; - ls /c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/ ; - export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/usr/bin:$PATH ; + ls /bin ; + ls /usr/bin ; + cp -R msys64/* / ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel; fi From a011daf1f7e028f55c0a1efb3c926d904cc9f099 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 18:45:05 -0800 Subject: [PATCH 033/104] Remove duplicated executables and dlls --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0a81ee1..a04f1392 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,11 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; tar -xzf msys64.tar.gz ; - ls /bin ; - ls /usr/bin ; + rm msys64/usr/bin/cp.exe ; + rm msys64/usr/bin/msys-2.0.dll ; + rm msys64/usr/bin/msys-intl-8.dll ; + rm msys64/usr/bin/msys-iconv-2.dll ; + rm msys64/usr/bin/bash.exe ; cp -R msys64/* / ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi From c792f3f9dbabeb02a296c539a226a700f67d739d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 18:58:25 -0800 Subject: [PATCH 034/104] refresh pacman keys --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index a04f1392..849c8b46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,9 @@ before_install: rm msys64/usr/bin/bash.exe ; cp -R msys64/* / ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --init; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz From 914c540bc957396eede174fe0062a8d9d4d7aa5a Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 19:22:31 -0800 Subject: [PATCH 035/104] Stop Pacman asking for confirmation --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 849c8b46..85e3f333 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -S --needed base-devel; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm base-devel; fi - 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 0e644c629986c3348aab2b0bcb4d155905658549 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 21:05:46 -0800 Subject: [PATCH 036/104] Pacman to install specific dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85e3f333..e3f09fae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm base-devel; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls; fi - 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 6fc7b2abbac7d470fda9f81815f91d2d5efdd0e3 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 21:24:01 -0800 Subject: [PATCH 037/104] Remove redundant files --- .travis.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.travis.yml b/.travis.yml index e3f09fae..70d727a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,25 @@ before_install: rm msys64/usr/bin/msys-intl-8.dll ; rm msys64/usr/bin/msys-iconv-2.dll ; rm msys64/usr/bin/bash.exe ; + rm /usr/bin/cmp.exe ; + rm /usr/bin/diff.exe ; + rm /usr/bin/diff3.exe ; + rm /usr/bin/sdiff.exe ; + rm /etc/profile.d/perlbin.csh ; + rm /etc/profile.d/perlbin.sh ; + rm /usr/bin/perl.exe ; + rm -rf /usr/bin/core_perl/ ; + rm -rf /usr/lib/perl5/core_perl/ ; + rm /usr/share/fish/vendor_conf.d/perlbin.fish ; + rm /usr/share/makepkg-template/perl-binary-module-dependency-1.template ; + rm /usr/share/makepkg-template/perl-binary-module-dependency.template ; + rm -rf /usr/share/perl5/core_perl/ ; + rm /usr/bin/backup ; + rm /usr/bin/restore ; + rm /usr/bin/tar.exe ; + rm /usr/lib/tar/backup.sh ; + rm /usr/lib/tar/dump-remind ; + rm /usr/lib/tar/rmt.exe ; cp -R msys64/* / ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --init; fi From d435d3f327316234a5bbf78193dbe6cf38bec336 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 21:48:55 -0800 Subject: [PATCH 038/104] Configuring for mingw64 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70d727a4..89b6b5e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ./configure --disable-examples; + ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static; else ./configure --disable-examples; fi From aebe9077841ec8492a558c4ebc35dc2113230eb1 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 22:04:35 -0800 Subject: [PATCH 039/104] Add libgcrypt to the dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89b6b5e7..ce481ad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt; fi - 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 e300c6b313c75639cd7521d6eb6e08bff80388b9 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 22:33:57 -0800 Subject: [PATCH 040/104] print content of include libraries --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce481ad9..c576da18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,9 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static; + ls /usr/include/ ; + ls /usr/local/include ; + ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi From 976b945fba71c6e436ba6af3eef9bd3a317bb473 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 22:50:16 -0800 Subject: [PATCH 041/104] Use mingw installation path as prefix --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c576da18..bc97fedc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,9 +61,7 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ls /usr/include/ ; - ls /usr/local/include ; - ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; + ./configure --prefix=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/x86_64-w64-mingw32/ --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi From d73b600c83eaaf18a97090797faf06cbc80d67ac Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 23:19:21 -0800 Subject: [PATCH 042/104] Obtain installation location of packages --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index bc97fedc..e9f9fe58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,8 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql automake1.16 ; fi - 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 0f3bc64bfa2a013e60f038ad3317ad049e81ac4b Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 23:36:09 -0800 Subject: [PATCH 043/104] Add libgnutls dependency --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e9f9fe58..ee4466c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql automake1.16 ; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz From 385d646c63a8f1686be134fd6ae310a1b8e072ca Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 17 Feb 2019 23:55:30 -0800 Subject: [PATCH 044/104] Add libgnutls-devel to Pacman deps --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee4466c0..f90e9075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql automake1.16 ; fi - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz From 2d190b41fc99e2365a606fbdf51e946c1f17c24d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 18:40:37 -0800 Subject: [PATCH 045/104] Print gnutls-devel location --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f90e9075..0b8b5e36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql automake1.16 ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls-devel ; fi - 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 0415750c4ec112105376a92b0def23b7cdbb99cd Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 19:44:57 -0800 Subject: [PATCH 046/104] Fix package naming --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b8b5e36..2e68988f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql automake1.16 ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls-devel ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql libgnutls-devel ; fi - 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 b32ce8c273bf28249602e0e9925324542dd6e146 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 19:57:27 -0800 Subject: [PATCH 047/104] Use actual prefix from mingw --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e68988f..28a83bba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,16 +55,15 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql gnutls ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql automake1.16 ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Ql libgnutls-devel ; fi - 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 - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ./configure --prefix=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/x86_64-w64-mingw32/ --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; + export CPPFLAGS=/usr/include:$CPPFLAGS ; + export LDFLAGS=/usr/lib:$LDFLAGS ; + ./configure --prefix=/usr/ --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi From 1c13818299c11a057a0b8027d040c4c00c8db7e0 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 20:08:52 -0800 Subject: [PATCH 048/104] avoid setting cflags and ldflags --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28a83bba..4b7aceb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,9 +61,7 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - export CPPFLAGS=/usr/include:$CPPFLAGS ; - export LDFLAGS=/usr/lib:$LDFLAGS ; - ./configure --prefix=/usr/ --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; + ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi From 0a6098a2aff6e4d38f6fac3f95ad45932917df0a Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 20:29:01 -0800 Subject: [PATCH 049/104] Set pkg-config for success --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4b7aceb0..2ae58972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,10 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/:/usr:/usr/lib" fi ; + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib" fi ; + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -L/usr/include" fi ; + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -L/usr/include" fi ; - 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 bac3550cf7aab15b086f235867b77bf60eb6c891 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 20:32:15 -0800 Subject: [PATCH 050/104] Fix syntax --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ae58972..b157cf76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,10 +55,10 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/:/usr:/usr/lib" fi ; - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib" fi ; - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -L/usr/include" fi ; - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -L/usr/include" fi ; + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/:/usr:/usr/lib"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -L/usr/include"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -L/usr/include"; fi - 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 650b28e35a3b69bb0dc9ef99b496a3dad0edea3d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 20:41:40 -0800 Subject: [PATCH 051/104] fix inclusion variables --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b157cf76..9c0d73c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,8 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/:/usr:/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -L/usr/include"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -L/usr/include"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/usr/include"; fi - 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 05148c7545bfcdc86d6586edda9f3c897c350a82 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 21:03:02 -0800 Subject: [PATCH 052/104] separator for pkg-config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c0d73c8..73d3b904 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/:/usr:/usr/lib"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/;/usr;/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/usr/include"; fi From 80638c23e9951c5c7e3767e4ea961ac51e948f94 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 21:15:36 -0800 Subject: [PATCH 053/104] Install mingw version of pkg-config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 73d3b904..2b5be881 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/;/usr;/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi From 8d7f633b81c03bdcc8e2a882af63399b4354a6cc Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 21:24:18 -0800 Subject: [PATCH 054/104] Remove files that come from msys --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2b5be881..c1d8a009 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,9 @@ before_install: rm /usr/lib/tar/backup.sh ; rm /usr/lib/tar/dump-remind ; rm /usr/lib/tar/rmt.exe ; + rm /mingw64/bin/libwinpthread-1.dll ; + rm /mingw64/share/licenses/libwinpthread/COPYING ; + rm /mingw64/share/licenses/libwinpthread/mingw-w64-libraries/winpthreads/COPYING ; cp -R msys64/* / ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --init; fi From 1efae2752dbdbfa9f1b35be354371795f4fc8242 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 21:41:49 -0800 Subject: [PATCH 055/104] Forcing gnutls through parameter --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1d8a009..22569e1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static ; + ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static --with-gnutls=/usr ; else ./configure --disable-examples; fi From 1872af18184fb309355c7898a08208ccc1f7ec32 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 18 Feb 2019 21:57:42 -0800 Subject: [PATCH 056/104] print gnutls.h --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 22569e1d..c0f1ebf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,6 +62,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/usr/include"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then cat /usr/include/gnutls/gnutls.h ; fi - 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 dd5cd3de82392e33529d840e6e6d51405a2fbe4b Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 24 Feb 2019 11:33:26 -0800 Subject: [PATCH 057/104] Download toolchains directly in MSYS --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c0f1ebf9..aa0d3649 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/;/usr;/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi From 9e011fc997208b73bad9e77e7a65a280385dc0ec Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 24 Feb 2019 12:17:11 -0800 Subject: [PATCH 058/104] Use Msys paths for compiler and linker --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa0d3649..0f160337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,11 +57,14 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/;/usr;/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/usr/include"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CC="/usr/bin/gcc"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXX="/usr/bin/g++"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LD="/usr/bin/ld"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then cat /usr/include/gnutls/gnutls.h ; fi - 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 d9b2b2abf1314147491162ed763326b688944ebb Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 24 Feb 2019 12:29:42 -0800 Subject: [PATCH 059/104] Use pacman to install gcc --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f160337..4f3051f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm gcc autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/;/usr;/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi From e7ecac06b33f16b2d8f36d860ab7332844d16db9 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 24 Feb 2019 12:51:48 -0800 Subject: [PATCH 060/104] Use mingw64 gcc --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f3051f1..14d5688d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,9 +62,9 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/usr/include"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CC="/usr/bin/gcc"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXX="/usr/bin/g++"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LD="/usr/bin/ld"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CC="/mingw64/bin/gcc"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXX="/mingw64/bin/g++"; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LD="/mingw64/bin/ld"; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then cat /usr/include/gnutls/gnutls.h ; fi - 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 26b40d4e09ec5c5655617dff0d093ce254294a3d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 17 Aug 2019 17:16:30 -0700 Subject: [PATCH 061/104] Simplify windows build to use travis default --- .travis.yml | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a1d72ee..08f9b782 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,60 +12,11 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" - - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi - - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi - - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install info install-info; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install codecov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then - curl https://s3.amazonaws.com/libhttpserver/travis_stuff/msys64.tar.gz -o msys64.tar.gz ; - tar -xzf msys64.tar.gz ; - rm msys64/usr/bin/cp.exe ; - rm msys64/usr/bin/msys-2.0.dll ; - rm msys64/usr/bin/msys-intl-8.dll ; - rm msys64/usr/bin/msys-iconv-2.dll ; - rm msys64/usr/bin/bash.exe ; - rm /usr/bin/cmp.exe ; - rm /usr/bin/diff.exe ; - rm /usr/bin/diff3.exe ; - rm /usr/bin/sdiff.exe ; - rm /etc/profile.d/perlbin.csh ; - rm /etc/profile.d/perlbin.sh ; - rm /usr/bin/perl.exe ; - rm -rf /usr/bin/core_perl/ ; - rm -rf /usr/lib/perl5/core_perl/ ; - rm /usr/share/fish/vendor_conf.d/perlbin.fish ; - rm /usr/share/makepkg-template/perl-binary-module-dependency-1.template ; - rm /usr/share/makepkg-template/perl-binary-module-dependency.template ; - rm -rf /usr/share/perl5/core_perl/ ; - rm /usr/bin/backup ; - rm /usr/bin/restore ; - rm /usr/bin/tar.exe ; - rm /usr/lib/tar/backup.sh ; - rm /usr/lib/tar/dump-remind ; - rm /usr/lib/tar/rmt.exe ; - rm /mingw64/bin/libwinpthread-1.dll ; - rm /mingw64/share/licenses/libwinpthread/COPYING ; - rm /mingw64/share/licenses/libwinpthread/mingw-w64-libraries/winpthreads/COPYING ; - cp -R msys64/* / ; - fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --init; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm gcc autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/;/usr;/usr/lib"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/usr/include"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CC="/mingw64/bin/gcc"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXX="/mingw64/bin/g++"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LD="/mingw64/bin/ld"; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then cat /usr/include/gnutls/gnutls.h ; fi - 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 43efb19928206730f74bccbbb17c7a89d5d53051 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 17 Aug 2019 17:28:00 -0700 Subject: [PATCH 062/104] Fix travis paths --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 08f9b782..155cc02e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,10 @@ env: - LINKING="static" before_install: - eval "${MATRIX_EVAL}" + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install info install-info; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install codecov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi From 8f28b683b7a9035342681220adc88baae77918c4 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 17 Aug 2019 17:31:19 -0700 Subject: [PATCH 063/104] Temporarily disable gnutls requirement in travis windows --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 155cc02e..971c5cb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --enable-https --enable-shared --enable-static --with-gnutls=/usr ; + ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --disable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi From fbabaaf2903360ceeebf25483643d1aa67df8bbb Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sat, 17 Aug 2019 17:49:10 -0700 Subject: [PATCH 064/104] Install make on travis windows --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 971c5cb0..a5933b8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi - 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 f84b1e89d8f0d820716e0bac0e2f7290e0f16e6d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 15:09:16 -0700 Subject: [PATCH 065/104] Push travis windows to use msys --- .travis.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5933b8b..870efdb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,23 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y msys2 make; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config" ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then + ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ + ln -s /c/tools/msys64/usr/share/automake* /usr/share/ + ln -s /c/tools/msys64/usr/share/aclocal* /usr/share/ + ln -s /c/tools/msys64/usr/share/libtool* /usr/share/ + ln -s /c/tools/msys64/usr/share/pkgconfig /usr/share/ + ln -s /c/tools/msys64/usr/bin/autom4te /usr/bin/ + ln -s /c/tools/msys64/usr/bin/autoconf /usr/bin/ + ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ + ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ + + PATH=$PATH:/c/tools/msys64/usr/bin/ + export CONFIG_SHELL=/usr/bin/bash.exe + fi - 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 131fd3aa16caecd18b05bd2ebd8f65c55c4bfef1 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 15:23:16 -0700 Subject: [PATCH 066/104] Semicolon at every line in windows statements --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 870efdb3..a127ab8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,18 +25,18 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config" ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then - ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ - ln -s /c/tools/msys64/usr/share/automake* /usr/share/ - ln -s /c/tools/msys64/usr/share/aclocal* /usr/share/ - ln -s /c/tools/msys64/usr/share/libtool* /usr/share/ - ln -s /c/tools/msys64/usr/share/pkgconfig /usr/share/ - ln -s /c/tools/msys64/usr/bin/autom4te /usr/bin/ - ln -s /c/tools/msys64/usr/bin/autoconf /usr/bin/ - ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ - ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ + ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/automake* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/aclocal* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/libtool* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/pkgconfig /usr/share/ ; + ln -s /c/tools/msys64/usr/bin/autom4te /usr/bin/ ; + ln -s /c/tools/msys64/usr/bin/autoconf /usr/bin/ ; + ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ ; + ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; - PATH=$PATH:/c/tools/msys64/usr/bin/ - export CONFIG_SHELL=/usr/bin/bash.exe + PATH=$PATH:/c/tools/msys64/usr/bin/ ; + export CONFIG_SHELL=/usr/bin/bash.exe ; fi - 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 1b5e0ed6bfff5191f5bb487b1b75b9461ca5f4e6 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 15:43:57 -0700 Subject: [PATCH 067/104] Use sh as default shell in travis windows Use normal path rather than windows path --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a127ab8a..87aca467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,8 @@ before_install: ln -s /c/tools/msys64/usr/bin/autoconf /usr/bin/ ; ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ ; ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; - PATH=$PATH:/c/tools/msys64/usr/bin/ ; - export CONFIG_SHELL=/usr/bin/bash.exe ; + export CONFIG_SHELL=/usr/bin/sh ; fi - 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 d917bf5760b833f5fbeaf39f263ad8d5c04e7851 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 16:04:51 -0700 Subject: [PATCH 068/104] Force shell replacement on travis windows --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 87aca467..d30672ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,11 +35,13 @@ before_install: ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ ; ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; PATH=$PATH:/c/tools/msys64/usr/bin/ ; - export CONFIG_SHELL=/usr/bin/sh ; + export CONFIG_SHELL=/usr/bin/bash.exe ; + export SHELL=/usr/bin/bash.exe ; fi - 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 + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoreconf -vfi ; fi - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then @@ -47,6 +49,7 @@ before_install: else ./configure --disable-examples; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=/c/tools/msys64/usr/bin/:$PATH ; fi - make - sudo make install - cd .. From bd88336f6f61bc03af8635978a0ee5c7a3283bbe Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 16:24:49 -0700 Subject: [PATCH 069/104] Do not reset path ahead of running make --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d30672ad..1ac21b28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,6 @@ before_install: else ./configure --disable-examples; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=/c/tools/msys64/usr/bin/:$PATH ; fi - make - sudo make install - cd .. From 58b3c9b6c82e383ea0c4de1c3dee5a5287aeac14 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 17:13:28 -0700 Subject: [PATCH 070/104] Manually force use of msys shell on travis windows --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ac21b28..c2a46329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,6 @@ before_install: ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ ; ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; PATH=$PATH:/c/tools/msys64/usr/bin/ ; - export CONFIG_SHELL=/usr/bin/bash.exe ; - export SHELL=/usr/bin/bash.exe ; fi - 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 @@ -45,7 +43,8 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --disable-https --enable-shared --enable-static ; + export CONFIG_SHELL=/usr/bin/bash.exe ; + CONFIG_SHELL=/usr/bin/bash.exe /usr/bin/bash.exe ./configure --prefix=/usr --disable-examples --disable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi From 1c5d068ac472c0a249c877b347d0ea41b625134d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 17:33:26 -0700 Subject: [PATCH 071/104] Using /bin/sh shell in travis_windows --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2a46329..703fe64e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ before_install: ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then export CONFIG_SHELL=/usr/bin/bash.exe ; - CONFIG_SHELL=/usr/bin/bash.exe /usr/bin/bash.exe ./configure --prefix=/usr --disable-examples --disable-https --enable-shared --enable-static ; + CONFIG_SHELL=/bin/sh /bin/sh ./configure --prefix=/usr --disable-examples --disable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi From 51d37a40f1773e9255fa8554266fb719314168c5 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 17:56:44 -0700 Subject: [PATCH 072/104] Use travis native (cygwin) rather than msys --- .travis.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 703fe64e..8fe5b13d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,29 +21,14 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y msys2 make; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y make; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config" ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then - ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ ; - ln -s /c/tools/msys64/usr/share/automake* /usr/share/ ; - ln -s /c/tools/msys64/usr/share/aclocal* /usr/share/ ; - ln -s /c/tools/msys64/usr/share/libtool* /usr/share/ ; - ln -s /c/tools/msys64/usr/share/pkgconfig /usr/share/ ; - ln -s /c/tools/msys64/usr/bin/autom4te /usr/bin/ ; - ln -s /c/tools/msys64/usr/bin/autoconf /usr/bin/ ; - ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ ; - ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; - PATH=$PATH:/c/tools/msys64/usr/bin/ ; - fi - 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 - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoreconf -vfi ; fi - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - export CONFIG_SHELL=/usr/bin/bash.exe ; CONFIG_SHELL=/bin/sh /bin/sh ./configure --prefix=/usr --disable-examples --disable-https --enable-shared --enable-static ; else ./configure --disable-examples; From 25218efc252b2fbd59e9d21600aa4fe200fa4e96 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 17:57:20 -0700 Subject: [PATCH 073/104] No need to set msys path --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8fe5b13d..3d7f97da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y make; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi - 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 a99c70a020f6fe170df0c26192bbe0002a6931c4 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 18:23:29 -0700 Subject: [PATCH 074/104] fix 'program files' path --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d7f97da..16793b7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,10 +28,11 @@ before_install: - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - CONFIG_SHELL=/bin/sh /bin/sh ./configure --prefix=/usr --disable-examples --disable-https --enable-shared --enable-static ; + ./configure --prefix=/usr --disable-examples --disable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/program files/'program files'/" "{}" +; fi - make - sudo make install - cd .. From 9b115067ffc4f0efb5548ea5adfd76986a94555d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 18:33:17 -0700 Subject: [PATCH 075/104] Fixing configure not finding itc mechanism --- .travis.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16793b7c..99606006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,14 +21,31 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y make; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y msys2 make; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config" ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then + ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/automake* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/aclocal* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/libtool* /usr/share/ ; + ln -s /c/tools/msys64/usr/share/pkgconfig /usr/share/ ; + ln -s /c/tools/msys64/usr/bin/autom4te /usr/bin/ ; + ln -s /c/tools/msys64/usr/bin/autoconf /usr/bin/ ; + ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ ; + ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; + PATH=$PATH:/c/tools/msys64/usr/bin/ ; + export CONFIG_SHELL=/usr/bin/bash.exe ; + export SHELL=/usr/bin/bash.exe ; + fi - 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 + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoreconf -vfi ; fi - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then - ./configure --prefix=/usr --disable-examples --disable-https --enable-shared --enable-static ; + ./configure --prefix=/usr --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-examples --disable-https --enable-shared --enable-static ; else ./configure --disable-examples; fi @@ -388,3 +405,4 @@ matrix: allow_failures: - env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_ARCH_DIR=arm-linux-gnueabi && CC=arm-linux-gnueabi-gcc" - env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_LD_PATH=$HOME/linker_bin && ARM_ARCH_DIR=aarch64-linux-gnu" + From 0ae7aeface4e671069c69cee8ab7b87c4ec8bf7d Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 19:38:58 -0700 Subject: [PATCH 076/104] Use unix-like path for sh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 99606006..fb488745 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_install: else ./configure --disable-examples; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/program files/'program files'/" "{}" +; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/C:\/program files\/git\/usr\/bin/\/usr\/bin/" "{}" + ; fi - make - sudo make install - cd .. From 1efa1ddb2c8e891c7efd6c478cb4f1fbf7da81b7 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 20:24:15 -0700 Subject: [PATCH 077/104] Do not run autoreconf ahead of configure --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb488745..c84f850a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,14 +34,12 @@ before_install: ln -s /c/tools/msys64/usr/bin/autoconf /usr/bin/ ; ln -s /c/tools/msys64/usr/bin/autoheader /usr/bin/ ; ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; + PATH=$PATH:/c/tools/msys64/usr/bin/ ; - export CONFIG_SHELL=/usr/bin/bash.exe ; - export SHELL=/usr/bin/bash.exe ; fi - 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 - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then autoreconf -vfi ; fi - if [[ "$ARM_ARCH_DIR" != "" ]]; then ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples; elif [[ "$TRAVIS_OS_NAME" = "windows" ]]; then @@ -49,6 +47,7 @@ before_install: else ./configure --disable-examples; fi + - grep -Hrn 'program files' . - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/C:\/program files\/git\/usr\/bin/\/usr\/bin/" "{}" + ; fi - make - sudo make install @@ -405,4 +404,3 @@ matrix: allow_failures: - env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_ARCH_DIR=arm-linux-gnueabi && CC=arm-linux-gnueabi-gcc" - env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_LD_PATH=$HOME/linker_bin && ARM_ARCH_DIR=aarch64-linux-gnu" - From 133d2308592acb02ffdf68000eb0ff32f3ca0a9b Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 20:38:39 -0700 Subject: [PATCH 078/104] No need to grep. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c84f850a..7559ee13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,6 @@ before_install: else ./configure --disable-examples; fi - - grep -Hrn 'program files' . - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/C:\/program files\/git\/usr\/bin/\/usr\/bin/" "{}" + ; fi - make - sudo make install From aab7df0c2880d6c46252161e07e5da23c7ae73c4 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 20:47:48 -0700 Subject: [PATCH 079/104] Export SHELL value --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7559ee13..b60842df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ before_install: ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; PATH=$PATH:/c/tools/msys64/usr/bin/ ; + export SHELL=/usr/bin/sh.exe fi - 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 @@ -47,7 +48,6 @@ before_install: else ./configure --disable-examples; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/C:\/program files\/git\/usr\/bin/\/usr\/bin/" "{}" + ; fi - make - sudo make install - cd .. From aed9a668f3e8dc538c7905725ff72cccacc891d9 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 20:51:05 -0700 Subject: [PATCH 080/104] Add missing semicolon --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b60842df..da93ffd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: ln -s /c/tools/msys64/usr/bin/m4 /usr/bin/ ; PATH=$PATH:/c/tools/msys64/usr/bin/ ; - export SHELL=/usr/bin/sh.exe + export SHELL=/usr/bin/sh.exe ; fi - 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 f0edb4dc418e483412f920cd6c29536e62deef7c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 22:05:48 -0700 Subject: [PATCH 081/104] Fixing shell parameter in Makefiles on travis windows --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index da93ffd2..00cd510f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,7 @@ before_install: else ./configure --disable-examples; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/\${SHELL}/\/usr\/bin\/sh.exe/" "{}" + ; fi - make - sudo make install - cd .. From 5b8481707166e6f0ad7f9530a1a70d82ea15b83c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 22:20:58 -0700 Subject: [PATCH 082/104] Force usage of sh shell --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00cd510f..6a3f1dfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,9 +48,10 @@ before_install: else ./configure --disable-examples; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -type f -exec sed -i "s/\${SHELL}/\/usr\/bin\/sh.exe/" "{}" + ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -name Makefile -type f -exec sed -i "s/\${SHELL}/\/usr\/bin\/sh.exe/" "{}" + ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then find . -name Makefile -type f -exec sed -i "s/\$(SHELL)/\/usr\/bin\/sh.exe/" "{}" + ; fi - make - - sudo make install + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then make install; else sudo make install; fi - cd .. - if [ "$BUILD_TYPE" = "asan" ]; then export CFLAGS='-fsanitize=address'; export CXXLAGS='-fsanitize=address'; export LDFLAGS='-fsanitize=address'; fi - if [ "$BUILD_TYPE" = "msan" ]; then export CFLAGS='-fsanitize=memory'; export CXXLAGS='-fsanitize=memory'; export LDFLAGS='-fsanitize=memory'; fi From 02b2ec2c58c3514083ef738995709c18396f1ca6 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 23:06:40 -0700 Subject: [PATCH 083/104] Enable build on windows --- .travis.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a3f1dfb..9993ca1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y msys2 make; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config" ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config $MINGW_PACKAGE_PREFIX-libsystre" ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ ; ln -s /c/tools/msys64/usr/share/automake* /usr/share/ ; @@ -71,7 +71,12 @@ install: - ./bootstrap - mkdir build - cd build - - if [ "$LINKING" = "static" ]; then + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then + ../configure --disable-fastopen --disable-examples CPPFLAGS='-I/c/tools/msys64/mingw64/include/ -I/usr/include/' LDFLAGS='-L/c/tools/msys64/mingw64/lib -L/usr/lib/' ; + cd .. ; + find . -name Makefile -type f -exec sed -i "s/\$(SHELL)/\/usr\/bin\/sh.exe/" "{}" + ; + cd build ; + elif [ "$LINKING" = "static" ]; then ../configure --enable-static --disable-fastopen; elif [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ]; then ../configure --enable-debug --enable-coverage --disable-shared --disable-fastopen; @@ -89,7 +94,7 @@ install: - if [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then sed -i 's+/usr/bin/ld+$HOME/linker_bin/ld+g' libtool; fi - if [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then sed -i 's+/usr/bin/ld+$HOME/linker_bin/ld+g' Makefile; fi - make - - make check TESTS= + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then make check TESTS= ; fi script: - if [[ "$CROSS_COMPILE" == 1 ]]; then cd test ; @@ -111,12 +116,10 @@ script: qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/threaded ; fi fi - - make check - - cat test/test-suite.log + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then make check ; fi + - if [ "$TRAVIS_OS_NAME" != "windows" ]; then cat test/test-suite.log; fi - if [ "$VALGRIND" = "valgrind" ]; then make check-valgrind; fi; - if [ "$VALGRIND" = "valgrind" ]; then cat test/test-suite-memcheck.log; fi; - - ls -l /usr/local/lib/ - - ls -l /usr/lib/ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ../src/; cppcheck --error-exitcode=1 .; cd ../build; fi - | if [ "$PERFORMANCE" = "select" ]; then @@ -142,12 +145,10 @@ matrix: exclude: - compiler: clang env: DEBUG="debug" COVERAGE="coverage" - - compiler: clang - env: LINKING='static' - os: windows env: DEBUG="debug" COVERAGE="coverage" - os: windows - env: LINKING='static' + env: LINKING="static" include: - os: linux addons: From 4ce06ec407487e3390b0d4803249cf381bdcc58e Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 23:21:02 -0700 Subject: [PATCH 084/104] Use explicit package name to refer to libpcre --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9993ca1d..10e1c701 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y msys2 make; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config $MINGW_PACKAGE_PREFIX-libsystre" ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre" ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ ; ln -s /c/tools/msys64/usr/share/automake* /usr/share/ ; From 8e4ff87c3c6e5328e738c65e71f7afe93dabe9b7 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 23:44:36 -0700 Subject: [PATCH 085/104] Suppress clang on windows --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 10e1c701..37d79dd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,6 +149,8 @@ matrix: env: DEBUG="debug" COVERAGE="coverage" - os: windows env: LINKING="static" + - os: windows + compiler: clang include: - os: linux addons: From c20780a7b4cfddaa2b12728602bb9deaf134447c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Sun, 18 Aug 2019 23:48:38 -0700 Subject: [PATCH 086/104] Make build and host explicit at configure --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 37d79dd1..39aa0d5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ install: - mkdir build - cd build - if [ "$TRAVIS_OS_NAME" = "windows" ]; then - ../configure --disable-fastopen --disable-examples CPPFLAGS='-I/c/tools/msys64/mingw64/include/ -I/usr/include/' LDFLAGS='-L/c/tools/msys64/mingw64/lib -L/usr/lib/' ; + ../configure --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 --disable-fastopen --disable-examples CPPFLAGS='-I/c/tools/msys64/mingw64/include/ -I/usr/include/' LDFLAGS='-L/c/tools/msys64/mingw64/lib -L/usr/lib/' ; cd .. ; find . -name Makefile -type f -exec sed -i "s/\$(SHELL)/\/usr\/bin\/sh.exe/" "{}" + ; cd build ; From 88ba41caabbebeac2f5d6a90a4d59f54596907d8 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 00:16:39 -0700 Subject: [PATCH 087/104] Force YARN_GPG=no to travis to prevent hanging See: https://travis-ci.community/t/build-doesnt-finish-after-completing-tests/288/10 for details --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39aa0d5c..7f210395 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,12 +146,9 @@ matrix: - compiler: clang env: DEBUG="debug" COVERAGE="coverage" - os: windows - env: DEBUG="debug" COVERAGE="coverage" - - os: windows - env: LINKING="static" - - os: windows - compiler: clang include: + - os: windows + env: DEBUG="nodebug" COVERAGE="nocoverage" YARN_GPG=no - os: linux addons: apt: From 9f86e60908933902a38816981e726fc321484c3c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 01:11:33 -0700 Subject: [PATCH 088/104] List processes running after end --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7f210395..575e4fa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -139,6 +139,8 @@ script: ./benchmark_threads 8080 & sleep 5 && ab -n 10000000 -c 100 localhost:8080/plaintext fi +after_script: + - ps -ef after_success: - if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi matrix: From 8b5cc9ce88738d1759ea7ee615d3580e97b75bb7 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 08:24:31 -0700 Subject: [PATCH 089/104] Running pacman within this terminal This prevents another bash instance from launching and (ideally) travis from getting stuck. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 575e4fa0..d97a5329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y msys2 make; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre" ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ ; ln -s /c/tools/msys64/usr/share/automake* /usr/share/ ; From d3614725de2d23570762f33facef3d6dff68b007 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 18:21:48 -0700 Subject: [PATCH 090/104] Re-add powershell command to run pacman --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d97a5329..575e4fa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -r --no-progress -y msys2 make; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then PATH=$PATH:/c/tools/msys64/usr/bin/ ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then powershell -executionpolicy bypass "pacman -Syu --noconfirm autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre" ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ln -s /c/tools/msys64/usr/share/autoconf* /usr/share/ ; ln -s /c/tools/msys64/usr/share/automake* /usr/share/ ; From 8945d51f015847cae2265def143fd9e1ff5ebfcd Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 18:40:08 -0700 Subject: [PATCH 091/104] Checking processes at various stages Printing out on travis to understand where is the living process that keeps travis up. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 575e4fa0..c21c9569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: - DEBUG="nodebug" COVERAGE="nocoverage" - LINKING="static" before_install: + - ps -ef - eval "${MATRIX_EVAL}" - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi @@ -59,6 +60,7 @@ before_install: - if [ "$BUILD_TYPE" = "tsan" ]; then export CFLAGS='-fsanitize=thread'; export CXXLAGS='-fsanitize=thread'; export LDFLAGS='-fsanitize=thread'; fi - if [ "$BUILD_TYPE" = "ubsan" ]; then export export CFLAGS='-fsanitize=undefined'; export CXXLAGS='-fsanitize=undefined'; export LDFLAGS='-fsanitize=undefined'; fi install: + - ps -ef - if [[ "$CROSS_COMPILE" == 1 ]] ; then if [[ "$ARM_ARCH_DIR" == "aarch64-linux-gnu" ]] ; then mkdir $HOME/linker_bin ; @@ -96,6 +98,7 @@ install: - make - if [ "$TRAVIS_OS_NAME" != "windows" ]; then make check TESTS= ; fi script: + - ps -ef - if [[ "$CROSS_COMPILE" == 1 ]]; then cd test ; if [[ "$ARM_ARCH_DIR" == "aarch64-linux-gnu" ]]; then From 0601a82f5edd96ee082998fa3b564fde6446bce0 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 21:50:05 -0700 Subject: [PATCH 092/104] Kill all child processes at the end on windows Should prevent travis from getting stuck --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c21c9569..4e18093f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,6 +144,7 @@ script: fi after_script: - ps -ef + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps -o pid= --ppid $$) ; fi after_success: - if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi matrix: From 9f91094f0fde95114f70e9fd42e8e26148568161 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 22:40:57 -0700 Subject: [PATCH 093/104] Change kill call to match windows format --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e18093f..04f38568 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,7 +144,7 @@ script: fi after_script: - ps -ef - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps -o pid= --ppid $$) ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p') ; fi after_success: - if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi matrix: From 2757e6987fa7513696fc638470f37490ee06b7e4 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 19 Aug 2019 23:14:02 -0700 Subject: [PATCH 094/104] List bash child processes --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 04f38568..5bf9e13c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,6 +144,7 @@ script: fi after_script: - ps -ef + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p' ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p') ; fi after_success: - if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi From aa73eacc11dd1c02e34cf4856e88dfb1b00201b8 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Tue, 20 Aug 2019 22:10:45 -0700 Subject: [PATCH 095/104] print $$ value --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5bf9e13c..0cb9a3f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,6 +144,7 @@ script: fi after_script: - ps -ef + - ps $$ - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p' ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p') ; fi after_success: From eb935b3392f46fe5373b8fbe046133a517199eb4 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Tue, 20 Aug 2019 22:35:24 -0700 Subject: [PATCH 096/104] Fix echo $$ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0cb9a3f2..ec4d1f22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,7 +144,7 @@ script: fi after_script: - ps -ef - - ps $$ + - echo $$ - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p' ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p') ; fi after_success: From d2c505b5f1624539ce74f490c44b160593f2357e Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Wed, 21 Aug 2019 00:50:37 -0700 Subject: [PATCH 097/104] List windows processes --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ec4d1f22..49cdaddf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,6 +144,7 @@ script: fi after_script: - ps -ef + - if [ "$TRAVIS_OS_NAME" = "windows" ]; ps -Wla ; fi - echo $$ - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p' ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p') ; fi From 3cad66eeff8e8ba8ffc6be558f05437a608d41f9 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Wed, 21 Aug 2019 07:40:17 -0700 Subject: [PATCH 098/104] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 49cdaddf..72e4456b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,7 +144,7 @@ script: fi after_script: - ps -ef - - if [ "$TRAVIS_OS_NAME" = "windows" ]; ps -Wla ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla ; fi - echo $$ - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p' ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p') ; fi From b24e4464c2b050ac3a8348d792015f90fd6e8b9c Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 2 Sep 2019 14:38:34 -0700 Subject: [PATCH 099/104] Remove kill statements --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72e4456b..cf9e0e35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,8 +146,6 @@ after_script: - ps -ef - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla ; fi - echo $$ - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p' ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps | grep $$ | cut -f6 -d' ' | grep -v $$ | sed -n '1!p') ; fi after_success: - if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi matrix: From 4dd6aa90154033fdf838b06c7d1492df72ee7701 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 2 Sep 2019 15:16:01 -0700 Subject: [PATCH 100/104] Print the same ps before and after script --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf9e0e35..ee92ddc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - LINKING="static" before_install: - ps -ef + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - eval "${MATRIX_EVAL}" - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi - if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi @@ -144,7 +145,7 @@ script: fi after_script: - ps -ef - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - echo $$ after_success: - if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi From f105cd45e8189e6d2bd4410d94f146d8cefe9a40 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 2 Sep 2019 15:52:36 -0700 Subject: [PATCH 101/104] kill gnupg possibly leaving the shell running after success --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ee92ddc5..8cbebf03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,6 +146,8 @@ script: after_script: - ps -ef - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - echo $$ after_success: - if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi From 2d4461c7b399c179ac6bc878bfa3b6d6412195e9 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 2 Sep 2019 16:28:05 -0700 Subject: [PATCH 102/104] Use taskkill rather than kill --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8cbebf03..184178c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,7 +146,7 @@ script: after_script: - ps -ef - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then kill $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then taskkill /F /PID $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - echo $$ after_success: From 2bf21ff82a61c6760a3e306bc75448d270c2f188 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 2 Sep 2019 17:12:25 -0700 Subject: [PATCH 103/104] Terminate gpg through gpg-config --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 184178c0..6482674d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,7 +146,8 @@ script: after_script: - ps -ef - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then taskkill /F /PID $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then gpgconf --kill gpg-agent ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then taskkill /PID $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - echo $$ after_success: From 7e779dfe01c4edc24ff30c504ab191cf2ec09b42 Mon Sep 17 00:00:00 2001 From: Sebastiano Merlino Date: Mon, 2 Sep 2019 17:34:10 -0700 Subject: [PATCH 104/104] Force taskkill command params on git bash --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6482674d..63d989c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -147,7 +147,7 @@ after_script: - ps -ef - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then gpgconf --kill gpg-agent ; fi - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then taskkill /PID $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then taskkill //F //PID $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi - if [ "$TRAVIS_OS_NAME" = "windows" ]; then ps -Wla | sort ; fi - echo $$ after_success: