Skip to content

Commit d333db4

Browse files
committed
remove one unused file
1 parent 39096a1 commit d333db4

File tree

7 files changed

+31
-43
lines changed

7 files changed

+31
-43
lines changed

jscomp/bsb/bsb_templates.ml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
let root = OCamlRes.Res.([
1+
2+
type node =
3+
| Dir of string * node list
4+
| File of string * string
5+
let root = ([
26
Dir("basic",[
37
File(".gitignore",
48
"*.exe\n\

jscomp/bsb/bsb_templates.mli

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
type node =
2+
| Dir of string * node list
3+
| File of string * string
14

25

3-
val root : OCamlRes.Res.node list
6+
val root : node list

jscomp/bsb/bsb_theme_init.ml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let mkdir_or_not_if_exists dir =
6464
"%s expected to be added as dir but exist file is not a dir" dir
6565
| Non_exists -> Unix.mkdir dir 0o777
6666

67-
let rec process_theme_aux env cwd (x : OCamlRes.Res.node) =
67+
let rec process_theme_aux env cwd (x : Bsb_templates.node) =
6868
match x with
6969
| File (name,content) ->
7070
let new_file = cwd // name in
@@ -76,10 +76,8 @@ let rec process_theme_aux env cwd (x : OCamlRes.Res.node) =
7676
List.iter (fun x -> process_theme_aux env new_cwd x ) nodes
7777

7878
let list_themes () =
79-
Format.fprintf Format.std_formatter "Available themes: @.";
80-
Bsb_templates.root
81-
|>
82-
List.iter (fun (x : OCamlRes.Res.node) ->
79+
Format.fprintf Format.std_formatter "Available themes: @.";
80+
Ext_list.iter Bsb_templates.root (fun x ->
8381
match x with
8482
| Dir (x, _) ->
8583
Format.fprintf Format.std_formatter "%s@." x
@@ -88,7 +86,7 @@ let list_themes () =
8886
)
8987

9088
(* @raise [Not_found] *)
91-
let process_themes env theme proj_dir (themes : OCamlRes.Res.node list ) =
89+
let process_themes env theme proj_dir (themes : Bsb_templates.node list ) =
9290
match Ext_list.find_first themes (fun x ->
9391
match x with
9492
| Dir (dir, _) -> dir = theme

jscomp/bsb/oCamlRes.ml

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

jscomp/bsb/pack.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ function main() {
7676
// run git clean -dfx . first
7777
fs.writeFileSync(
7878
path.join(__dirname, "bsb_templates.ml"),
79-
`let root = OCamlRes.Res.([
79+
`
80+
type node =
81+
| Dir of string * node list
82+
| File of string * string
83+
let root = ([
8084
${fs
8185
.readdirSync(templatesDir)
8286
.filter((x) => fs.statSync(path.join(templatesDir, x)).isDirectory())

lib/4.06.1/bsb.ml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14314,30 +14314,22 @@ let global_substitute text ~reg:expr repl_fun =
1431414314
in
1431514315
String.concat "" (List.rev (replace [] 0 false))
1431614316

14317-
end
14318-
module OCamlRes
14319-
= struct
14320-
#1 "oCamlRes.ml"
14321-
14322-
14323-
module Res = struct
14324-
type node =
14325-
| Dir of string * node list
14326-
| File of string * string
14327-
14328-
end
14329-
14330-
14331-
1433214317
end
1433314318
module Bsb_templates : sig
1433414319
#1 "bsb_templates.mli"
14320+
type node =
14321+
| Dir of string * node list
14322+
| File of string * string
1433514323

1433614324

14337-
val root : OCamlRes.Res.node list
14325+
val root : node list
1433814326
end = struct
1433914327
#1 "bsb_templates.ml"
14340-
let root = OCamlRes.Res.([
14328+
14329+
type node =
14330+
| Dir of string * node list
14331+
| File of string * string
14332+
let root = ([
1434114333
Dir("basic",[
1434214334
File(".gitignore",
1434314335
"*.exe\n\
@@ -16322,7 +16314,7 @@ let mkdir_or_not_if_exists dir =
1632216314
"%s expected to be added as dir but exist file is not a dir" dir
1632316315
| Non_exists -> Unix.mkdir dir 0o777
1632416316

16325-
let rec process_theme_aux env cwd (x : OCamlRes.Res.node) =
16317+
let rec process_theme_aux env cwd (x : Bsb_templates.node) =
1632616318
match x with
1632716319
| File (name,content) ->
1632816320
let new_file = cwd // name in
@@ -16334,10 +16326,8 @@ let rec process_theme_aux env cwd (x : OCamlRes.Res.node) =
1633416326
List.iter (fun x -> process_theme_aux env new_cwd x ) nodes
1633516327

1633616328
let list_themes () =
16337-
Format.fprintf Format.std_formatter "Available themes: @.";
16338-
Bsb_templates.root
16339-
|>
16340-
List.iter (fun (x : OCamlRes.Res.node) ->
16329+
Format.fprintf Format.std_formatter "Available themes: @.";
16330+
Ext_list.iter Bsb_templates.root (fun x ->
1634116331
match x with
1634216332
| Dir (x, _) ->
1634316333
Format.fprintf Format.std_formatter "%s@." x
@@ -16346,7 +16336,7 @@ let list_themes () =
1634616336
)
1634716337

1634816338
(* @raise [Not_found] *)
16349-
let process_themes env theme proj_dir (themes : OCamlRes.Res.node list ) =
16339+
let process_themes env theme proj_dir (themes : Bsb_templates.node list ) =
1635016340
match Ext_list.find_first themes (fun x ->
1635116341
match x with
1635216342
| Dir (dir, _) -> dir = theme

lib/4.06.1/bsb.ml.d

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
../lib/4.06.1/bsb.ml: ./bsb/bsb_watcher_gen.mli
6565
../lib/4.06.1/bsb.ml: ./bsb/bsb_world.ml
6666
../lib/4.06.1/bsb.ml: ./bsb/bsb_world.mli
67-
../lib/4.06.1/bsb.ml: ./bsb/oCamlRes.ml
6867
../lib/4.06.1/bsb.ml: ./common/bs_version.ml
6968
../lib/4.06.1/bsb.ml: ./common/bs_version.mli
7069
../lib/4.06.1/bsb.ml: ./ext/bsb_db.ml

0 commit comments

Comments
 (0)