Merge pull request #367 from bloomberg/make_version_correct

bobzhang · bobzhang · commit fdade828d8de · 2016-05-12T10:56:22.000-04:00
make version correct, also distribute other ocaml binaries
diff --git a/.gitignore b/.gitignore
@@ -54,4 +54,17 @@ bin/*
 
 # for npm publish
 !bin/bsc
+!bin/ocaml
+!bin/ocamldep
+!bin/ocamldep.opt
+!bin/ocamlyacc
+!bin/ocamllex.opt
+!bin/ocamllex
+!bin/ocamlobjinfo
+!bin/ocamlopt
+!bin/ocamlopt.opt
+!bin/ocamlrun
+!bin/ocamlc
+!bin/ocamlc.opt
+
 !ocaml.tar.gz
diff --git a/bin/ocaml b/bin/ocaml
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamlc b/bin/ocamlc
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamlc.opt b/bin/ocamlc.opt
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamldep b/bin/ocamldep
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamldep.opt b/bin/ocamldep.opt
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamllex b/bin/ocamllex
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamllex.opt b/bin/ocamllex.opt
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamlobjinfo b/bin/ocamlobjinfo
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamlopt b/bin/ocamlopt
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamlopt.opt b/bin/ocamlopt.opt
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamlrun b/bin/ocamlrun
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/bin/ocamlyacc b/bin/ocamlyacc
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2
diff --git a/jscomp/js_main.ml b/jscomp/js_main.ml
@@ -12,7 +12,31 @@
 
 open Config
 open Clflags
-open Compenv
+(* open Compenv *)
+
+let output_prefix = Compenv.output_prefix
+let readenv = Compenv.readenv
+let first_ccopts = Compenv.first_ccopts
+let first_ppx = Compenv.first_ppx
+
+let bs_version_string = 
+  "BuckleScript " ^ Js_config.version ^
+  " (Using OCaml" ^ Config.version ^ " )"
+
+let print_version_and_library compiler =
+  Printf.printf "The OCaml %s, version " compiler;
+  print_string bs_version_string; print_newline();
+  print_string "Standard library directory: ";
+  print_string Config.standard_library; print_newline();
+  exit 0
+
+let print_standard_library = Compenv.print_standard_library
+
+let print_version_string () = 
+  print_string bs_version_string;
+  print_newline (); 
+  exit 0 
+
 
 
 let process_interface_file ppf name =
@@ -131,11 +155,14 @@ end)
 
 let add_include_path s = 
   let (//) = Filename.concat in
-  (*TODO: check its existence *)
   let path = 
     Ext_filename.resolve 
       (Lazy.force Ext_filename.cwd) s // "lib"// "ocaml"  in 
-  Clflags.include_dirs := path :: ! Clflags.include_dirs
+  if Ext_sys.is_directory_no_exn path then 
+    Clflags.include_dirs := path :: ! Clflags.include_dirs
+  else 
+    Ext_pervasives.failwithf "%s is not a directory" s 
+
 
 let buckle_script_flags = 
   ("-js-npm-output-path", Arg.String Js_config.set_npm_package_path, 
diff --git a/package.json b/package.json
@@ -33,7 +33,15 @@
         "url": "git+https://github.com/bloomberg/bucklescript.git"
     },
     "bin" : {
-        "bsc" : "./bin/bsc"
+        "bsc" : "./bin/bsc",
+        "ocaml": "./bin/ocaml",
+        "ocamlc":"./bin/ocamlc.opt", 
+        "ocamldep" : "./bin/ocamldep.opt", 
+        "ocamllex" : "./bin/ocamllex.opt",
+        "ocamlobjinfo" : "./bin/ocamlobjinfo",
+        "ocamlopt.opt" : "./bin/ocamlopt",
+        "ocamlrun": "./bin/ocamlrun",
+        "ocamlyacc" : "./bin/ocamlyacc"
     } ,
     "keywords": [
         "ocaml",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/sh`
	`2`	`+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"`
	`3`	`+exit 2`