Merge pull request rescript-lang#1585 from bloomberg/add_ud_in_bsb

fix rescript-lang#1583, add -U -D support for bspack

Author: bobzhang

Changes

@@ -1,6 +1,13 @@
 
+BuckleScript 1.7.4:
+==================
+
+intenral tools:
+
+- #1583, add -U -D support for bspack
+
 
-BuckleScript 1.7.2:
+BuckleScript 1.7.3:
 ==================
 
 Bug fixes:

jscomp/Makefile

@@ -423,28 +423,28 @@ force-snapshotml:
 
 
 bin/bsppx.ml:./bin/bspack.exe
-unset BS_DEBUG; $< -bs-MD -module-alias Config=ConfigDummy -I bin -I ../ocaml/utils/ -I ../ocaml/parsing/ -I stubs -I common -I ext -I syntax -I core -bs-main Bsppx_main -o $@
+$< -U BS_DEBUG -bs-MD -module-alias Config=ConfigDummy -I bin -I ../ocaml/utils/ -I ../ocaml/parsing/ -I stubs -I common -I ext -I syntax -I core -bs-main Bsppx_main -o $@
 
 bin/whole_compiler.ml:./bin/bspack.exe
-unset BS_DEBUG; $< -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Js_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I stubs -I ext -I syntax -I depends -I common -I core
+$< -U BS_DEBUG -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Js_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I stubs -I ext -I syntax -I depends -I common -I core
 
 bin/bsdep.ml:./bin/bspack.exe
-unset BS_DEBUG; BS_OCAMLDEP=true $< -bs-MD -module-alias Config=ConfigDummy -I bin -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I ../ocaml/tools -I common -I ext -I syntax -I depends -I core -I stubs -bs-main Ocamldep -o $@
+$< -D BS_OCAMLDEP=true  -U BS_DEBUG -bs-MD -module-alias Config=ConfigDummy -I bin -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I ../ocaml/tools -I common -I ext -I syntax -I depends -I core -I stubs -bs-main Ocamldep -o $@
 
 bin/bsb_helper.ml:./bin/bspack.exe
-unset BS_DEBUG; $< -bs-MD -I stubs -I common -I ext -I syntax -I depends -I bsb -bs-main Bsb_helper_main -o $@
+ $< -bs-MD -U BS_DEBUG -I stubs -I common -I ext -I syntax -I depends -I bsb -bs-main Bsb_helper_main -o $@
 
 bin/bsb.ml:./bin/bspack.exe
-unset BS_DEBUG; $< -bs-MD -I stubs -I common -I ext -I syntax -I depends -I bsb -I ext -bs-main Bsb_main -o $@
+ $< -bs-MD -U BS_DEBUG -I stubs -I common -I ext -I syntax -I depends -I bsb -I ext -bs-main Bsb_main -o $@
 
 bin/bspp.ml:./bin/bspack.exe
-unset BS_DEBUG; BS_MIN_LEX_DEPS=true $< -bs-MD -module-alias Config=ConfigDummy -I ../ocaml/utils/ -I ../ocaml/parsing?parser -I bin -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Bspp_main -o $@
+ $< -D BS_MIN_LEX_DEPS=true -U BS_DEBUG -bs-MD -module-alias Config=ConfigDummy -I ../ocaml/utils/ -I ../ocaml/parsing?parser -I bin -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Bspp_main -o $@
 
 bin/js_compiler.ml:./bin/bspack.exe
-unset BS_DEBUG; BS_COMPILER_IN_BROWSER=true bspack.exe -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Jsoo_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I ext -I syntax -I depends -I common -I core
+ bspack.exe -D BS_COMPILER_IN_BROWSER=true -U BS_DEBUG -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Jsoo_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I ext -I syntax -I depends -I common -I core
 
 bin/all_ounit_tests.ml:./bin/bspack.exe
-$< -bs-MD -I ounit -I ounit_tests -I stubs -I bsb -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Ounit_tests_main -o $@
+$< -bs-MD  -I ounit -I ounit_tests -I stubs -I bsb -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Ounit_tests_main -o $@
 -include bin/all_ounit_tests.d
 
 

jscomp/bin/bsb.ml

@@ -2733,9 +2733,9 @@ end = struct
  * 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. *) 
-let version = "1.7.2"
+let version = "1.7.4"
 let header = 
- "// Generated by BUCKLESCRIPT VERSION 1.7.2, PLEASE EDIT WITH CARE" 
+ "// Generated by BUCKLESCRIPT VERSION 1.7.4, PLEASE EDIT WITH CARE" 
 let package_name = "bs-platform" 
 
 end