Use Bloomberg's fork of ocaml compiler, no longer depend on diff

Author: bobzhang

.gitmodules

@@ -53,31 +53,40 @@ Note that you have to clone this project with `--recursive` option, as the core
 ### Linux and Mac OSX
 
 
-1. Apply the patch to OCaml compiler and build
+1. Build the patched OCaml Compiler
 
-  Please ignore the warnings generated by git apply
+  Checkout the `master` branch in the [OCaml Repo](https://github.com/bloomberg/ocaml/tree/master)
+
+  For exmaple:
 
   ```sh
-  cd ocaml
-  git apply ../js.diff
+  git clone https://github.com/bloomberg/ocaml
+  cd ./ocaml
+  git checkout master
   ./configure -prefix `pwd`
   make world.opt
   make install
   ```
 
+  The patched compiler is installed locally into your `$(pwd)/bin`
+  directory, check if `ocamlc.opt` and `ocamlopt.opt` are there, add
+  them into your `$(PATH)`.
+  
 2. Build OCamlScript Compiler
 
   Assume that you have `ocamlopt.opt` in the `PATH`
   ```sh
-  cd ../jscomp
+  cd ./jscomp
   ocamlopt.opt -I +compiler-libs -I bin -c bin/compiler.mli bin/compiler.ml
   ocamlopt.opt -g -linkall -o bin/osc -I +compiler-libs ocamlcommon.cmxa ocamlbytecomp.cmxa  bin/compiler.cmx main.cmx
   ```
 
   Now you have a binary called `osc` under `jscomp/bin` directory,
   put it in your `PATH`.
 
-
+  Our compiler is released as a single file so that for release-builds
+  it does not need any build system(easier to be supported on Windows Platform).
+  
 3. Test 
 
   Create a file called `hello.ml`:

README.md

@@ -306,7 +306,7 @@ module Exp = struct
     match v.expression_desc with 
     | Str (_, x) ->
         assert (String.length x = 1) ;
-        int ~comment:("\"" ^ Ext_string.escaped  x ^ "\"")  
+        int ~comment:(Printf.sprintf "%S"  x )  
           (Char.code x.[0])
     | Char_of_int v -> v 
     | _ -> {comment; expression_desc = Char_to_int v }

js.diff

@@ -601,6 +601,48 @@ include
                                    }, []))
                            }])) : Parsetree.attribute))
              };
+            {
+              Parsetree.pstr_loc = _loc;
+              pstr_desc =
+                (Pstr_attribute
+                   (({ loc = _loc; txt = "ocaml.doc" },
+                      (PStr
+                         [{
+                            Parsetree.pstr_loc = _loc;
+                            pstr_desc =
+                              (Pstr_eval
+                                 ({
+                                    pexp_loc = _loc;
+                                    pexp_desc =
+                                      (Pexp_constant
+                                         (Const_string
+                                            ({|
+ OCamlScript compiler
+ Copyright (C) 2015-2016 Bloomberg Finance L.P.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, with linking exception;
+ either version 2.1 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+ Author: Hongbo Zhang  
+
+|},
+                                              None)));
+                                    pexp_attributes = []
+                                  }, []))
+                          }])) : Parsetree.attribute))
+            };
             str_item]
       end
   end

jscomp/bin/compiler.ml

@@ -47,27 +47,68 @@ let _ =
 
   let str_item  = Ocaml_extract.process files  in
   Pprintast.structure Format.std_formatter 
-    [{
-     Parsetree.pstr_loc = _loc;
-     pstr_desc =
-     (Pstr_attribute
-        (({ loc = _loc; txt = "warning" },
-          (PStr
-             [{
-              Parsetree.pstr_loc = _loc;
-              pstr_desc =
-              (Pstr_eval
-                 ({
-                  pexp_loc = _loc;
-                  pexp_desc =
-                  (Pexp_constant (** my personal preferrence *)
-                     (Const_string ("-a", None)));
-                  pexp_attributes = []
-                }, []))
-            }])) : Parsetree.attribute))
-   };
-     str_item
-   ] 
+    [
+      {
+        Parsetree.pstr_loc = _loc;
+        pstr_desc =
+          (Pstr_attribute
+             (({ loc = _loc; txt = "warning" },
+               (PStr
+                  [{
+                    Parsetree.pstr_loc = _loc;
+                    pstr_desc =
+                      (Pstr_eval
+                         ({
+                           pexp_loc = _loc;
+                           pexp_desc =
+                             (Pexp_constant (** my personal preferrence *)
+                                (Const_string ("-a", None)));
+                           pexp_attributes = []
+                         }, []))
+                  }])) : Parsetree.attribute))
+      } ;
+      {
+        Parsetree.pstr_loc = _loc;
+        pstr_desc =
+          (Pstr_attribute
+             (({ loc = _loc; txt =  "ocaml.doc"},
+               (PStr
+                  [{
+                    Parsetree.pstr_loc = _loc;
+                    pstr_desc =
+                      (Pstr_eval
+                         ({
+                           pexp_loc = _loc;
+                           pexp_desc =
+                             (Pexp_constant (** Copy right header *)
+                                (Const_string ({|
+ OCamlScript compiler
+ Copyright (C) 2015-2016 Bloomberg Finance L.P.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, with linking exception;
+ either version 2.1 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+ Author: Hongbo Zhang  
+
+|}, None)));
+                           pexp_attributes = []
+                         }, []))
+                  }])) : Parsetree.attribute))
+      };
+      str_item
+    ] 
 
 (* local variables: *)
 (* compile-command: "ocamlbuild -no-hygiene -cflags -annot -use-ocamlfind -pkg compiler-libs.common ocaml_pack_main.byte " *)