Merge pull request #1111 from bloomberg/default_command_lines

stream line clean-world, make-world, allow user to override package-specs

Author: bobzhang

bin/bsb

@@ -14,7 +14,7 @@ if (fs.existsSync(bsconfig)) {
     try {
         child_process.execFileSync(bsb_exe, delegate_args, { stdio: 'inherit' })
     } catch (e) {
-        console.error('Error happend when running command', bsb_exe, 'with args', delete_args)
+        console.error('Error happend when running command', bsb_exe, 'with args', delegate_args)
     }
 } else {
     var path = require('path')
@@ -32,7 +32,7 @@ if (fs.existsSync(bsconfig)) {
         try {
             child_process.execFileSync(bsb_exe, delegate_args, { stdio: 'inherit', cwd: search_dir })
         } catch (e) {
-            console.error('Error happend when running command', bsb_exe, 'with args', delete_args)
+            console.error('Error happend when running command', bsb_exe, 'with args', delegate_args)
         }
     }
 }

docs/docson/build-schema.json

@@ -177,15 +177,15 @@
         },
         "ppx-flags": {
             "$ref": "#/definitions/ppx-specs",
-            "description": "TODO: ppx flags"
+            "description": "syntax is package_name/binary, for example: reason/reactjs_jsx_ppx.native"
         },
         "bsc-flags": {
             "$ref": "#/definitions/stringArray",
             "description": "A list of flags for bsc.exe"
         },
         "package-specs": {
             "$ref": "#/definitions/package-specs",
-            "description": "TODO: currently only support commonjs"
+            "description": "currently support commonjs, amdjs and google module"
         },
         "ocamllex": {
             "type": "string",
@@ -201,22 +201,24 @@
         },
         "refmt": {
             "type": "string",
-            "description": "Path to refmt"
+            "description": "Path to refmt for Reason syntax, for example: reason/refmt_impl.native"
         },
         "bs-external-includes": {
             "$ref": "#/definitions/stringArray",
-            "description": "external include directories, which will be applied -I to all compilation units, it is not needed in most cases"
+            "description": "external include directories, which will be applied -I to all compilation units, it is *not needed* in most cases"
         },
         "sources": {
             "oneOf": [
                 {
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/sourceItem"
-                    }
+                    },
+                    "description" : "A list of source items"
                 },
                 {
-                    "$ref": "#/definitions/sourceItem"
+                    "$ref": "#/definitions/sourceItem",
+                    "description": "A single source item"
                 }
             ]
         },

jscomp/Makefile

@@ -251,8 +251,10 @@ OTHER_CORE_SRCS= bsppx_main bspack_main jsoo_main  bspp_main js_cmi_datasets \
 		 js_main
 OTHER_CORE_CMXS= $(addprefix core/, $(addsuffix .cmx, $(OTHER_CORE_SRCS)))
 BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util \
-	bsb_dep_infos bsb_dir bsb_ninja \
-	bsb_build_ui bsb_default bsb_gen\
+	bsb_dir bsb_ninja \
+	bsb_build_ui bsb_default\
+	bsb_dep_infos\
+	 bsb_gen\
 	bsb_unix
 
 BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))

jscomp/all.depend

@@ -661,11 +661,12 @@ bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_filename.cmx \
     bsb/bsb_gen.cmi
 bsb/bsb_helper_main.cmx : depends/depends_post_process.cmx \
     bsb/bsb_helper_main.cmi
-bsb/bsb_main.cmx : ext/string_vec.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_json.cmx ext/ext_filename.cmx ext/ext_file_pp.cmx \
-    ext/ext_array.cmx bsb/bsb_unix.cmx bsb/bsb_gen.cmx bsb/bsb_dep_infos.cmx \
-    bsb/bsb_default.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
-    bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx bsb/bsb_main.cmi
+bsb/bsb_main.cmx : ext/string_vec.cmx ext/string_set.cmx ext/literals.cmx \
+    ext/ext_string.cmx ext/ext_json.cmx ext/ext_filename.cmx \
+    ext/ext_file_pp.cmx ext/ext_array.cmx bsb/bsb_unix.cmx bsb/bsb_gen.cmx \
+    bsb/bsb_dep_infos.cmx bsb/bsb_default.cmx bsb/bsb_config.cmx \
+    bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx \
+    bsb/bsb_main.cmi
 bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx ext/literals.cmx \
     ext/ext_filename.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \