utilities: On RHEL 7 systems clean up after upgrade

[ovs.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 32a052455dff28dd95313401c5290a43bed0be0e..49fcae4b5e56a0df3843a66a545456907d845e35 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 version: 1.0.{build}
 branches:
-  only: 
+  only:
   - master
 clone_folder: C:\openvswitch
 init:
@@ -15,9 +15,9 @@ init:
 
     Invoke-WebRequest $source -OutFile $destination
 
-    $source = "http://slproweb.com/download/Win32OpenSSL-1_0_1L.exe"
+    $source = "https://slproweb.com/download/Win32OpenSSL-1_0_2n.exe"
 
-    $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_1L.exe"
+    $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_2n.exe"
 
     Invoke-WebRequest $source -OutFile $destination
 
@@ -27,17 +27,20 @@ init:
 
     cd C:\ovs-build-downloads
 
-    .\Win32OpenSSL-1_0_1L.exe /silent /verysilent /sp- /suppressmsgboxes
+    .\Win32OpenSSL-1_0_2n.exe /silent /verysilent /sp- /suppressmsgboxes
 
     Start-Sleep -s 30
 
     cd C:\openvswitch
 
+    python -m pip install six pypiwin32 --disable-pip-version-check
+
 build_script:
 - '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd"'
 - C:\MinGW\msys\1.0\bin\bash -lc "echo \"C:/MinGW /mingw\" > /etc/fstab"
 - C:\MinGW\msys\1.0\bin\bash -lc "cp /c/pthreads-win32/Pre-built.2/dll/x86/*.dll /c/openvswitch/."
 - C:\MinGW\msys\1.0\bin\bash -lc "mv /bin/link.exe /bin/link_copy.exe"
 - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./boot.sh"
-- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=-lws2_32 --with-pthread=C:/pthreads-win32/Pre-built.2 --with-openssl=C:/OpenSSL-Win32"
+- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -liphlpapi -lwbemuuid -lole32 -loleaut32\" --with-pthread=C:/pthreads-win32/Pre-built.2 --with-openssl=C:/OpenSSL-Win32 --with-vstudiotarget=\"Debug\"
 - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make"
+- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make datapath_windows_analyze"