Split Windows build off into vfdeps-win

[skip ci]
verifast · Jul 21, 2019 · fea1825 · fea1825
1 parent 821f025
commit fea1825
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 303 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ language: C
 os:
   - linux
   - osx
-  - windows
 
 dist: trusty
 

diff --git a/build.sh b/build.sh
@@ -36,13 +36,8 @@ elif [ $(uname -s) = "Darwin" ]; then
 
 else
 
-    # Assume we're on Windows
-    VFDEPS_PARENT_DIR=C:/
-    VFDEPS_PLATFORM=win
-
-    VFDEPS_DIR=$VFDEPS_PARENT_DIR/$VFDEPS_DIRNAME
-
-    /c/cygwin/bin/bash -lc "cd /cygdrive/$BUILD_DIR/win32 && make PREFIX=$VFDEPS_DIR"
+    echo "Your OS is not supported by this script. For Windows, see verifast/vfdeps-win."
+    exit 1
 
 fi
 

diff --git a/setup-build.sh b/setup-build.sh
@@ -35,10 +35,7 @@ elif [ $(uname -s) = "Darwin" ]; then
 
 else
 
-  # We assume we're on Windows
-  curl -o cygwin-setup-x86.exe -Lf https://cygwin.com/setup-x86.exe
-  ./cygwin-setup-x86.exe -B -qnNd -R c:/cygwin -l c:/cygwin/var/cache/setup -s http://ftp.inf.tu-dresden.de/software/windows/cygwin32/ -P p7zip -P cygutils-extra -P make -P mingw64-i686-gcc-g++ -P mingw64-i686-gcc-core -P mingw64-i686-gcc -P patch -P rlwrap -P libreadline6 -P diffutils -P mingw64-i686-binutils
-
-  echo "none /cygdrive cygdrive binary,posix=0,user,noacl 0 0" > c:/cygwin/etc/fstab
+  echo "Your OS is not supported by this script. For Windows, see verifast/vfdeps-win."
+  exit 1
 
 fi
diff --git a/win32/Makefile b/win32/Makefile
diff --git a/win32/download_and_untar b/win32/download_and_untar
diff --git a/win32/download_and_unzip b/win32/download_and_unzip
diff --git a/win32/ocaml-Makefile.patch b/win32/ocaml-Makefile.patch
diff --git a/win32/pkg-config b/win32/pkg-config
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ language: C @@
     os:
       - linux
       - osx
-      - windows
     dist: trusty
@@ Expand Down @@