Remove appveyor and have osx install shtool before build

diff --git a/.appveyor-build.sh b/.appveyor-build.sh
deleted file mode 100644 (file)
index 8ea6283..0000000
--- a/.appveyor-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-set -v
-
-export MSYSTEM=MINGW64
-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
-
-sh ./autogen.sh
-./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64
-make -j2
-make install

diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644 (file)
index 59ae886..0000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: 4_{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"
-  - 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; 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
-  - ps: Push-AppveyorArtifact librb\include\librb-config.h
-branches:
-  except:
-    - release/3.5

diff --git a/.travis.yml b/.travis.yml
index 06426716fc50007e52d258430bc56b734354bc62..504b9647d5f7d0d54d59b73fc7adce52886bb7c9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,9 @@ matrix:
 
     - os: osx
       compiler: clang
+      before_install:
+        - brew update
+        - brew install shtool
       env: COMPILER=clang LIBTOOLIZE=glibtoolize
 
 
@@ -52,7 +55,7 @@ cache:
   ccache:
 
 script:
-  - bash autogen.sh
+  - sh autogen.sh
   - CC=$COMPILER ./configure --with-shared-sqlite
   - make -j4
   - make install

diff --git a/README.md b/README.md
index b7509608fbf0e028c21dc48e8738564b71bd2324..c0c092dfcdbf826c9bf67228f45264427003ab21 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# charybdis [![POSIX Build Status](https://travis-ci.org/charybdis-ircd/charybdis.svg?branch=master)](https://travis-ci.org/charybdis-ircd/charybdis) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/is0obsml8xyq2qk7/branch/master?svg=true)](https://ci.appveyor.com/project/kaniini/charybdis/branch/master)
+# charybdis [![POSIX Build Status](https://travis-ci.org/charybdis-ircd/charybdis.svg?branch=master)](https://travis-ci.org/charybdis-ircd/charybdis)
 
 Charybdis is an IRCv3 server designed to be highly scalable.  It implements IRCv3.1 and some parts of IRCv3.2.