Update build system and some fixes on the test-suite on Windows

Summary:
This PR:

-  add build.ocp and 00_config.ocp to compile Flow with ocp-build.
- fix in the test-suite for Windows
  - Fix `temp_dir` test on Windows
  - Socket files are not recognized as on Linux, so we cannot use '-S' option in bash file. On Windows we juste check as a regular file ('-f').
  - We deactivate some tests on Windows which involve symlinks.

PS: This work was done in order to make version 0.19.1 work on
Windows. We couldn't rebase it as it depends on previous PR that have
not been merged in master yet.
Closes facebook#1187

Reviewed By: svcscm

Differential Revision: D2768382

Pulled By: mroch

fb-gh-sync-id: 1aa8107ede4112995fb94af8949b661416203026

Author: Cagdas Bozman

.gitignore

@@ -1,6 +1,7 @@
 *TAGS
 _build
-_obuild
+/_obuild
+/.ocp
 .DS_STORE
 docs/_site/
 bin

00_config.ocp

@@ -0,0 +1,7 @@
+
+have_lz4 = false
+debug = false
+(*
+ccopt += [ "-IC:\path\to\lz4\lib" ]
+cclib += [ "-LC:\path\to\lz4\lib" ]
+*)

Makefile

@@ -117,7 +117,7 @@ build-flow: build-flow-native-deps $(FLOWLIB)
 
 build-flow-with-ocp: build-flow-stubs-with-ocp
 	[ -d _obuild ] || ocp-build init
-	ocp-build build
+	ocp-build build flow
 
 build-flow-debug: build-flow-native-deps $(FLOWLIB)
 	ocamlbuild -lflags -custom -no-links $(INCLUDE_OPTS) $(LIB_OPTS) -lflags "$(LINKER_FLAGS)" src/flow.d.byte

README.win32

@@ -11,45 +11,43 @@ generate OCaml applications with it without installing Cygwin or
 Windows SDK.
 
 To download and install OCPWin, go to http://www.typerex.org/ocpwin.html,
-and choose the "full" version. OCPWin installer is known to have problems
+and choose the "full" version. OCPWin installer was known to have problems
 with PATHs exceeding 1024 characters. Be careful to save your PATH before
 the installation to be able to restore it in case of problem, until the
 problem is fixed.
 
 ### Configuration and Compilation
 
-In the Hack root directory, edit the file  `00_config.ocp`
+In the Flow root directory, edit the file  `00_config.ocp`
 and adjust the two following variables:
 
     has_lz4 = false (* true if lz4 is installed on your machine *)
     debug = false   (* true if you want to activate the debug mode *)
 
-NOTE: lz4 is not required to build Hack. If you want to use it, and lz4 is not
-      installed in the default path, you have to set the
-      `ccopt` variable correctly in the `00_config.ocp` file. For instance:
+NOTE: lz4 is not required to build Flow. If you want to use it, and
+      lz4 is not installed in the default path, you have to set the
+      `ccopt` variable correctly in the `00_config.ocp` file. For
+      instance:
 
     ccopt = [ "-I/PATH/TO/LZ4/DIRECTORY" ]
     cclib = [ "-L/PATH/TO/LZ4/DIRECTORY" ]
 
 Then, execute the `make.bat` script:
 
-    ./make
+    ./make.bat
 
 This will call `ocp-build` and copy the generated files into the bin/
 sub-directory.
 
 If you want to clean your project, you may use:
 
-    ./make clean
+    ./make.bat clean
 
-Optionally, to run the test-suite adjust the path to the `python.exe`
-in `make.bat`, and run:
+Optionally, to run the test-suite, install [Git for
+Windows](https://git-scm.com/downloads) start git bash tool and launch
+the testsuite:</p>
 
-    ./make test
-
-### Installing
-
-Coming soon
+    ./runtest.sh ./bin/flow.exe
 
 ### FAQ
 

build.ocp

@@ -100,17 +100,20 @@ begin library "flow-typing"
     "src/typing/changeset.ml"
     "src/typing/type.ml"
     "src/typing/constraint_js.ml"
+    "src/typing/modulename.ml"
     "src/typing/context.ml"
     "src/typing/type_printer.ml"
     "src/typing/type_visitor.ml"
     "src/typing/scope.ml"
     "src/typing/trace.ml"
-    "src/typing/debug.ml"
+    "src/typing/debug_js.ml"
     "src/typing/flow_js.ml"
     "src/typing/env_js.ml"
     "src/typing/type_inference_hooks_js.ml"
     "src/typing/autocomplete_js.ml"
     "src/typing/module_js.ml"
+    "src/typing/refinement.ml"
+    "src/typing/abnormal.ml"
     "src/typing/type_inference_js.ml"
     "src/typing/comments_js.ml"
     "src/typing/getDef_js.ml"
@@ -130,6 +133,7 @@ begin library "flow-server"
     "src/server/serverPeriodical.ml"
     "src/server/serverFunctors.ml"
     "src/server/autocompleteService_js.ml"
+    "src/services/inference/query_types.ml"
     "src/server/server.ml"
   ]
 end

runtests.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 if [[ "$OSTYPE" == "darwin"* ]]; then
   _canonicalize_file_path() {
     local dir file
@@ -93,7 +94,13 @@ runtest() {
     cd "$dir" || exit 1
     name=${dir##*/}
     exp_file="${name}.exp"
-    if [[ -z $filter || $name =~ $filter ]]
+    # On Windows we skip some tests as symlinks not available
+    if [ "$OSTYPE" = "msys" ]  &&
+      ([ $name = "symlink" ] ||
+       [ $name = "node_tests" ])
+    then
+        return $RUNTEST_SKIP
+    elif [[ -z $filter || $name =~ $filter ]]
     then
         if ([ ! -e "$exp_file" ] || [ ! -e ".flowconfig" ])
         then
@@ -203,7 +210,7 @@ runtest() {
             trap - SIGINT SIGTERM
         fi
         diff_file="${name}.diff"
-        diff -u "$exp_file" "$out_file" > "$diff_file"
+        diff -u --strip-trailing-cr "$exp_file" "$out_file" > "$diff_file"
         if [ -s "$diff_file" ]
         then
             return_status=$RUNTEST_FAILURE

tests/temp_dir/test.sh

@@ -3,7 +3,11 @@ FLOW=$1
 $FLOW stop 2> /dev/null > /dev/null
 mkdir -p tmp/flow
 $FLOW start --wait --temp-dir tmp/flow
-[ -S tmp/flow/*.sock ]    && echo "sock file exists"
+if [[ "$OSTYPE" == "msys"* ]]; then
+    [ -f tmp/flow/*.sock ]    && echo "sock file exists"
+else
+    [ -S tmp/flow/*.sock ]    && echo "sock file exists"
+fi
 [ -d tmp/flow/flowlib_* ] && echo "flowlib exists"
 [ -f tmp/flow/*.init ]    && echo "init file exists"
 [ -f tmp/flow/*.lock ]    && echo "lock file exists"