try to unify build experience

Author: bobzhang

jscomp/bin/bspack.ml

@@ -1,22 +1,24 @@
 ../ocaml/utils/terminfo
 ../ocaml/utils/warnings
 ../ocaml/parsing/location
-common/bs_exception
-../ocaml/utils/clflags
 ../ocaml/parsing/asttypes
 ../ocaml/utils/misc
 ../ocaml/parsing/longident
 ../ocaml/parsing/parsetree
-depends/depend
+depends/binary_ast
 ext/ext_pervasives
 ext/ext_bytes
 ext/ext_string
 ext/literals
 ext/ext_filename
+ext/string_map
+depends/binary_cache
+common/bs_exception
+../ocaml/utils/clflags
+../ocaml/parsing/depend
 ext/ext_format
 ext/ext_list
 common/js_config
-ext/string_map
 depends/ast_extract
 ext/ext_io
 ../ocaml/parsing/docstrings

jscomp/bin/bspack.mllib

@@ -239,7 +239,7 @@ let specs : (string * Arg.spec * string) list =
     "-o", (Arg.String set_output),
     " Set output file (default to stdout)" ;
     "-with-header", (Arg.Set header_option),
-    " with header of time stamp(can also be set with env variable BS_RELEASE_BUILD)" ; 
+    " with header of time stamp" ; 
     "-bs-exclude-I", (Arg.String add_exclude),
     " don't read and pack such modules from -I (in the future, we should detect conflicts in mllib or commandline) "
     ;
@@ -266,8 +266,7 @@ let () =
            | Some file -> open_out file)  in
      let emit_header out_chan = 
        let local_time = Unix.(localtime (gettimeofday ())) in
-       (if  !header_option (* || *)
-            (* (try ignore (Sys.getenv "BS_RELEASE_BUILD") ; true with _ -> false) *)
+       (if  !header_option 
         then
           output_string out_chan
             (Printf.sprintf "(** Generated by bspack %02d/%02d-%02d:%02d *)\n"

jscomp/bspack_main.ml

@@ -6,15 +6,12 @@ ident_util
 idents_analysis
 config_util
 bs_conditional_initial
-
 ocaml_options
 ocaml_batch_compile
 ocaml_parse
-
 lam
 lam_iter
 lam_print
-
 lam_compile_env
 lam_dispatch_primitive
 lam_stats
@@ -34,7 +31,6 @@ lam_compile_global
 lam_compile_primitive
 lam_beta_reduce
 lam_beta_reduce_util 
-
 lam_compile_external_call
 lam_compile_group
 lam_inline_util
@@ -43,12 +39,8 @@ lam_module_ident
 lam_dce
 lam_analysis
 lam_group
-
-
-
 j
 js_ast_util
-
 js_arr
 js_program_loader
 js_output
@@ -62,7 +54,6 @@ js_pass_flatten_and_mark_dead
 js_pass_scope
 js_call_info
 js_pass_debug
-
 js_of_lam_option
 js_of_lam_float_record
 js_of_lam_record
@@ -87,6 +78,4 @@ js_exp_make
 js_stmt_make
 js_cmj_datasets
 js_main
-
-
 lam_exit_code

jscomp/core.mllib

@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+export BS_RELEASE_BUILD=1
+export OCAMLPARAM='_,bin-annot=1' 
+export OCAMLRUNPARAM=b
+
+if [ $BS_TRAVIS_CI ]
+then 
+    git submodule update --init --recursive
+    OCAML=ocaml
+else 
+    OCAML=ocaml_src
+    if [  -f "ocaml.tar.gz" ]
+    then 
+        echo "ocaml.tar.gz already exists"
+        rm -rf $OCAML
+        mkdir -p $OCAML
+        tar -zxvf ./ocaml.tar.gz -C $OCAML
+    else
+        echo "creating ocaml from github"
+        git clone -b master --depth 1 https://github.com/bloomberg/ocaml $OCAML
+    fi
+fi 
+
+cd $OCAML &&  ./configure -prefix $(dirname $(pwd))  -no-ocamldoc -no-ocamlbuild -no-shared-libs -no-curses -no-graph -no-pthread -no-debugger  && make -j9 world.opt && make install  && cd ..

scripts/buildocaml.sh

@@ -98,36 +98,73 @@ function getConfigOutput(){
 }
 
 
-var config_map = getConfigOutput()
-console.log('config_map',config_map)
 
-if(config_map && config_map.version.indexOf('4.02.3') >= 0 ){
-    //
-    if (is_windows){
-        process.env.WIN32='1'
-    }
-    var whole_compiler_config = path.join(jscomp, 'bin', 'config_whole_compiler.ml' )
-    var content = fs.readFileSync(whole_compiler_config,'utf8')
-    var generated =  content.replace(/%%(\w+)%%/g,
-        function(_whole,p0){
-            if(p0 === "LIBDIR"){
-              //Escape
-              var origin_path = path.join(working_dir,'lib','ocaml')
-              return JSON.stringify(origin_path).slice(1,-1)
+
+function patch_config(config_map){
+    var whole_compiler_config = path.join(jscomp, 'bin', 'config_whole_compiler.ml')
+    var content = fs.readFileSync(whole_compiler_config, 'utf8')
+    var generated = content.replace(/%%(\w+)%%/g,
+        function (_whole, p0) {
+            if (p0 === "LIBDIR") {
+                //Escape
+                var origin_path = path.join(working_dir, 'lib', 'ocaml')
+                return JSON.stringify(origin_path).slice(1, -1)
             }
-            else{
+            else {
                 return config_map[map[p0]]
             }
         })
 
     fs.writeFileSync(whole_compiler_config, generated, 'utf8')
-    var working_config = {cwd : jscomp , stdio : [0,1,2]}
+}
+function install_bsc() {
+
+
+    if (is_windows) {
+        process.env.WIN32 = '1'
+    }
+    var working_config = { cwd: jscomp, stdio: [0, 1, 2] }
     console.log("Build the compiler and runtime .. ")
     child_process.execSync("make dist-world", working_config)
     console.log("Installing")
     child_process.execSync('make VERBOSE=true install', working_config)
 
+}
+/*
+function install_built_in_compiler(){
+    var env = process.env;
+    env.BS_RELEASE_BUILD = 1; 
+    // env.OCAMLPARAM='_,bin-annot=1'
+    var ocaml_build_dir; 
+    if(env.BS_TRAVIS_CI){
+        ocaml_build_dir = path.join(__dirname,'..','ocaml')
+        child_process.execSync('git submodule update --init --recursive')
+        
+    }else{
+        ocaml_build_dir = path.join(__dirname,'..','ocaml_src')
+        ocaml_tar = path.join(__dirname,'..','ocaml.tar.gz') 
+        if(fs.existsSync(ocaml_tar)){
+            console.log('ocaml.tar.gz already exists')
+            child_process.execSync("rm -rf " + ocaml_build_dir + " && mkdir -p " + ocaml_build_dir + )
+        }
+    }
+}
+*/
+
+
+var config_map = getConfigOutput()
+console.log('config_map',config_map)
+
+if(config_map && config_map.version.indexOf('4.02.3') >= 0 ){
+    patch_config(config_map);
+    install_bsc()
 }else{
     // No compiler existed
+    child_process.execSync(path.join(__dirname,'buildocaml.sh'))
+    process.env.PATH = path.join(__dirname,'..','bin') + path.delimiter + process.env.PATH
+    console.log('configure again with local ocaml installed')
+    config_map = getConfigOutput()
+    console.log('config_map', config_map)
+    patch_config(config_map)
     child_process.execSync(path.join(__dirname,'postinstall.sh'))
 }

scripts/config.js

@@ -2,30 +2,6 @@
 set -e
 
 export BS_RELEASE_BUILD=1
-export OCAMLPARAM='_,bin-annot=1' 
-export OCAMLRUNPARAM=b
-
-if [ $BS_TRAVIS_CI ]
-then 
-    git submodule update --init --recursive
-    OCAML=ocaml
-else 
-    OCAML=ocaml_src
-    if [  -f "ocaml.tar.gz" ]
-    then 
-        echo "ocaml.tar.gz already exists"
-        rm -rf $OCAML
-        mkdir -p $OCAML
-        tar -zxvf ./ocaml.tar.gz -C $OCAML
-    else
-        echo "creating ocaml from github"
-        git clone -b master --depth 1 https://github.com/bloomberg/ocaml $OCAML
-    fi
-fi 
-
-cd $OCAML &&  ./configure -prefix $(dirname $(pwd))  -no-ocamldoc -no-ocamlbuild -no-shared-libs -no-curses -no-graph -no-pthread -no-debugger  && make -j9 world.opt && make install  && cd ..
-
-
 export PATH=$(pwd)/bin:$PATH
 
 if [ $BS_TRAVIS_CI ]