Skip to content

Customize flags and make sure cmj behaves the same as cmi (#392) #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobzhang merged 3 commits into from
May 23, 2016
Merged

Customize flags and make sure cmj behaves the same as cmi (#392) #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba721d
remove unsupported options from the driver
May 23, 2016
e3239d8
[feature] address #395 behavior, output_prefix for cmj files
May 23, 2016
f73be3d
[snapshot]
May 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
453 changes: 362 additions & 91 deletions jscomp/bin/compiler.ml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions jscomp/js_config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type env =
let default_env = ref NodeJS

let ext = ref ".js"
let cmj_ext = ".cmj"
let get_ext () = !ext
let get_env () = !default_env

Expand Down
1 change: 1 addition & 0 deletions jscomp/js_config.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type env =
| AmdJS
| Goog of string option

val cmj_ext : string
val get_env : unit -> env
val get_ext : unit -> string

Expand Down
2 changes: 1 addition & 1 deletion jscomp/js_implementation.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ let implementation ppf sourcefile outputprefix =
match
Lam_compile_group.lambda_as_module
finalenv current_signature
sourcefile lambda with
sourcefile outputprefix lambda with
| e -> e
| exception e ->
(* Save to a file instead so that it will not scare user *)
Expand Down
Loading