Skip to content

Commit 422b386

Browse files
committed
Trimming whitespace for easier merging
bsb-native has an easier time with the git diffing algorithm this way
1 parent af8c7a7 commit 422b386

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

jscomp/bsb/bsb_clean.ml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(* Copyright (C) 2017 Authors of BuckleScript
2-
*
2+
*
33
* This program is free software: you can redistribute it and/or modify
44
* it under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or
@@ -17,7 +17,7 @@
1717
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1818
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1919
* GNU Lesser General Public License for more details.
20-
*
20+
*
2121
* You should have received a copy of the GNU Lesser General Public License
2222
* along with this program; if not, write to the Free Software
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
@@ -26,28 +26,28 @@
2626
let (//) = Ext_path.combine
2727

2828

29-
let ninja_clean bsc_dir proj_dir =
30-
try
31-
let cmd = bsc_dir // "ninja.exe" in
32-
let cwd = proj_dir // Bsb_config.lib_bs in
33-
if Sys.file_exists cwd then
34-
let eid =
29+
let ninja_clean bsc_dir proj_dir =
30+
try
31+
let cmd = bsc_dir // "ninja.exe" in
32+
let cwd = proj_dir // Bsb_config.lib_bs in
33+
if Sys.file_exists cwd then
34+
let eid =
3535
Bsb_unix.run_command_execv {cmd ; args = [|cmd; "-t"; "clean"|] ; cwd} in
36-
if eid <> 0 then
36+
if eid <> 0 then
3737
Bsb_log.warn "@{<warning>ninja clean failed@}@."
38-
with e ->
38+
with e ->
3939
Bsb_log.warn "@{<warning>ninja clean failed@} : %s @." (Printexc.to_string e)
4040

4141
let clean_bs_garbage bsc_dir proj_dir =
42-
Bsb_log.info "@{<info>Cleaning:@} in %s@." proj_dir ;
42+
Bsb_log.info "@{<info>Cleaning:@} in %s@." proj_dir ;
4343
let try_remove x =
4444
let x = proj_dir // x in
4545
if Sys.file_exists x then
4646
Bsb_unix.remove_dir_recursive x in
47-
try
47+
try
4848
Bsb_parse_sources.clean_re_js proj_dir; (* clean re.js files*)
49-
ninja_clean bsc_dir proj_dir ;
50-
List.iter try_remove Bsb_config.all_lib_artifacts;
49+
ninja_clean bsc_dir proj_dir ;
50+
List.iter try_remove Bsb_config.all_lib_artifacts;
5151
with
5252
e ->
5353
Bsb_log.warn "@{<warning>Failed@} to clean due to %s" (Printexc.to_string e)
@@ -59,4 +59,4 @@ let clean_bs_deps bsc_dir proj_dir =
5959
clean_bs_garbage bsc_dir pkg_cxt.cwd
6060
)
6161

62-
let clean_self bsc_dir proj_dir = clean_bs_garbage bsc_dir proj_dir
62+
let clean_self bsc_dir proj_dir = clean_bs_garbage bsc_dir proj_dir

jscomp/bsb/bsb_clean.mli

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(* Copyright (C) 2017 Authors of BuckleScript
2-
*
2+
*
33
* This program is free software: you can redistribute it and/or modify
44
* it under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or
@@ -17,15 +17,15 @@
1717
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1818
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1919
* GNU Lesser General Public License for more details.
20-
*
20+
*
2121
* You should have received a copy of the GNU Lesser General Public License
2222
* along with this program; if not, write to the Free Software
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2424

25-
(** clean bsc generated artifacts.
25+
(** clean bsc generated artifacts.
2626
TODO: clean staled in source js artifacts
2727
*)
2828

29-
val clean_bs_deps : string -> string -> unit
29+
val clean_bs_deps : string -> string -> unit
3030

31-
val clean_self : string -> string -> unit
31+
val clean_self : string -> string -> unit

0 commit comments

Comments
 (0)