From ad9cbf9e0d9e7176014d3282613dfda846d11bdd Mon Sep 17 00:00:00 2001 From: Matt Ullman Date: Sun, 20 Mar 2016 18:59:07 -0400 Subject: [PATCH 01/27] s_user: Don't send CHGHOST clients op/voice syncs --- ircd/s_user.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ircd/s_user.c b/ircd/s_user.c index f1fc52a4..46a1ee61 100644 --- a/ircd/s_user.c +++ b/ircd/s_user.c @@ -1464,10 +1464,8 @@ change_nick_user_host(struct Client *target_p, const char *nick, const char *use target_p->info); if(*mode) - sendto_channel_local_butone(target_p, ALL_MEMBERS, chptr, - ":%s MODE %s +%s %s", - target_p->servptr->name, - chptr->chname, mode, modeval); + sendto_channel_local_with_capability_butone(target_p, ALL_MEMBERS, NOCAPS, CLICAP_CHGHOST, chptr, + ":%s MODE %s +%s %s", target_p->servptr->name, chptr->chname, mode, modeval); *modeval = '\0'; } From 4acd32f7fbd62c5790e94c73200254098e43884e Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 19:50:33 -0500 Subject: [PATCH 02/27] add appveyor config --- .appveyor.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 00000000..d03e9fb7 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,17 @@ +version: 3.6-dev_{build} +clone_depth: 10 +install: + - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu mingw-w64-x86_64-gcc autoconf automake libtool pkgconf bison flex make mingw-w64-x86_64-openssl" + - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" + - c:\msys64\usr\bin\sh.exe -lc "uname -a" + - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" + - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" + - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" + - ps: Push-AppveyorArtifact cygcheck.log +build_script: + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null" + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./configure --prefix=$APPVEYOR_BUILD_FOLDER/build --enable-openssl=/mingw64 < /dev/null" + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make -j2 < /dev/null" + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make install < /dev/null" + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" + From 4f3db3045175ce1e40fe8cbef6b28e629b7dc6bd Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 19:55:02 -0500 Subject: [PATCH 03/27] appveyor: use pacman -Sy not -Syu --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d03e9fb7..84d6b044 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu mingw-w64-x86_64-gcc autoconf automake libtool pkgconf bison flex make mingw-w64-x86_64-openssl" + - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-gcc autoconf automake libtool pkgconf bison flex make mingw-w64-x86_64-openssl" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" From c167a8e14672276c116ef523894fab465a3dcd2d Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 19:56:32 -0500 Subject: [PATCH 04/27] appveyor: don't install pkgconf, they have pkg-config instead --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 84d6b044..e9ca4612 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-gcc autoconf automake libtool pkgconf bison flex make mingw-w64-x86_64-openssl" + - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-gcc autoconf automake libtool bison flex make mingw-w64-x86_64-openssl" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" From dbf326603a93883efec2f37d7a1ee2b3c3e28848 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 19:59:42 -0500 Subject: [PATCH 05/27] appveyor: don't install packages we already have --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index e9ca4612..90484589 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-gcc autoconf automake libtool bison flex make mingw-w64-x86_64-openssl" + - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-openssl" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" From b7029c8a6c5f2208cd7f4548c8060e2d19a848fe Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:02:26 -0500 Subject: [PATCH 06/27] appveyor: pacman --noconfirm i guess --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 90484589..a125ecf0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-openssl" + - c:\msys64\usr\bin\sh.exe -lc "pacman -S --noconfirm mingw-w64-x86_64-openssl" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" From 1ad16a505ba5422540c52cf3446b67bebb79b368 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:11:17 -0500 Subject: [PATCH 07/27] appveyor: use right gcc --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index a125ecf0..3f7ab94d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,7 +10,7 @@ install: - ps: Push-AppveyorArtifact cygcheck.log build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null" - - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./configure --prefix=$APPVEYOR_BUILD_FOLDER/build --enable-openssl=/mingw64 < /dev/null" + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; env CC=/mingw64/bin/x86_64-w64-mingw32-gcc.exe ./configure --prefix=$APPVEYOR_BUILD_FOLDER/build --enable-openssl=/mingw64 < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make -j2 < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make install < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" From 2677b17117ba1c4816ce673a977a4373b0b82b84 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:15:26 -0500 Subject: [PATCH 08/27] appveyor: blah gcc check --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 3f7ab94d..b27d3faa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,6 +7,7 @@ install: - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" + - c:\msys64\usr\bin\sh.exe -lc "/mingw64/bin/x86_64-w64-mingw32-gcc.exe -v" - ps: Push-AppveyorArtifact cygcheck.log build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null" From 0e961686c0c88d946f22b9e4a91ce3415d244c2a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:20:50 -0500 Subject: [PATCH 09/27] appveyor: push config.log on fail --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index b27d3faa..6cac2d38 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,4 +15,5 @@ build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make -j2 < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make install < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" - +on_failure: + - ps: Push-AppveyorArtifact config.log From 315c3a8ff6e5312fe97d851fb3431772c2116afa Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:29:16 -0500 Subject: [PATCH 10/27] appveyor: verify msys2 is up to date --- .appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6cac2d38..d98619a2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,8 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -S --noconfirm mingw-w64-x86_64-openssl" + - c:\msys64\usr\bin\sh.exe -lc "update-core" + - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu --noconfirm" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" @@ -11,7 +12,7 @@ install: - ps: Push-AppveyorArtifact cygcheck.log build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null" - - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; env CC=/mingw64/bin/x86_64-w64-mingw32-gcc.exe ./configure --prefix=$APPVEYOR_BUILD_FOLDER/build --enable-openssl=/mingw64 < /dev/null" + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; env CC=/mingw64/bin/x86_64-w64-mingw32-gcc.exe ./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64 < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make -j2 < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make install < /dev/null" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" From 264e9451b2b89d7564524e1d4b30d062e83c50a5 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:32:06 -0500 Subject: [PATCH 11/27] appveyor: use update-core --noconfirm --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d98619a2..460e8b7b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "update-core" + - c:\msys64\usr\bin\sh.exe -lc "update-core --noconfirm" - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu --noconfirm" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" From c82ce5c6211abb04fb3478887c45c8c680eead79 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:36:31 -0500 Subject: [PATCH 12/27] appveyor: just do what update-core does without using update-core since it doesnt support unattended upgrades --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 460e8b7b..3b8ea3c4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "update-core --noconfirm" + - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu --noconfirm bash pacman msys2-runtime" - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu --noconfirm" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" From e94decb620504764d330260019cc23fd7012b10a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:40:51 -0500 Subject: [PATCH 13/27] appveyor: lol dont do full system upgrade in first go --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3b8ea3c4..f1df7419 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu --noconfirm bash pacman msys2-runtime" + - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy --noconfirm bash pacman msys2-runtime" - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu --noconfirm" - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" From 64832940fbc27e20204d382f0096b6ff4467092c Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:50:57 -0500 Subject: [PATCH 14/27] appveyor: sanity check gcc itself --- .appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f1df7419..5edc469b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,14 +1,13 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy --noconfirm bash pacman msys2-runtime" - - c:\msys64\usr\bin\sh.exe -lc "pacman -Syu --noconfirm" - - c:\msys64\usr\bin\sh.exe -lc "echo 'Building on:'" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" - c:\msys64\usr\bin\sh.exe -lc "/mingw64/bin/x86_64-w64-mingw32-gcc.exe -v" + - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/x86_64-w64-mingw32-gcc.exe -o gcc-test.exe gcc-test.c" + - c:\msys64\usr\bin\sh.exe -lc "./gcc-test" - ps: Push-AppveyorArtifact cygcheck.log build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null" From 5b97e7d2c77bfcb55bb184de4fd941a044c525e0 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 20:54:48 -0500 Subject: [PATCH 15/27] appveyor: make mingw64 gcc more talkative --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5edc469b..0856c8a9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,7 +6,7 @@ install: - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" - c:\msys64\usr\bin\sh.exe -lc "/mingw64/bin/x86_64-w64-mingw32-gcc.exe -v" - - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/x86_64-w64-mingw32-gcc.exe -o gcc-test.exe gcc-test.c" + - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/x86_64-w64-mingw32-gcc.exe -v -Wl,--verbose -o gcc-test.exe gcc-test.c" - c:\msys64\usr\bin\sh.exe -lc "./gcc-test" - ps: Push-AppveyorArtifact cygcheck.log build_script: From 5e85b1f894e4b32e5606a436782aeacafce5f681 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:02:39 -0500 Subject: [PATCH 16/27] appveyor: sanity check cc1 --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0856c8a9..2b876a8c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,8 +6,8 @@ install: - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" - c:\msys64\usr\bin\sh.exe -lc "/mingw64/bin/x86_64-w64-mingw32-gcc.exe -v" - - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/x86_64-w64-mingw32-gcc.exe -v -Wl,--verbose -o gcc-test.exe gcc-test.c" - - c:\msys64\usr\bin\sh.exe -lc "./gcc-test" + - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/../lib/gcc/x86_64-w64-mingw32/5.3.0/cc1.exe -v -D_REENTRANT gcc-test.c -dumpbase gcc-test.c -mtune=generic -march=x86-64 -auxbase gcc-test -version -o cc1-test.s" +# - c:\msys64\usr\bin\sh.exe -lc "./gcc-test" - ps: Push-AppveyorArtifact cygcheck.log build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null" From 4b135591c2e25e875f7975cec2be7ededd587839 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:07:27 -0500 Subject: [PATCH 17/27] appveyor: (re)install mingw-w64-x86_64-libwinpthread-git --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 2b876a8c..63988267 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: + - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-libwinpthread-git" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" From 81b6d9c63319158ea8905794ae1f4bb9d2585027 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:09:11 -0500 Subject: [PATCH 18/27] appveyor: --noconfirm --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 63988267..30724a98 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy mingw-w64-x86_64-libwinpthread-git" + - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy --noconfirm mingw-w64-x86_64-libwinpthread-git" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" From 74b2b4aa45047fcb3c322ded3d96a10be3edb91b Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:13:19 -0500 Subject: [PATCH 19/27] appveyor: collect more data --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 30724a98..94f7d3b4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,6 +6,8 @@ install: - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" + - c:\msys64\usr\bin\sh.exe -lc "echo $PATH" + - c:\msys64\usr\bin\sh.exe -lc "ldd /mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0/cc1.exe" - c:\msys64\usr\bin\sh.exe -lc "/mingw64/bin/x86_64-w64-mingw32-gcc.exe -v" - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/../lib/gcc/x86_64-w64-mingw32/5.3.0/cc1.exe -v -D_REENTRANT gcc-test.c -dumpbase gcc-test.c -mtune=generic -march=x86-64 -auxbase gcc-test -version -o cc1-test.s" # - c:\msys64\usr\bin\sh.exe -lc "./gcc-test" From 1a79eced201d1f133bbd269e61a83ad12d7c9acb Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:27:11 -0500 Subject: [PATCH 20/27] appveyor: try a different approach --- .appveyor-build.sh | 10 ++++++++++ .appveyor.yml | 11 +---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 .appveyor-build.sh diff --git a/.appveyor-build.sh b/.appveyor-build.sh new file mode 100644 index 00000000..709f8543 --- /dev/null +++ b/.appveyor-build.sh @@ -0,0 +1,10 @@ +set -v + +export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl + +cd $1 + +sh ./autogen.sh +./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64 +make -j2 +make install diff --git a/.appveyor.yml b/.appveyor.yml index 94f7d3b4..dc69dddd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,22 +1,13 @@ version: 3.6-dev_{build} clone_depth: 10 install: - - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy --noconfirm mingw-w64-x86_64-libwinpthread-git" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" - - c:\msys64\usr\bin\sh.exe -lc "echo $PATH" - - c:\msys64\usr\bin\sh.exe -lc "ldd /mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0/cc1.exe" - - c:\msys64\usr\bin\sh.exe -lc "/mingw64/bin/x86_64-w64-mingw32-gcc.exe -v" - - c:\msys64\usr\bin\sh.exe -lc "echo 'int main(void) { return 0; }' > gcc-test.c && /mingw64/bin/../lib/gcc/x86_64-w64-mingw32/5.3.0/cc1.exe -v -D_REENTRANT gcc-test.c -dumpbase gcc-test.c -mtune=generic -march=x86-64 -auxbase gcc-test -version -o cc1-test.s" -# - c:\msys64\usr\bin\sh.exe -lc "./gcc-test" - ps: Push-AppveyorArtifact cygcheck.log build_script: - - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null" - - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; env CC=/mingw64/bin/x86_64-w64-mingw32-gcc.exe ./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64 < /dev/null" - - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make -j2 < /dev/null" - - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; make install < /dev/null" + - c:\msys64\usr\bin\sh.exe -l ".appveyor-build.sh" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" on_failure: - ps: Push-AppveyorArtifact config.log From 6e2ed9da91cbdb2e91c356e6bb35916066297d9f Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:34:03 -0500 Subject: [PATCH 21/27] appveyor: simplify build script further --- .appveyor-build.sh | 2 -- .appveyor.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.appveyor-build.sh b/.appveyor-build.sh index 709f8543..6a00f596 100644 --- a/.appveyor-build.sh +++ b/.appveyor-build.sh @@ -2,8 +2,6 @@ set -v export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl -cd $1 - sh ./autogen.sh ./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64 make -j2 diff --git a/.appveyor.yml b/.appveyor.yml index dc69dddd..496a3a3e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,7 +7,7 @@ install: - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1" - ps: Push-AppveyorArtifact cygcheck.log build_script: - - c:\msys64\usr\bin\sh.exe -l ".appveyor-build.sh" + - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; sh .appveyor-build.sh" - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" on_failure: - ps: Push-AppveyorArtifact config.log From a9dbc61d7e5b75eca424df7892a6e41c473f8a23 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:39:25 -0500 Subject: [PATCH 22/27] appveyor: provide git for build --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 496a3a3e..30b59745 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,7 @@ version: 3.6-dev_{build} clone_depth: 10 install: + - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy --noconfirm git" - c:\msys64\usr\bin\sh.exe -lc "uname -a" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo" - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo" From 46b3fb5bba9d0a7d1a499b79c4067735ff7fe41c Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 21:45:05 -0500 Subject: [PATCH 23/27] appveyor: push librb-config.h --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 30b59745..fc849229 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,3 +12,4 @@ build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" on_failure: - ps: Push-AppveyorArtifact config.log + - ps: Push-AppveyorArtifact librb\include\librb-config.h From e452b26e46cb5ecd4e391c09ff762a48c2ace96c Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 22:01:17 -0500 Subject: [PATCH 24/27] librb: configure: tolerate older msys versions having wrong uname -a output --- librb/configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/librb/configure.ac b/librb/configure.ac index a0fefbae..0e434c93 100644 --- a/librb/configure.ac +++ b/librb/configure.ac @@ -63,6 +63,7 @@ case "$host_os" in AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) ;; *mingw*) +*msys*) AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) AC_CHECK_HEADER(windows.h, , [AC_MSG_ERROR([** MinGW and no windows.h. I give up.])]) From 36b3cff77f82270b2ffb2b17e214d706a85eedd9 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 22:06:54 -0500 Subject: [PATCH 25/27] configure: fix msys checks --- librb/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/librb/configure.ac b/librb/configure.ac index 0e434c93..127214d3 100644 --- a/librb/configure.ac +++ b/librb/configure.ac @@ -62,8 +62,7 @@ case "$host_os" in AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) ;; -*mingw*) -*msys*) +*mingw* | *msys*) AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) AC_CHECK_HEADER(windows.h, , [AC_MSG_ERROR([** MinGW and no windows.h. I give up.])]) From 8978ab4efad612aa16d56b75402d2ec2ee4934d7 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 22:17:52 -0500 Subject: [PATCH 26/27] configure: add same msys check here --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1de852d7..5ac46956 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ case "$host_os" in AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) ;; -*mingw*) +*mingw* | *msys*) AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) AC_CHECK_HEADER(winsock2.h, , [AC_MSG_ERROR([** MinGW and no winsock2.h. I give up.])]) From bab056f044e3eb81ef71dfa943cbba6f3ee06cce Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 23:00:30 -0500 Subject: [PATCH 27/27] appveyor: dont try to start ircd for the moment --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index fc849229..6b401717 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,7 +9,7 @@ install: - ps: Push-AppveyorArtifact cygcheck.log build_script: - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; sh .appveyor-build.sh" - - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" +# - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version" on_failure: - ps: Push-AppveyorArtifact config.log - ps: Push-AppveyorArtifact librb\include\librb-config.h