Skip to content

Commit 8a923e2

Browse files
author
Hongbo Zhang
committed
add bootstrap ocamlpack as a target
1 parent 48f835e commit 8a923e2

File tree

5 files changed

+11
-35
lines changed

5 files changed

+11
-35
lines changed

jscomp/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ snapshotcmj:
5454
@echo "Collecting cmj files"
5555
ocamlbuild -cflags $(OCAMLBUILD_CFLAGS) -lflags -I,+compiler-libs,ocamlcommon.cmxa js_pack.native --
5656

57+
bootocamlpack: ./bin/ocamlpack
58+
@echo "Bootstrap ocamlpack"
59+
./bin/ocamlpack bin/ocamlpack.mllib > ./bin/ocamlpack.ml
60+
$(NATIVE) -w -40 -I +compiler-libs unix.cmxa ocamlcommon.cmxa -I bin bin/ocamlpack.mli bin/ocamlpack.ml -o bin/ocamlpack
61+
@echo "Using the bootstrapped ocamlpack to genreate new ocamlpack.ml: `date`"
62+
./bin/ocamlpack bin/ocamlpack.mllib > ./bin/ocamlpack.ml
63+
@echo "Bootstrap seems finished, please check diffs in ocamlpack"
64+
git diff bin/ocamlpack.ml
5765

5866
releasebuild:
5967
@echo "Make release compiler"

jscomp/bin/ocamlpack.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(** Bundled by ocamlpack 08/10-15:00 *)
1+
(** Bundled by ocamlpack 08/11-09:23 *)
22
module Bs_exception : sig
33
#1 "bs_exception.mli"
44
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.

jscomp/tools/tools.mllib renamed to jscomp/bin/ocamlpack.mllib

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
../ext/ext_format
88
../ext/ext_sys
99

10-
../depends/depend
11-
../depends/ast_extract
1210
../common/bs_exception
1311
../common/js_config
1412

13+
../depends/depend
14+
../depends/ast_extract
1515
../depends/line_process
16-
# ../syntax/ocaml_extract
1716
../depends/ocaml_pack_main

jscomp/tools/README.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

jscomp/tools/boot.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)