Merge pull request #3449 from BuckleScript/fix_build

fix build, prepare integration test with 4.06
rescript-lang · Mar 27, 2019 · b8546ee · b8546ee
2 parents c14bf79 + 3d2aa04
commit b8546ee
Show file tree

Hide file tree

Showing 91 changed files with 95,579 additions and 1,885 deletions.
diff --git a/.gitignore b/.gitignore
@@ -89,6 +89,7 @@ odoc_gen/*.cmxs
 lib/prebuilt.ninja
 lib/release.ninja
 lib/build.ninja
+lib/copy.ninja
 jscomp/release.ninja
 jscomp/build.ninja
 jscomp/compiler.ninja
@@ -134,7 +135,6 @@ jscomp/ext/string_set.ml
 jscomp/outcome_printer/tweaked_reason_oprint.ml
 jscomp/outcome_printer/reason_syntax_util.ml
 jscomp/outcome_printer/reason_syntax_util.mli
-native/bin
-native/lib
-native/main
+jscomp/bin/all_ounit_tests.ml
+native/
 vendor/ocaml
diff --git a/jscomp/bin/all_ounit_tests.mli b/jscomp/bin/all_ounit_tests.mli
diff --git a/jscomp/bin/bspack.mli b/jscomp/bin/bspack.mli
diff --git a/jscomp/core/config_whole_compiler.ml b/jscomp/core/config_whole_compiler.ml
@@ -15,7 +15,7 @@
 (**************************************************************************)
 
 (* The main OCaml version string has moved to ../VERSION *)
-let version = "4.06.2+BS"
+let version = "4.06.1+BS"
 let standard_library =
   Filename.concat (Filename.dirname Sys.executable_name)  "ocaml"
 let standard_library_default = standard_library

diff --git a/jscomp/depends/ast_extract.ml b/jscomp/depends/ast_extract.ml
@@ -39,6 +39,7 @@ type 'a kind = 'a Ml_binary.kind
 
 let read_parse_and_extract (type t) (k : t kind) (ast : t) : String_set.t =
   Depend.free_structure_names := String_set.empty;
+  Ext_ref.protect Clflags.transparent_modules false begin fun _ -> 
   List.iter
     (fun modname  ->
 #if OCAML_VERSION =~ ">4.03.0" then
@@ -50,7 +51,7 @@ let read_parse_and_extract (type t) (k : t kind) (ast : t) : String_set.t =
    | Ml_binary.Ml  -> Depend.add_implementation bound_vars ast
    | Ml_binary.Mli  -> Depend.add_signature bound_vars ast  ); 
   !Depend.free_structure_names
-
+  end
 
 type ('a,'b) ast_info =
   | Ml of

diff --git a/jscomp/envConfig.ninja b/jscomp/envConfig.ninja
diff --git a/jscomp/main/ounit_tests_main.ml b/jscomp/main/ounit_tests_main.ml
@@ -41,7 +41,8 @@ let suites =
     Ounit_utf8_test.suites;
     Ounit_unicode_tests.suites;
     Ounit_bsb_regex_tests.suites;
-    Ounit_bsb_pkg_tests.suites
+    Ounit_bsb_pkg_tests.suites;
+    Ounit_depends_format_test.suites;
   ]
 let _ = 
   OUnit.run_test_tt_main suites
diff --git a/jscomp/ounit_tests/ounit_cmd_util.ml b/jscomp/ounit_tests/ounit_cmd_util.ml
@@ -12,7 +12,12 @@ let bsc_bin = project_root // "lib"
 let bsc_exe = bsc_bin // "bsc.exe"
 let runtime_dir = jscomp // "runtime"
 let others_dir = jscomp // "others"
-let stdlib_dir = jscomp // "stdlib"
+
+#if OCAML_VERSION =~ ">4.03.0" then
+let stdlib_dir = jscomp // "stdlib-406"
+#else
+let stdlib_dir = jscomp // "stdlib-402"
+#end
 
 let rec safe_dup fd =
   let new_fd = Unix.dup fd in

diff --git a/jscomp/ounit_tests/ounit_depends_format_test.ml b/jscomp/ounit_tests/ounit_depends_format_test.ml
@@ -1,9 +1,20 @@
 let ((>::),
      (>:::)) = OUnit.((>::),(>:::))
 
-let (=~) = OUnit.assert_equal
+let (=~) (xs : string list) (ys : string list) = 
+     OUnit.assert_equal xs ys 
+     ~printer:(fun xs -> String.concat "," xs )
+
+let f (x : string) = 
+     let stru = Parse.implementation (Lexing.from_string x)  in 
+     Ast_extract.String_set.elements (Ast_extract.read_parse_and_extract Ml_binary.Ml stru)
+
+
 let suites = 
   __FILE__
   >::: [
-
+    __LOC__ >:: begin fun _ -> 
+      f {|module X = List|} =~ ["List"];
+      f {|module X = List module X0 = List1|} =~ ["List";"List1"]
+    end 
   ]
diff --git a/jscomp/snapshot.ninja b/jscomp/snapshot.ninja
@@ -16,7 +16,7 @@ OCAML_SRC_TOOLS=$NATIVE_OCAML_PATH/tools
 includes = -I stubs -I ext -I common -I syntax -I depends -I core -I super_errors -I outcome_printer -I bsb -I ounit -I ounit_tests -I main
 SNAP=../lib/$snapshot_path
 
-build snapshot: phony  $SNAP/whole_compiler.ml $SNAP/bsppx.ml $SNAP/bsdep.ml $SNAP/bsb_helper.ml $SNAP/bsb.ml $SNAP/bspp.ml bin/all_ounit_tests.ml
+build snapshot: phony  $SNAP/whole_compiler.ml $SNAP/bsppx.ml $SNAP/bsdep.ml $SNAP/bsb_helper.ml $SNAP/bsb.ml $SNAP/bspp.ml $SNAP/unstable/all_ounit_tests.ml
 
 build $SNAP/whole_compiler.ml: bspack | ./bin/bspack.exe
     flags = ${releaseMode} -bs-MD -module-alias Config=Config_whole_compiler -bs-exclude-I config  -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING -I $OCAML_SRC_TYPING -I $OCAML_SRC_BYTECOMP -I $OCAML_SRC_DRIVER   ${includes}
@@ -45,24 +45,26 @@ build $SNAP/bspp.ml: bspack | ./bin/bspack.exe
      flags = -D BS_MIN_LEX_DEPS=true ${releaseMode} -bs-MD -module-alias Config=Config_whole_compiler   -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING?parser   -I common -I ext -I syntax -I depends -I bspp -I core -I main 
      main = Bspp_main 
 
-build ./bin/bsb_native.ml: bspack | ./bin/bspack.exe
+build $SNAP/unstable/bsb_native.ml: bspack | ./bin/bspack.exe
      flags =   -D BS_MIN_LEX_DEPS=true -D BS_NATIVE=true -bs-MD ${releaseMode} -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING -I stubs -I common -I ext -I syntax -I depends -I bsb -I ext -I main 
      main = Bsb_main 
 
-build ./bin/native_ppx.ml: bspack | ./bin/bspack.exe     
+build $SNAP/unstable/native_ppx.ml: bspack | ./bin/bspack.exe     
      flags =   -D BS_MIN_LEX_DEPS=true -D BS_NATIVE=true -bs-MD ${releaseMode} -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING -I stubs -I common -I ext -I syntax -I depends -I bsb -I ext -I main 
      main = Native_ppx_main
 
-rule bsbnative
-    command = $ocamlopt -w -a  unix.cmxa str.cmxa  ./stubs/ext_basic_hash_stubs.c $in -o $out
-# only check if it compiles     
-build ./bin/bsb_native.exe: bsbnative ./bin/bsb_native.ml
 
-build bin/all_ounit_tests.ml: bspack | ./bin/bspack.exe
+build $SNAP/unstable/all_ounit_tests.ml: bspack | ./bin/bspack.exe
     flags =  -bs-MD    -I ounit -I ounit_tests  -I stubs -I bsb -I common -I ext -I syntax -I depends -I bspp -I core -I main
     main = Ounit_tests_main         
 
-build bin/bspack.ml: bspack | ./bin/bspack.exe 
+build $SNAP/unstable/bspack.ml: bspack | ./bin/bspack.exe 
     flags = -bs-MD -module-alias Config=Config_whole_compiler  -I $OCAML_SRC_PARSING -I $OCAML_SRC_UTILS -I stubs -I ext -I common -I depends -I core -I main -bs-main Bspack_main
     main = Bspack_main
 
+# Check it later 
+# rule bsbnative
+#     command = $ocamlopt -w -a  unix.cmxa str.cmxa  ./stubs/ext_basic_hash_stubs.c $in -o $out
+#  only check if it compiles     
+# build $SNAP/unstable/bsb_native.exe: bsbnative ./bin/bsb_native.ml
+
diff --git a/jscomp/vendorConfig.ninja b/jscomp/vendorConfig.ninja
diff --git a/lib/4.02.3+BS/bsb.mli b/lib/4.02.3+BS/bsb.mli
diff --git a/lib/4.02.3+BS/bsb_helper.mli b/lib/4.02.3+BS/bsb_helper.mli
diff --git a/lib/4.02.3+BS/bsdep.mli b/lib/4.02.3+BS/bsdep.mli
diff --git a/lib/4.02.3+BS/bspp.mli b/lib/4.02.3+BS/bspp.mli
diff --git a/lib/4.02.3+BS/bsppx.mli b/lib/4.02.3+BS/bsppx.mli
diff --git a/lib/4.02.3+BS/whole_compiler.mli b/lib/4.02.3+BS/whole_compiler.mli
diff --git a/lib/4.02.3+BS/bsb.ml → lib/4.02.3/bsb.ml b/lib/4.02.3+BS/bsb.ml → lib/4.02.3/bsb.ml
diff --git a/lib/4.02.3+BS/bsb.ml.d → lib/4.02.3/bsb.ml.d b/lib/4.02.3+BS/bsb.ml.d → lib/4.02.3/bsb.ml.d
@@ -1,4 +1,4 @@
-../lib/4.02.3+BS/bsb.ml:
+../lib/4.02.3/bsb.ml:
 ./bsb/bsb_build_schemas.ml
 ./bsb/bsb_build_util.ml
 ./bsb/bsb_build_util.mli

diff --git a/lib/4.02.3+BS/reactjs_jsx_ppx_v2.mli → lib/4.02.3/bsb.mli b/lib/4.02.3+BS/reactjs_jsx_ppx_v2.mli → lib/4.02.3/bsb.mli
diff --git a/lib/4.02.3+BS/bsb_helper.ml → lib/4.02.3/bsb_helper.ml b/lib/4.02.3+BS/bsb_helper.ml → lib/4.02.3/bsb_helper.ml
diff --git a/lib/4.02.3+BS/bsb_helper.ml.d → lib/4.02.3/bsb_helper.ml.d b/lib/4.02.3+BS/bsb_helper.ml.d → lib/4.02.3/bsb_helper.ml.d
@@ -1,4 +1,4 @@
-../lib/4.02.3+BS/bsb_helper.ml:
+../lib/4.02.3/bsb_helper.ml:
 ./bsb/bsb_db.ml
 ./bsb/bsb_db.mli
 ./bsb/bsb_db_io.ml

diff --git a/lib/4.06.1+BS/reactjs_jsx_ppx_v2.mli → lib/4.02.3/bsb_helper.mli b/lib/4.06.1+BS/reactjs_jsx_ppx_v2.mli → lib/4.02.3/bsb_helper.mli
diff --git a/lib/4.02.3+BS/bsdep.ml → lib/4.02.3/bsdep.ml b/lib/4.02.3+BS/bsdep.ml → lib/4.02.3/bsdep.ml
diff --git a/lib/4.02.3+BS/bsdep.ml.d → lib/4.02.3/bsdep.ml.d b/lib/4.02.3+BS/bsdep.ml.d → lib/4.02.3/bsdep.ml.d
@@ -1,4 +1,4 @@
-../lib/4.02.3+BS/bsdep.ml:
+../lib/4.02.3/bsdep.ml:
 ../ocaml/driver/compenv.ml
 ../ocaml/driver/compenv.mli
 ../ocaml/driver/pparse.ml

diff --git a/lib/4.02.3/bsdep.mli b/lib/4.02.3/bsdep.mli
diff --git a/lib/4.02.3+BS/bspp.ml → lib/4.02.3/bspp.ml b/lib/4.02.3+BS/bspp.ml → lib/4.02.3/bspp.ml
diff --git a/lib/4.02.3+BS/bspp.ml.d → lib/4.02.3/bspp.ml.d b/lib/4.02.3+BS/bspp.ml.d → lib/4.02.3/bspp.ml.d
@@ -1,4 +1,4 @@
-../lib/4.02.3+BS/bspp.ml:
+../lib/4.02.3/bspp.ml:
 ../ocaml/parsing/lexer.ml
 ../ocaml/parsing/lexer.mli
 ../ocaml/parsing/location.ml

diff --git a/lib/4.02.3/bspp.mli b/lib/4.02.3/bspp.mli
diff --git a/lib/4.02.3+BS/bsppx.ml → lib/4.02.3/bsppx.ml b/lib/4.02.3+BS/bsppx.ml → lib/4.02.3/bsppx.ml
diff --git a/lib/4.02.3+BS/bsppx.ml.d → lib/4.02.3/bsppx.ml.d b/lib/4.02.3+BS/bsppx.ml.d → lib/4.02.3/bsppx.ml.d
@@ -1,4 +1,4 @@
-../lib/4.02.3+BS/bsppx.ml:
+../lib/4.02.3/bsppx.ml:
 ../ocaml/parsing/ast_helper.ml
 ../ocaml/parsing/ast_helper.mli
 ../ocaml/parsing/asttypes.mli

diff --git a/lib/4.02.3/bsppx.mli b/lib/4.02.3/bsppx.mli
diff --git a/lib/4.02.3+BS/reactjs_jsx_ppx_v2.ml → lib/4.02.3/reactjs_jsx_ppx_v2.ml b/lib/4.02.3+BS/reactjs_jsx_ppx_v2.ml → lib/4.02.3/reactjs_jsx_ppx_v2.ml
diff --git a/lib/4.02.3/reactjs_jsx_ppx_v2.mli b/lib/4.02.3/reactjs_jsx_ppx_v2.mli
diff --git a/lib/4.02.3+BS/refmt_main3.ml → lib/4.02.3/refmt_main3.ml b/lib/4.02.3+BS/refmt_main3.ml → lib/4.02.3/refmt_main3.ml
diff --git a/lib/4.02.3+BS/refmt_main3.mli → lib/4.02.3/refmt_main3.mli b/lib/4.02.3+BS/refmt_main3.mli → lib/4.02.3/refmt_main3.mli