Skip to content

Commit 312882f

Browse files
committed
version info generation fix
1 parent 1e6e62d commit 312882f

File tree

7 files changed

+44
-13
lines changed

7 files changed

+44
-13
lines changed

dune-project

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@
151151
(depends
152152
(ocaml (>= 4.14))
153153
dune
154+
cmdliner
155+
mtime
156+
fmt
157+
logs
154158
(diffast-core (= :version))
155159
(diffast-api (= :version))
156160
(diffast-git (= :version))
@@ -166,7 +170,7 @@
166170
(ocaml (>= 4.14))
167171
dune
168172
sedlex
169-
mehirLib
173+
menhirLib
170174
(diffast-misc (= :version))
171175
(vlt (>= 0.2.4))
172176
)

opam/diffast-git-cli.opam

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ bug-reports: "https://github.com/codinuum/diffast/issues"
1818
depends: [
1919
"ocaml" {>= "4.14"}
2020
"dune" {>= "3.17"}
21+
"cmdliner"
22+
"mtime"
23+
"fmt"
24+
"logs"
2125
"diffast-core" {= version}
2226
"diffast-api" {= version}
2327
"diffast-git" {= version}

opam/diffast-langs-common.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ depends: [
1919
"ocaml" {>= "4.14"}
2020
"dune" {>= "3.17"}
2121
"sedlex"
22-
"mehirLib"
22+
"menhirLib"
2323
"diffast-misc" {= version}
2424
"vlt" {>= "0.2.4"}
2525
"odoc" {with-doc}

src/api/dune

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
11

2+
(subdir
3+
pkg
4+
(rule
5+
(target v)
6+
(action (write-file %{target} %{version:diffast-api}))
7+
)
8+
)
9+
10+
(subdir
11+
dev
12+
(rule
13+
(target v)
14+
(action
15+
(with-stdout-to %{target} (run git describe --always --dirty))
16+
)
17+
)
18+
)
19+
20+
(rule
21+
(target v)
22+
(enabled_if (<> %{read:pkg/v} ""))
23+
(action (write-file %{target} %{read:pkg/v}))
24+
)
25+
26+
(rule
27+
(target v)
28+
(enabled_if (= %{read:pkg/v} ""))
29+
(action (write-file %{target} %{read-lines:dev/v}))
30+
)
31+
232
(rule
333
(target version.ml)
4-
(action (run ./genver.sh))
34+
(action
35+
(write-file %{target} "let version=\"%{read:v}\"\nlet copyright=\"Copyright 2010-2025 Codinuum Software Lab <[email protected]>\"\n")
36+
)
537
)
638

739
(library

src/api/genver.sh

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

src/cli/cli/ogit-debug

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

src/cli/cli/parsesrc.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ let _ =
238238

239239
let _ =
240240
if !show_version_flag then begin
241-
printf "Parse/SRC %s\n" Version.version;
241+
printf "Parse/SRC %s\n%s\n" Version.version Version.copyright;
242242
exit 0
243243
end
244244

0 commit comments

Comments
 (0)