detect symlinks to same packages

After this changes bsb_pkg.ml will not show duplicated packages warning when conflicting packages are symlinks that are pointing to the same folder.

Author: Coobaha

bspack.json

@@ -9,6 +9,7 @@
         "-w",
         "-40-30-3",
         "#{self.root / 'jscomp' / 'stubs' / 'ext_basic_hash_stubs.c'}",
+        "#{self.root / 'jscomp' / 'stubs' / 'realpath.c'}",
         "unix.cmxa",
         "#{self.root / 'lib' / '4.06.1' / 'unstable' / 'bspack.ml'}",
         "-o",

jscomp/bsb/bsb_pkg.ml

@@ -46,6 +46,13 @@ let check_dir dir =
   | true -> Some(dir)
   | false -> None
 
+let is_same_paths a b =
+  if a = b then true
+  else 
+  match Bs_realpath_stubs.realpath a, Bs_realpath_stubs.realpath b with
+  | Some a, Some b -> a = b
+  | _ -> false
+
 let  resolve_bs_package_aux  ~cwd (pkg : t) =
   (* First try to resolve recursively from the current working directory  *)
   let sub_path = make_sub_path pkg   in
@@ -151,7 +158,7 @@ let resolve_bs_package ~cwd (package : t) =
     | Some x
       ->
       let result = resolve_bs_package_aux ~cwd package in
-      if result <> x then
+      if not (is_same_paths result x) then
         begin
           Bsb_log.warn
             "@{<warning>Duplicated package:@} %a %s (chosen) vs %s in %s @." 

jscomp/stubs/bs_realpath_stubs.ml

@@ -0,0 +1 @@
+external realpath : string -> string option = "caml_realpath"

jscomp/stubs/realpath.c

@@ -0,0 +1,34 @@
+#include <caml/mlvalues.h>
+#include <caml/memory.h>
+#include <caml/alloc.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#define Val_none Val_int(0)
+
+static value
+Val_some( value v )
+{
+  CAMLparam1( v );
+  CAMLlocal1( some );
+  some = caml_alloc(1, 0);
+  Store_field( some, 0, v );
+  CAMLreturn( some );
+}
+
+CAMLprim value
+caml_realpath(value v) {
+  char *input;
+  char output[PATH_MAX];
+  char *result;
+
+  CAMLparam1(v);
+
+  input = String_val(v);
+  result = realpath(input, output);
+  if (result == NULL) {
+    CAMLreturn(Val_none);
+  } else {
+    CAMLreturn(Val_some(caml_copy_string(output)));
+  }
+}

scripts/ciTest.js

@@ -92,7 +92,7 @@ function main() {
                 'unstable',
                 'all_ounit_tests.ml'),
             path.join(binDir, 'all_ounit_tests.ml'))
-        cp.execSync(`ocamlopt.opt -g -w -40-30 ../stubs/ext_basic_hash_stubs.c -I +compiler-libs ocamlcommon.cmxa unix.cmxa str.cmxa all_ounit_tests.ml -o test.exe`,
+        cp.execSync(`ocamlopt.opt -g -w -40-30 ../stubs/realpath.c ../stubs/ext_basic_hash_stubs.c -I +compiler-libs ocamlcommon.cmxa unix.cmxa str.cmxa all_ounit_tests.ml -o test.exe`,
             {
                 cwd: binDir,
                 stdio : [0,1,2]

scripts/ninja.js

@@ -1619,6 +1619,7 @@ rule mk_bsversion
 rule gcc
     command = $ocamlopt -ccopt -fPIC -ccopt -O2 -ccopt -o -ccopt $out -c $in
 build stubs/ext_basic_hash_stubs.o : gcc  stubs/ext_basic_hash_stubs.c
+build stubs/realpath.o : gcc  stubs/realpath.c
 rule ocamlmklib
     command = $ocamlmklib $in -o $name
 
@@ -1629,11 +1630,13 @@ build ext/js_reserved_map.ml: mk_keywords ../scripts/build_sorted.ml keywords.li
 
 build stubs/libbs_hash.a stubs/dllbs_hash.so: ocamlmklib stubs/ext_basic_hash_stubs.o
     name = stubs/bs_hash
+build stubs/libbs_realpath.a stubs/dllbs_realpath.so: ocamlmklib stubs/realpath.o
+    name = stubs/bs_realpath
 rule stubslib
     command = $ocamlopt -a $ml -o $out -cclib $clib
-build stubs/stubs.cmxa : stubslib stubs/bs_hash_stubs.cmx stubs/libbs_hash.a
-    ml = stubs/bs_hash_stubs.cmx
-    clib = stubs/libbs_hash.a
+build stubs/stubs.cmxa : stubslib stubs/bs_hash_stubs.cmx stubs/libbs_hash.a stubs/bs_realpath_stubs.cmx stubs/libbs_realpath.a
+    ml = stubs/bs_hash_stubs.cmx stubs/bs_realpath_stubs.cmx
+    clib = stubs/libbs_hash.a stubs/libbs_realpath.a
 
 ${generateVisitorPattern()}
 

scripts/ninjaFactory.js

@@ -12,7 +12,7 @@ function libNinja(config){
 ocamlopt = ${config.ocamlopt}
 ext = ${config.ext}
 INCL = ${config.INCL}
-flags = -nodynlink -I $INCL -g -w -a ../jscomp/stubs/ext_basic_hash_stubs.c
+flags = -nodynlink -I $INCL -g -w -a ../jscomp/stubs/ext_basic_hash_stubs.c ../jscomp/stubs/realpath.c
 rule cc
     command = $ocamlopt $flags $in -o $out ${config.isWin? '' : '&& strip $out'}
     description = Making $out
@@ -32,4 +32,4 @@ build bsc$ext: cc $INCL/whole_compiler.mli $INCL/whole_compiler.ml
 `
 }
 
-exports.libNinja = libNinja
+exports.libNinja = libNinja