[clean] clean up dist (#358)

* [clean] clean up dist

* update depends in test dir and add a dummy bin/bsc for npm

* tweak

* also encode package name in [cmj] files

* [snapshot]

* [fix] Sys.is_directory can throw

* [feature] change resolution rules when compilation unit does not have package specified, while its dependency has

* tweak

Author: bobzhang

.gitignore

@@ -12,72 +12,46 @@ _build
 *.cma
 *.a
 *.cmxa
-
-
-exports.js
+*~
+*.annot
+*.mj
+*.bak
+.vscode
+*.jsx
 *.lambda
 *.rawlambda
-node_modules
 *.o
 *.lam
-err.log
-.idea
-ocaml_pack
 *.0.js
-*~
-stdlib/c.js
-*.map
 *#
-qcc/
+*.log
 .#*
-# jscomp/stdlib/external/*.js
-oxml
 *.cmj
-
 *.rawlambda
 *.lambda
-
-
-ocaml/
-
-
-test.json
-*~
-*.annot
-*.mj
-
-*.bak
-.vscode
-*.jsx
+*.zip
+*.gz
+# special file 
+ocaml_pack
 bsc
 bscc
-
 ocaml_pack0.ml
 ocaml_pack1.ml
-
-
+.idea
+exports.js
+node_modules
+oxml
+test.json
 jscomp/pre_load.js
 boot
 *.dump
-
 coverage
-*.log
-./jscomp/output
 *.g.js
 dist/
-
-bin/
 man/
-lib/ocaml/*.ml
-lib/ocaml/*.mli
-lib/ocaml/caml
-lib/ocaml/VERSION
-lib/ocaml/camlheader
-lib/ocaml/camlheader_ur
-lib/ocaml/expunge
-lib/ocaml/ld.conf
-lib/ocaml/objinfo_helper
-lib/ocaml/vmthreads/
-lib/ocaml/Makefile.config
-lib/ocaml/extract_crc
+lib/ocaml
+bin/*
 
+# for npm publish
+!bin/bsc
+!ocaml.tar.gz

.travis-ci.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "PLEASE RUN NPM POSTINSTALL TO GET BSC BINARY"
+exit 2

bin/bsc

@@ -72,20 +72,18 @@ world:
 	cd runtime && make all
 	@echo "Making runtime finished"
 
-	@echo "Making stdlib"
-	cd lib && make all
-	@echo "Making stdlib finished"
 
-	@echo "Making lib"
+	@echo "Making stdlib"
 	cd stdlib && make all	
-	@echo "Making lib finished"
+	@echo "Making stdlib finished"
 
 # no depend on ./bin/ocaml_pack ./bin/bsc
 # since in npm mode, they are generated from a single file
 install:
 	cp  ./bin/bsc ../bin/
 	cp ./runtime/*.cmt* ../lib/ocaml/
 	cp ./runtime/*.cmj* ../lib/ocaml/
+	cp ./runtime/js.cmi ./runtime/fn.cmi ../lib/ocaml/	
 	cp ./stdlib/*.cm* ../lib/ocaml/
 
 TMP_OCAMLLIB=$(shell ocamlopt.opt -where)
@@ -101,12 +99,8 @@ big-world:bin/big_compiler.ml bin/big_compiler.mli
 	@echo "Making runtime finished"
 
 	@echo "Making stdlib"
-	cd lib && make all
-	@echo "Making stdlib finished"
-
-	@echo "Making lib"
 	cd stdlib && make all	
-	@echo "Making lib finished"
+	@echo "Making stdlib finished"
 
 world-test:
 	@echo "Making compiler"		
@@ -118,13 +112,9 @@ world-test:
 	@echo "Making runtime finished"
 
 	@echo "Making stdlib"
-	cd lib && make all
+	cd stdlib && make all
 	@echo "Making stdlib finished"
 
-	@echo "Making lib"
-	cd stdlib && make all	
-	@echo "Making lib finished"
-
 	@echo "Making test"
 	cd test && make all
 	@echo "Making test finsihed"

jscomp/Makefile

@@ -1,7 +1,12 @@
 #!/bin/sh
 
 set -e
-. ./env.sh
+
+export OCAMLPARAM='_,bin-annot=1,annot=1' 
+export OCAMLRUNPARAM=b
+export OCAMLBUILD_CFLAGS=-g,-w,-40-30,-warn-error,+a-40-30,-keep-locs,-I,+compiler-libs
+export npm_package_name=bs-platform
+
 
 ## Only make sense for dev 
 make js_map.ml js_fold.ml  >> build.compile
@@ -28,9 +33,6 @@ echo "Remaking standard library" >> build.compile
 cd ./stdlib; ./build.sh ; cd ../
 echo "Remaking standard library Finished" >> build.compile
 
-echo "Remaking thirdparty library" >> build.compile
-cd ./lib; ./build.sh ; cd ../
-echo "Remaking thirdparty library Finished" >> build.compile
 
 TARGET=a
 

jscomp/bin/compiler.ml

@@ -26,6 +26,8 @@ ext_array
 ext_bytes
 ext_map
 ext_hashtbl
+ext_sys
+
 
 lam_mk
 lam_comb