Browse Source

cygwin and mingw32 on appveyor

Stasik0 9 years ago
parent
commit
2efc343c1a
2 changed files with 26 additions and 6 deletions
  1. 25 5
      appveyor.yml
  2. 1 1
      src/ua_util.h

+ 25 - 5
appveyor.yml

@@ -1,12 +1,32 @@
 version: '{build}'
 os: Visual Studio 2015 RC
 clone_folder: c:\projects\open62541
+environment:
+    global:
+        CYG_ROOT: C:/cygwin
 before_build:
-- set STATICBUILD=true && python -m pip install lxml
+# Workaround for CMake not wanting sh.exe on PATH for MinGW
+- set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+- set PATH=C:\MinGW\bin;%PATH%
 build_script:
 - cd c:\projects\open62541
 - md build
 - cd build
+- echo "Testing cygwin"
+- C:\cygwin\setup-x86.exe -q -P cmake,python-lxml
+- cmd: '%CYG_ROOT%/bin/bash --login -lc "cd /cygdrive/c/projects/open62541/build; cmake -DUA_BUILD_EXAMPLESERVER:BOOL=ON -DUA_BUILD_EXAMPLECLIENT:BOOL=ON -DUA_BUILD_EXAMPLES:BOOL=ON -G\"Unix Makefiles\" ..; make"'
+- cd ..
+- rd /s /q build
+- set STATICBUILD=true && python -m pip install lxml
+- md build
+- cd build
+- echo "Testing MinGW32"
+- cmake -DUA_BUILD_EXAMPLESERVER:BOOL=ON -DUA_BUILD_EXAMPLECLIENT:BOOL=ON -DUA_BUILD_EXAMPLES:BOOL=ON -G"MinGW Makefiles" ..
+- mingw32-make
+- cd ..
+- rd /s /q build
+- md build
+- cd build
 - cmake -DUA_BUILD_EXAMPLESERVER:BOOL=ON -DUA_BUILD_EXAMPLECLIENT:BOOL=ON -DUA_BUILD_EXAMPLES:BOOL=ON -G"Visual Studio 12 2013" ..
 - msbuild open62541.sln
 - echo "Testing amalgamation"
@@ -16,16 +36,16 @@ build_script:
 - cd build
 - cmake -DUA_BUILD_EXAMPLESERVER:BOOL=ON -DUA_BUILD_EXAMPLECLIENT:BOOL=ON -DUA_BUILD_EXAMPLES:BOOL=ON -DUA_ENABLE_AMALGAMATION:BOOL=ON -G"Visual Studio 12 2013" ..
 - msbuild open62541.sln 
-- cp C:\projects\open62541\build\open62541.c C:\projects\open62541\build\Debug\open62541.c
-- cp C:\projects\open62541\build\open62541.h C:\projects\open62541\build\Debug\open62541.h
+- copy C:\projects\open62541\build\open62541.c C:\projects\open62541\build\Debug\open62541.c
+- copy C:\projects\open62541\build\open62541.h C:\projects\open62541\build\Debug\open62541.h
 - cd ..
 - echo "Win 64 build"
 - md build64
 - cd build64
 - cmake -DUA_BUILD_EXAMPLESERVER:BOOL=ON -DUA_BUILD_EXAMPLECLIENT:BOOL=ON -DUA_BUILD_EXAMPLES:BOOL=ON -DUA_ENABLE_AMALGAMATION:BOOL=ON -G"Visual Studio 12 2013 Win64" ..
 - msbuild open62541.sln 
-- cp C:\projects\open62541\build64\open62541.c C:\projects\open62541\build64\Debug\open62541.c
-- cp C:\projects\open62541\build64\open62541.h C:\projects\open62541\build64\Debug\open62541.h
+- copy C:\projects\open62541\build64\open62541.c C:\projects\open62541\build64\Debug\open62541.c
+- copy C:\projects\open62541\build64\open62541.h C:\projects\open62541\build64\Debug\open62541.h
 - cd ..
 after_build:
 - 7z a open62541-win32.zip %APPVEYOR_BUILD_FOLDER%\build\Debug\*

+ 1 - 1
src/ua_util.h

@@ -74,7 +74,7 @@
 #endif
 
 #include <time.h>
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 int gettimeofday(struct timeval *tp, struct timezone *tzp);
 #else
 # include <sys/time.h>