AppVeyor: add cygwin and minGW support

- Changes in platform configuration, x86 breaks the build
- Solution file does not contain platform for Any CPU, fixing it to Win32
- Added Multiple solutions to appveyor configuration file
- Added batch script for VS2010 builds
- Added fixes to appveyor.bat file and appveyor.yml
- Fixes for Platform and Configuration in appveyor.bat
- Fixed windows exit code, Appveyor reports exit on succesful build
- Multiple Builds in same platform and configuration, fixed it
- Added appveyor configuration to compile using MinGW 32-bit and 64-bits
- Minor Fixes for batch file and Added cygwin build script

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>

diff --git a/appveyor.yml b/appveyor.yml
index 598db9242973cff620eb803084555b73c65ba75a..0e6113e0be8b86dac09d70920c787ea9b7ef2c3b 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,6 +15,17 @@ environment:
     libusb_2013: msvc\libusb_2013.sln
     libusb_2012: msvc\libusb_2012.sln
     libusb_2010: msvc\libusb_2010.sln
+install:
+
+- cmd: >-
+    rem Copying libusb to cygwin home directory
+
+    xcopy /S C:\projects\libusb C:\cygwin\home\appveyor\
+
+    rem Copying libusb to MinGW home directory
+
+    xcopy /S C:\projects\libusb C:\msys64\home\appveyor\
+
 build_script:
 - cmd: >-
     msbuild %libusb_2015% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -24,3 +35,7 @@ build_script:
     msbuild %libusb_2012% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
     msvc/appveyor.bat
+
+    appveyor_minGW.bat
+
+    appveyor_cygwin.bat

diff --git a/appveyor_cygwin.bat b/appveyor_cygwin.bat
new file mode 100644 (file)
index 0000000..5e30794
--- /dev/null
+++ b/appveyor_cygwin.bat
@@ -0,0 +1,14 @@
+echo on
+SetLocal EnableDelayedExpansion
+
+if [%Configuration%] NEQ [Debug] goto releaseWin32
+
+:releaseWin32
+if [%Platform%] NEQ [Win32] exit 0
+if [%Configuration%] NEQ [Release] exit 0
+C:\cygwin\bin\bash -e -l -c "mkdir build-Win32-cygwin"
+C:\cygwin\bin\bash -e -l -c ./autogen.sh
+C:\cygwin\bin\bash -e -l -c "cd build-Win32-cygwin"
+C:\cygwin\bin\bash -e -l -c "build-Win32-cygwin/../configure"
+C:\cygwin\bin\bash -e -l -c "make -j4"
+C:\cygwin\bin\bash -e -l -c "make install"
\ No newline at end of file

diff --git a/appveyor_minGW.bat b/appveyor_minGW.bat
new file mode 100644 (file)
index 0000000..70aa30d
--- /dev/null
+++ b/appveyor_minGW.bat
@@ -0,0 +1,24 @@
+echo on
+SetLocal EnableDelayedExpansion
+
+if [%Configuration%] NEQ [Debug] goto releasex64
+
+:releasex64
+if [%Platform%] NEQ [x64] goto releaseWin32
+if [%Configuration%] NEQ [Release] exit 0
+C:\msys64\usr\bin\bash -e -l -c "mkdir build-x64"
+C:\msys64\usr\bin\bash -e -l -c ./autogen.sh
+C:\msys64\usr\bin\bash -e -l -c "cd build-x64"
+C:\msys64\usr\bin\bash -e -l -c "build-x64/../configure --prefix=/mingw64 --build=--build= --host=x86_64-w64-mingw32"
+C:\msys64\usr\bin\bash -e -l -c "make -j4"
+C:\msys64\usr\bin\bash -e -l -c "make install"
+
+:releaseWin32
+if [%Platform%] NEQ [Win32] exit 0
+if [%Configuration%] NEQ [Release] exit 0
+C:\msys64\usr\bin\bash -e -l -c "mkdir build-Win32"
+C:\msys64\usr\bin\bash -e -l -c ./autogen.sh
+C:\msys64\usr\bin\bash -e -l -c "cd build-Win32"
+C:\msys64\usr\bin\bash -e -l -c "build-Win32/../configure --prefix=/mingw32 --build=i686-w64-mingw32 --host=i686-w64-mingw32"
+C:\msys64\usr\bin\bash -e -l -c "make -j4"
+C:\msys64\usr\bin\bash -e -l -c "make install"
\ No newline at end of file

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 790d1e496437a9db65ba7c2252717ef899b01484..795d2bc7a070d2879f5edb090e6bf98a9bd9707b 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11106
+#define LIBUSB_NANO 11108