fix build error

Author: bobzhang

jscomp/bin/bsb.ml

@@ -6459,12 +6459,12 @@ let root = OCamlRes.Res.([
       \  \"sources\": [\n\
       \    \"src\"\n\
       \  ],\n\
-      \  \"package-specs\": [\n\
+      \  \"package-specs\":\n\
       \    {\n\
       \      \"module\": \"commonjs\",\n\
       \      \"in-source\": true\n\
       \    }\n\
-      \  ],\n\
+      \  ,\n\
       \  \"bs-dependencies\" : [\n\
       \      // add your bs-dependencies here \n\
       \  ]\n\
@@ -6668,7 +6668,8 @@ let root = OCamlRes.Res.([
       \  \"scripts\": {\n\
       \    \"test\": \"echo \\\"Error: no test specified\\\" && exit 1\",\n\
       \    \"start\": \"bsb -make-world -w\",\n\
-      \    \"build\": \"webpack -w\",\n\
+      \    \"build\": \"bsb -make-world\" ,\n\
+      \    \"webpack\": \"webpack -w\",\n\
       \    \"clean\": \"bsb -clean-world\"\n\
       \  },\n\
       \  \"keywords\": [],\n\
@@ -6697,9 +6698,9 @@ let root = OCamlRes.Res.([
       \  \"sources\": [\n\
       \    {\n\
       \      \"dir\": \"src\",\n\
-      \      \"subdirs\": [\"interop\", \"simple\"],\n\
+      \      \"subdirs\": [\"interop\", \"simple\"]\n\
       \    }\n\
-      \  ],\n\
+      \  ]\n\
        }\n\
        ") ;
     File (".gitignore",
@@ -11525,14 +11526,14 @@ let define
   } in self
 
 
-(** We don't need set [-o $out] when building ast 
-    since the default is already good *)
+(** FIXME: We don't need set [-o ${out}] when building ast 
+    since the default is already good -- it does not*)
 let build_ast_and_module_sets =
   define
-    ~command:"${bsc}  ${pp_flags} ${ppx_flags} ${bsc_flags} -c -bs-syntax-only -bs-binary-ast ${in}"
+    ~command:"${bsc}  ${pp_flags} ${ppx_flags} ${bsc_flags} -c -o ${out} -bs-syntax-only -bs-binary-ast ${in}"
     "build_ast_and_module_sets"
 
-(** TODO: [-o $out] should not be needed here either *)    
+
 let build_ast_and_module_sets_from_re =
   define
     ~command:"${bsc} -pp \"${refmt} ${refmt_flags}\" ${reason_react_jsx}  ${ppx_flags} ${bsc_flags} -c -o ${out} -bs-syntax-only -bs-binary-ast -impl ${in}"

jscomp/bsb/bsb_rule.ml

@@ -94,14 +94,14 @@ let define
   } in self
 
 
-(** We don't need set [-o $out] when building ast 
-    since the default is already good *)
+(** FIXME: We don't need set [-o ${out}] when building ast 
+    since the default is already good -- it does not*)
 let build_ast_and_module_sets =
   define
-    ~command:"${bsc}  ${pp_flags} ${ppx_flags} ${bsc_flags} -c -bs-syntax-only -bs-binary-ast ${in}"
+    ~command:"${bsc}  ${pp_flags} ${ppx_flags} ${bsc_flags} -c -o ${out} -bs-syntax-only -bs-binary-ast ${in}"
     "build_ast_and_module_sets"
 
-(** TODO: [-o $out] should not be needed here either *)    
+
 let build_ast_and_module_sets_from_re =
   define
     ~command:"${bsc} -pp \"${refmt} ${refmt_flags}\" ${reason_react_jsx}  ${ppx_flags} ${bsc_flags} -c -o ${out} -bs-syntax-only -bs-binary-ast -impl ${in}"

jscomp/bsb/bsb_templates.ml

@@ -420,12 +420,12 @@ let root = OCamlRes.Res.([
       \  \"sources\": [\n\
       \    \"src\"\n\
       \  ],\n\
-      \  \"package-specs\": [\n\
+      \  \"package-specs\":\n\
       \    {\n\
       \      \"module\": \"commonjs\",\n\
       \      \"in-source\": true\n\
       \    }\n\
-      \  ],\n\
+      \  ,\n\
       \  \"bs-dependencies\" : [\n\
       \      // add your bs-dependencies here \n\
       \  ]\n\
@@ -629,7 +629,8 @@ let root = OCamlRes.Res.([
       \  \"scripts\": {\n\
       \    \"test\": \"echo \\\"Error: no test specified\\\" && exit 1\",\n\
       \    \"start\": \"bsb -make-world -w\",\n\
-      \    \"build\": \"webpack -w\",\n\
+      \    \"build\": \"bsb -make-world\" ,\n\
+      \    \"webpack\": \"webpack -w\",\n\
       \    \"clean\": \"bsb -clean-world\"\n\
       \  },\n\
       \  \"keywords\": [],\n\
@@ -658,9 +659,9 @@ let root = OCamlRes.Res.([
       \  \"sources\": [\n\
       \    {\n\
       \      \"dir\": \"src\",\n\
-      \      \"subdirs\": [\"interop\", \"simple\"],\n\
+      \      \"subdirs\": [\"interop\", \"simple\"]\n\
       \    }\n\
-      \  ],\n\
+      \  ]\n\
        }\n\
        ") ;
     File (".gitignore",

jscomp/bsb/templates/react/bsconfig.json

@@ -9,7 +9,7 @@
   "sources": [
     {
       "dir": "src",
-      "subdirs": ["interop", "simple"],
+      "subdirs": ["interop", "simple"]
     }
-  ],
+  ]
 }

jscomp/bsb/templates/react/package.json

@@ -7,7 +7,8 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "bsb -make-world -w",
-    "build": "webpack -w",
+    "build": "bsb -make-world" ,
+    "webpack": "webpack -w",
     "clean": "bsb -clean-world"
   },
   "keywords": [],

package.json

@@ -30,6 +30,7 @@
   },
   "scripts": {
     "test": "go build -o test.exe scripts/test.go && ./test.exe",
+    "test-theme" : "go run scripts/test.go -no-install-global -no-ounit -no-mocha -no-bsb",
     "wtest": "mocha './jscomp/test/**/*test.js'  -R spec -w",
     "cover": "istanbul cover --report html ./node_modules/.bin/_mocha --   ./jscomp/test/**/*test.js && open coverage/index.html",
     "coverage": "istanbul cover ./node_modules/.bin/_mocha --report lcovonly --  './jscomp/test/*test.js' -R spec",

scripts/test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -11,7 +12,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"io/ioutil"
 )
 
 type command struct {
@@ -94,9 +94,9 @@ func commandString(name string) command {
 	return makeCommand(name, xs[0], xs[1:]...)
 
 }
-func checkError(err error) {
+func checkError( err error, theme ... string) {
 	if err != nil {
-		log.Fatalf("Error: %s", err.Error())
+		log.Fatalf("Error:%v\n====\n%s\n====\n", theme,err.Error())
 	}
 }
 
@@ -107,15 +107,16 @@ func testTheme(theme string) {
 	output, err := cmd.CombinedOutput()
 
 	fmt.Println(string(output))
-	checkError(err)
+	checkError(err, theme)
 
-	fmt.Println("Started to build ")
+	fmt.Println("Started to build ", theme)
 	cmd2 := exec.Command("npm", "run", "build")
 	cmd2.Dir = theme
 	output2, err := cmd2.CombinedOutput()
 	fmt.Println(string(output2))
-	checkError(err)
+	checkError(err, theme)
 	os.RemoveAll(theme)
+	fmt.Println("Finish building",theme)
 }
 
 func runMoCha(wg *sync.WaitGroup) {
@@ -153,20 +154,20 @@ func init() {
 	os.Setenv("PATH",
 		vendorOCamlPath+string(os.PathListSeparator)+os.Getenv("PATH"))
 }
-func fatalError(err error){
-	if err!= nil {
-		panic (err)
+func fatalError(err error) {
+	if err != nil {
+		panic(err)
 	}
 }
 func bsbInDir(dir string) {
-	
+
 	destDir := filepath.Join("jscomp", "build_tests", dir)
-	pattern, err := ioutil.ReadFile(filepath.Join(destDir,"output.ref"))	
-	fatalError(err)	
-	argsB, err := ioutil.ReadFile(filepath.Join(destDir,"input.sh"))
+	pattern, err := ioutil.ReadFile(filepath.Join(destDir, "output.ref"))
+	fatalError(err)
+	argsB, err := ioutil.ReadFile(filepath.Join(destDir, "input.sh"))
 	fatalError(err)
 	args := strings.Fields(strings.TrimSpace(string(argsB)))
-	
+
 	patternS := string(pattern)
 	c := cmd(args[0], args[1:]...)
 	c.Dir = destDir
@@ -193,7 +194,7 @@ func main() {
 	noOunitTest := flag.Bool("no-ounit", false, "don't do ounit test")
 	noMochaTest := flag.Bool("no-mocha", false, "don't run mocha")
 	noThemeTest := flag.Bool("no-theme", false, "no bsb theme test")
-
+	noBsbTest := flag.Bool("no-bsb", false, "no bsb test")
 	// disableAll := flag.Bool("disable-all", false, "disable all tets")
 	flag.Parse()
 
@@ -240,6 +241,7 @@ func main() {
 		}
 		wg.Wait()
 	}
-
-	bsbInDir("in_source")
+	if !*noBsbTest {
+		bsbInDir("in_source")
+	}
 }