Merge pull request #346 from FluidSynth/ci-build

Additional build tests for CI

.appveyor-vcpkg.yml

@@ -1,7 +1,9 @@
-os:
+image:
   - Visual Studio 2015
+  - Visual Studio 2017
 
 build:
+  parallel: true
   verbosity: detailed
 
 configuration:
@@ -13,21 +15,47 @@ environment:
 
   matrix:
       - platform: x86
-        generator: Visual Studio 14 2015
+        CMAKE_FLAGS: 
+        
+      - platform: x86
+        CMAKE_FLAGS: -Denable-network=0
+
+      - platform: x86
+        CMAKE_FLAGS: -DBUILD_SHARED_LIBS=0
 
       - platform: x64
-        generator: Visual Studio 14 2015 Win64
+        CMAKE_FLAGS: 
+
+      - platform: x64
+        CMAKE_FLAGS: -Denable-network=0
+
+      - platform: x64
+        CMAKE_FLAGS: -DBUILD_SHARED_LIBS=0
+
+#      - platform: ARM ## currently fails to build pcre:arm-windows
 
 cache:
   - c:\Tools\vcpkg\installed
 
+init:
+  - set TARGET_PLATFORM=
+  - if "%platform%"=="x64" ( set TARGET_PLATFORM= Win64)
+  - if "%platform%"=="ARM" ( set TARGET_PLATFORM= ARM)
+  - echo %TARGET_PLATFORM%
+  - echo %APPVEYOR_BUILD_WORKER_IMAGE%
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set "generator=Visual Studio 15 2017%TARGET_PLATFORM%" )
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set "generator=Visual Studio 14 2015%TARGET_PLATFORM%" )
+  - echo %generator%
+  
 install:
+# make sure the latest version of git is installed
+  - choco upgrade git -y
   - vcpkg install glib:%platform%-windows
 
 build_script:
   - mkdir build
   - cd build
-  - cmake -G "%generator%" -Denable-pkgconfig=0 -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+  - cmake -G "%generator%" %CMAKE_FLAGS% -Denable-pkgconfig=0 -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - cmake --build . --config Release
 
 after_build:

.appveyor.yml

@@ -1,7 +1,9 @@
-os:
+image:
   - Visual Studio 2015
+  - Visual Studio 2017
 
 build:
+  parallel: true
   verbosity: detailed
 
 configuration:
@@ -10,7 +12,6 @@ configuration:
 environment:
   matrix:
     - platform: x86
-      generator: Visual Studio 14 2015
       glib-url: http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib_2.28.8-1_win32.zip
       glib-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib-dev_2.28.8-1_win32.zip
       pkg-config-url: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.26-1_win32.zip
@@ -18,15 +19,24 @@ environment:
       proxy-libintl-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/proxy-libintl-dev_20100902_win32.zip
 
     - platform: x64
-      generator: Visual Studio 14 2015 Win64
       glib-url: http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib_2.26.1-1_win64.zip
       glib-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib-dev_2.26.1-1_win64.zip
       pkg-config-url: http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/pkg-config_0.23-2_win64.zip
       gettext-url: http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip
       proxy-libintl-dev-url: http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/proxy-libintl-dev_20100902_win64.zip
       
+init:
+  - set TARGET_PLATFORM=
+  - if "%platform%"=="x64" ( set TARGET_PLATFORM= Win64)
+  - echo %TARGET_PLATFORM%
+  - echo %APPVEYOR_BUILD_WORKER_IMAGE%
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set "generator=Visual Studio 15 2017%TARGET_PLATFORM%" )
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set "generator=Visual Studio 14 2015%TARGET_PLATFORM%" )
+  - echo %generator%
 
 install:
+# make sure the latest version of git is installed
+  - choco upgrade git -y
   - mkdir c:\deps
   - cd c:\deps
   - curl -fsS -o glib.zip %glib-url%

.travis.yml

@@ -6,6 +6,9 @@ env:
     - CMAKE_FLAGS="-Denable-floats=1 -Denable-profiling=1"
     - CMAKE_FLAGS="-Denable-trap-on-fpe=1"
     - CMAKE_FLAGS="-Denable-fpe-check=1"
+    - CMAKE_FLAGS="-Denable-ipv6=0"
+    - CMAKE_FLAGS="-Denable-network=0"
+    - CMAKE_FLAGS="-Denable-aufile=0"
     - CMAKE_FLAGS="-DBUILD_SHARED_LIBS=0"
 matrix:
   include:

CMakeLists.txt

@@ -73,7 +73,6 @@ option ( enable-network "enable network support (requires BSD sockets) " on )
 
 # Platform specific options
 if ( CMAKE_SYSTEM MATCHES "Linux" )
-    option ( enable-ladcca "compile LADCCA support if it is available (deprecated)" off )
     option ( enable-lash "compile LASH support (if it is available)" on )
     option ( enable-alsa "compile ALSA support (if it is available)" on )
 endif ( CMAKE_SYSTEM MATCHES "Linux" )

README.md

@@ -3,8 +3,8 @@
 
 | Build Status | glib < 2.30 | glib >= 2.30 |
 |---|---|---|
-| Linux/MacOSX| n.a. | [![Build Status Travis](https://travis-ci.org/FluidSynth/fluidsynth.svg?branch=master)](https://travis-ci.org/FluidSynth/fluidsynth) |
+| Linux/MacOSX| n.a. | [![Build Status Travis](https://travis-ci.org/FluidSynth/fluidsynth.svg?branch=master)](https://travis-ci.org/FluidSynth/fluidsynth/branches) |
-| Windows | [![Build status Appveyor](https://ci.appveyor.com/api/projects/status/n24ybk0dmttjwdk2/branch/master?svg=true)](https://ci.appveyor.com/project/derselbst/fluidsynth) | [![Build status](https://ci.appveyor.com/api/projects/status/anbmtebt5uk4q1it/branch/master?svg=true)](https://ci.appveyor.com/project/derselbst/fluidsynth-g2ouw) |
+| Windows | [![Build status Appveyor](https://ci.appveyor.com/api/projects/status/n24ybk0dmttjwdk2/branch/master?svg=true)](https://ci.appveyor.com/project/derselbst/fluidsynth/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/anbmtebt5uk4q1it/branch/master?svg=true)](https://ci.appveyor.com/project/derselbst/fluidsynth-g2ouw/branch/master) |
 
 ### FluidSynth is a software real-time synthesizer based on the Soundfont 2 specifications.