Skip to content

Commit 9ec79dc

Browse files
committed
Merge branch 'master' into import-tests
2 parents aa61910 + 3799001 commit 9ec79dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2830
-6
lines changed

.drom

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version:0.9.0
55

66
# hash of toml configuration files
77
# used for generation of all files
8-
51efca4da0e63268b2046a7a0604ed40:.
8+
751b4ada1617f1ed87534f634095b280:.
99
# end context for .
1010

1111
# begin context for .github/workflows/workflow.yml
@@ -80,7 +80,7 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css
8080

8181
# begin context for dune-project
8282
# file dune-project
83-
bc7c69c6baba24fa8481a31a1e33b88e:dune-project
83+
f75cec8fd465e38cd460b57ff4adc27b:dune-project
8484
# end context for dune-project
8585

8686
# begin context for opam/cobol_ast.opam
@@ -115,7 +115,7 @@ fea158982cf75a9547f3ef0d352851cb:opam/cobol_data.opam
115115

116116
# begin context for opam/cobol_parser.opam
117117
# file opam/cobol_parser.opam
118-
43dba93158fd4b90c93e2b7c9b770677:opam/cobol_parser.opam
118+
42edfe7fed2a37347614595136d6e623:opam/cobol_parser.opam
119119
# end context for opam/cobol_parser.opam
120120

121121
# begin context for opam/cobol_preproc.opam

Makefile.header

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,9 @@ compile-release:
2727
--sourcemap \
2828
--sources-content=false
2929

30+
.PHONY: opam-cross
31+
32+
opam-cross:
33+
drom dep --cross osx
34+
drom dep --cross windows
35+

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
(cobol_common (= version))
290290
(cobol_ast (= version))
291291
(autofonce_lib ( >= 0.8 ))
292-
(menhir ( = 20220210 ))
292+
(menhir ( = 20230415 ))
293293
ppx_inline_test
294294
ppx_expect
295295
odoc

opam/cobol_parser.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ depends: [
5656
"cobol_common" {= version}
5757
"cobol_ast" {= version}
5858
"autofonce_lib" {>= "0.8"}
59-
"menhir" {= "20220210"}
59+
"menhir" {= "20230415"}
6060
"ppx_inline_test" {with-test}
6161
"ppx_expect" {with-test}
6262
"odoc" {with-doc}

opam/osx/cobol_ast-osx.opam

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# This file was generated by `drom` from `drom.toml`.
2+
# Do not modify, or add to the `skip` field of `drom.toml`.
3+
opam-version: "2.0"
4+
name: "cobol_ast"
5+
version: "0.1.0"
6+
license: "MIT"
7+
synopsis: "The superbol-vscode-platform project"
8+
description: """\
9+
This is the description
10+
of the superbol-vscode-platform OCaml project
11+
"""
12+
authors: [
13+
"Fabrice Le Fessant <[email protected]>"
14+
"Emilien Lemaire <[email protected]>"
15+
]
16+
maintainer: [
17+
"Fabrice Le Fessant <[email protected]>"
18+
"Emilien Lemaire <[email protected]>"
19+
]
20+
homepage: "https://ocamlpro.github.io/superbol-vscode-platform"
21+
doc: "https://ocamlpro.github.io/superbol-vscode-platform/sphinx"
22+
bug-reports: "https://github.com/ocamlpro/superbol-vscode-platform/issues"
23+
dev-repo: "git+https://github.com/ocamlpro/superbol-vscode-platform.git"
24+
tags: "org:ocamlpro"
25+
build: [
26+
["dune" "subst"] {dev}
27+
["sh" "-c" "./scripts/before.sh build '%{name}%'"]
28+
[
29+
"dune"
30+
"build"
31+
"-p"
32+
"cobol_ast"
33+
"-x"
34+
"osx"
35+
"-j"
36+
jobs
37+
"@install"
38+
"@runtest" {with-test}
39+
"@doc" {with-doc}
40+
]
41+
["sh" "-c" "./scripts/after.sh build '%{name}%'"]
42+
]
43+
install: [
44+
["sh" "-c" "./scripts/before.sh install '%{name}%'"]
45+
]
46+
depends: [
47+
"ocaml" {>= "4.13.0"}
48+
"dune" {>= "2.7.0"}
49+
"ppx_deriving-osx" {>= "5.2.1"}
50+
"cobol_common-osx" {= version}
51+
"ppx_inline_test" {with-test}
52+
"ppx_expect" {with-test}
53+
"odoc" {with-doc}
54+
"ocamlformat" {with-test}
55+
]
56+
# Content of `opam-trailer` field:

opam/osx/cobol_common-osx.opam

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# This file was generated by `drom` from `drom.toml`.
2+
# Do not modify, or add to the `skip` field of `drom.toml`.
3+
opam-version: "2.0"
4+
name: "cobol_common"
5+
version: "0.1.0"
6+
license: "MIT"
7+
synopsis: "The superbol-vscode-platform project"
8+
description: """\
9+
This is the description
10+
of the superbol-vscode-platform OCaml project
11+
"""
12+
authors: [
13+
"Fabrice Le Fessant <[email protected]>"
14+
"Emilien Lemaire <[email protected]>"
15+
]
16+
maintainer: [
17+
"Fabrice Le Fessant <[email protected]>"
18+
"Emilien Lemaire <[email protected]>"
19+
]
20+
homepage: "https://ocamlpro.github.io/superbol-vscode-platform"
21+
doc: "https://ocamlpro.github.io/superbol-vscode-platform/sphinx"
22+
bug-reports: "https://github.com/ocamlpro/superbol-vscode-platform/issues"
23+
dev-repo: "git+https://github.com/ocamlpro/superbol-vscode-platform.git"
24+
tags: "org:ocamlpro"
25+
build: [
26+
["dune" "subst"] {dev}
27+
["sh" "-c" "./scripts/before.sh build '%{name}%'"]
28+
[
29+
"dune"
30+
"build"
31+
"-p"
32+
"cobol_common"
33+
"-x"
34+
"osx"
35+
"-j"
36+
jobs
37+
"@install"
38+
"@runtest" {with-test}
39+
"@doc" {with-doc}
40+
]
41+
["sh" "-c" "./scripts/after.sh build '%{name}%'"]
42+
]
43+
install: [
44+
["sh" "-c" "./scripts/before.sh install '%{name}%'"]
45+
]
46+
depends: [
47+
"ocaml" {>= "4.13.0"}
48+
"dune" {>= "2.7.0"}
49+
"pretty-osx" {= version}
50+
"ppx_deriving-osx" {>= "5.2.1"}
51+
"ppx_inline_test" {with-test}
52+
"ppx_expect" {with-test}
53+
"odoc" {with-doc}
54+
"ocamlformat" {with-test}
55+
]
56+
# Content of `opam-trailer` field:

opam/osx/cobol_config-osx.opam

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# This file was generated by `drom` from `drom.toml`.
2+
# Do not modify, or add to the `skip` field of `drom.toml`.
3+
opam-version: "2.0"
4+
name: "cobol_config"
5+
version: "0.1.0"
6+
license: "MIT"
7+
synopsis: "The superbol-vscode-platform project"
8+
description: """\
9+
This is the description
10+
of the superbol-vscode-platform OCaml project
11+
"""
12+
authors: [
13+
"Fabrice Le Fessant <[email protected]>"
14+
"Emilien Lemaire <[email protected]>"
15+
]
16+
maintainer: [
17+
"Fabrice Le Fessant <[email protected]>"
18+
"Emilien Lemaire <[email protected]>"
19+
]
20+
homepage: "https://ocamlpro.github.io/superbol-vscode-platform"
21+
doc: "https://ocamlpro.github.io/superbol-vscode-platform/sphinx"
22+
bug-reports: "https://github.com/ocamlpro/superbol-vscode-platform/issues"
23+
dev-repo: "git+https://github.com/ocamlpro/superbol-vscode-platform.git"
24+
tags: "org:ocamlpro"
25+
build: [
26+
["dune" "subst"] {dev}
27+
["sh" "-c" "./scripts/before.sh build '%{name}%'"]
28+
[
29+
"dune"
30+
"build"
31+
"-p"
32+
"cobol_config"
33+
"-x"
34+
"osx"
35+
"-j"
36+
jobs
37+
"@install"
38+
"@runtest" {with-test}
39+
"@doc" {with-doc}
40+
]
41+
["sh" "-c" "./scripts/after.sh build '%{name}%'"]
42+
]
43+
install: [
44+
["sh" "-c" "./scripts/before.sh install '%{name}%'"]
45+
]
46+
depends: [
47+
"ocaml" {>= "4.13.0"}
48+
"dune" {>= "2.7.0"}
49+
"pretty-osx" {= version}
50+
"ppx_deriving-osx" {>= "5.2.1"}
51+
"menhir-osx" {>= "1.2"}
52+
"cobol_common-osx" {= version}
53+
"ppx_inline_test" {with-test}
54+
"ppx_expect" {with-test}
55+
"odoc" {with-doc}
56+
"ocamlformat" {with-test}
57+
]
58+
# Content of `opam-trailer` field:

opam/osx/cobol_data-osx.opam

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# This file was generated by `drom` from `drom.toml`.
2+
# Do not modify, or add to the `skip` field of `drom.toml`.
3+
opam-version: "2.0"
4+
name: "cobol_data"
5+
version: "0.1.0"
6+
license: "MIT"
7+
synopsis: "The superbol-vscode-platform project"
8+
description: """\
9+
This is the description
10+
of the superbol-vscode-platform OCaml project
11+
"""
12+
authors: [
13+
"Fabrice Le Fessant <[email protected]>"
14+
"Emilien Lemaire <[email protected]>"
15+
]
16+
maintainer: [
17+
"Fabrice Le Fessant <[email protected]>"
18+
"Emilien Lemaire <[email protected]>"
19+
]
20+
homepage: "https://ocamlpro.github.io/superbol-vscode-platform"
21+
doc: "https://ocamlpro.github.io/superbol-vscode-platform/sphinx"
22+
bug-reports: "https://github.com/ocamlpro/superbol-vscode-platform/issues"
23+
dev-repo: "git+https://github.com/ocamlpro/superbol-vscode-platform.git"
24+
tags: "org:ocamlpro"
25+
build: [
26+
["dune" "subst"] {dev}
27+
["sh" "-c" "./scripts/before.sh build '%{name}%'"]
28+
[
29+
"dune"
30+
"build"
31+
"-p"
32+
"cobol_data"
33+
"-x"
34+
"osx"
35+
"-j"
36+
jobs
37+
"@install"
38+
"@runtest" {with-test}
39+
"@doc" {with-doc}
40+
]
41+
["sh" "-c" "./scripts/after.sh build '%{name}%'"]
42+
]
43+
install: [
44+
["sh" "-c" "./scripts/before.sh install '%{name}%'"]
45+
]
46+
depends: [
47+
"ocaml" {>= "4.13.0"}
48+
"dune" {>= "2.7.0"}
49+
"ppx_deriving-osx" {>= "5.2.1"}
50+
"cobol_parser-osx" {= version}
51+
"cobol_ast-osx" {= version}
52+
"ppx_inline_test" {with-test}
53+
"ppx_expect" {with-test}
54+
"odoc" {with-doc}
55+
"ocamlformat" {with-test}
56+
]
57+
# Content of `opam-trailer` field:

opam/osx/cobol_indent-osx.opam

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# This file was generated by `drom` from `drom.toml`.
2+
# Do not modify, or add to the `skip` field of `drom.toml`.
3+
opam-version: "2.0"
4+
name: "cobol_indent"
5+
version: "0.1.0"
6+
license: "MIT"
7+
synopsis: "The superbol-vscode-platform project"
8+
description: """\
9+
This is the description
10+
of the superbol-vscode-platform OCaml project
11+
"""
12+
authors: [
13+
"Fabrice Le Fessant <[email protected]>"
14+
"Emilien Lemaire <[email protected]>"
15+
]
16+
maintainer: [
17+
"Fabrice Le Fessant <[email protected]>"
18+
"Emilien Lemaire <[email protected]>"
19+
]
20+
homepage: "https://ocamlpro.github.io/superbol-vscode-platform"
21+
doc: "https://ocamlpro.github.io/superbol-vscode-platform/sphinx"
22+
bug-reports: "https://github.com/ocamlpro/superbol-vscode-platform/issues"
23+
dev-repo: "git+https://github.com/ocamlpro/superbol-vscode-platform.git"
24+
tags: "org:ocamlpro"
25+
build: [
26+
["dune" "subst"] {dev}
27+
["sh" "-c" "./scripts/before.sh build '%{name}%'"]
28+
[
29+
"dune"
30+
"build"
31+
"-p"
32+
"cobol_indent"
33+
"-x"
34+
"osx"
35+
"-j"
36+
jobs
37+
"@install"
38+
"@runtest" {with-test}
39+
"@doc" {with-doc}
40+
]
41+
["sh" "-c" "./scripts/after.sh build '%{name}%'"]
42+
]
43+
install: [
44+
["sh" "-c" "./scripts/before.sh install '%{name}%'"]
45+
]
46+
depends: [
47+
"ocaml" {>= "4.13.0"}
48+
"dune" {>= "2.7.0"}
49+
"fmt-osx" {>= "0.9"}
50+
"cobol_preproc-osx" {= version}
51+
"cobol_common-osx" {= version}
52+
"ppx_inline_test" {with-test}
53+
"ppx_expect" {with-test}
54+
"odoc" {with-doc}
55+
"ocamlformat" {with-test}
56+
]
57+
# Content of `opam-trailer` field:

0 commit comments

Comments
 (0)