From 8f0f77233d65287762033d93413b22c6564b36d8 Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Sun, 11 Aug 2019 02:47:36 -0700
Subject: [PATCH] fix msys2 and travis builds (#1118)

* fix msys2 builds

* move to travis xenial

now the default

* add i386 cmocka

* move to only different cmocka on 32 bit build

* minimize packages on non x86
---
 .appveyor.yml |  2 +-
 .travis.yml   | 43 +------------------------------------------
 Makefile      |  4 ++--
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9c06dd79..73124168 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,7 +2,7 @@
 environment:
     CYG_MIRROR: http://cygwin.mirror.constant.com
     CYG_PACKAGES: make,gcc-core,clang,pkg-config,libpcre-devel,cmake,python27-setuptools,ruby,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core
-    MSYS_PACKAGES: mingw-w64-x86_64-cmocka mingw-w64-i686-cmocka mingw-w64-x86_64-python2-setuptools mingw-w64-i686-python2-setuptools
+    MSYS_PACKAGES: mingw-w64-x86_64-cmocka mingw-w64-i686-cmocka mingw-w64-x86_64-python3-setuptools mingw-w64-i686-python3-setuptools
     matrix:
         - MSYSTEM: MINGW64
           BASH: C:\msys64\usr\bin\bash
diff --git a/.travis.yml b/.travis.yml
index c52083dc..a7b291cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: c
 sudo: false
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./install-cmocka-linux.sh; fi
 env:
   - PATH=$PATH:/usr/local/opt/binutils/bin
 script:
@@ -18,40 +16,6 @@ matrix:
       compiler: gcc
       env: CFLAGS="-m32" LDFLAGS="-m32" LDFLAGS_STATIC="-m32" UNICORN_QEMU_FLAGS="--cpu=i386"
       script: make && make -C tests/unit test && make -C tests/regress test
-    - os: linux
-      dist: xenial
-      before_install:
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - lib32ncurses5-dev
-            - lib32z1-dev
-            - libpthread-stubs0-dev
-            - lib32gcc-4.8-dev
-            - libc6-dev-i386
-            - gcc-multilib
-            - libcmocka-dev
-    - os: linux
-      dist: xenial
-      before_install:
-      compiler: clang
-      addons:
-        apt:
-          packages:
-            - lib32ncurses5-dev
-            - lib32z1-dev
-            - libpthread-stubs0-dev
-            - lib32gcc-4.8-dev
-            - libc6-dev-i386
-            - gcc-multilib
-            - libcmocka-dev
-    - os: linux
-      dist: xenial
-      before_install:
-      compiler: gcc
-      env: CFLAGS="-m32" LDFLAGS="-m32" LDFLAGS_STATIC="-m32" UNICORN_QEMU_FLAGS="--cpu=i386"
-      script: make && make -C tests/unit test && make -C tests/regress test
       addons:
         apt:
           packages:
@@ -76,13 +40,8 @@ matrix:
 addons:
   apt:
     packages:
-      - lib32ncurses5-dev
-      - lib32z1-dev
-      - lib32bz2-dev
       - libpthread-stubs0-dev
-      - lib32gcc-4.8-dev
-      - libc6-dev-i386
-      - gcc-multilib
+      - libcmocka-dev
   homebrew:
     update: true
     brewfile: true
diff --git a/Makefile b/Makefile
index 715f7092..0db790bc 100644
--- a/Makefile
+++ b/Makefile
@@ -245,9 +245,9 @@ else
 endif
 ifeq ($(DO_WINDOWS_EXPORT),1)
 ifneq ($(filter MINGW32%,$(UNAME_S)),)
-	cmd /c "windows_export.bat x86"
+	cmd //C "windows_export.bat x86"
 else
-	cmd /c "windows_export.bat x64"
+	cmd //C "windows_export.bat x64"
 endif
 endif
 endif