Skip to content

Commit

Permalink
Fixes and revert version.mlt update
Browse files Browse the repository at this point in the history
  • Loading branch information
@emilienlemaire
emilienlemaire committed Dec 20, 2024
1 parent 9e563f6 commit e58a5ff
Show file tree
Hide file tree
Showing 37 changed files with 229 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .drom
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ linking_flags.sh linguist-generated
/dune-project linguist-generated
/sphinx/conf.py linguist-generated
/package.json linguist-generated
/**/version.mlt linguist-generated
4 changes: 2 additions & 2 deletions Makefile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Makefile.drom-tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ build:
ifeq ($(TARGET_PLAT)_$(BUILD_STATIC_EXECS),linux_true)
./scripts/static-build.sh
else
ifeq ($(TARGET_PLAT), web)
${DUNE} build
ifeq ($(TARGET_PLAT),web)
${DUNE} build!{build-profile} ${DUNE_ARGS} ${DUNE_CROSS_ARGS}
else
${DUNE} build!{build-profile} ${DUNE_ARGS} ${DUNE_CROSS_ARGS} @install
endif
Expand Down
9 changes: 4 additions & 5 deletions Makefile.header
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,21 @@ DUNE_BUILD_SRCDIR = \

# TARGET_PLAT is defined in Makefile
TARGET_ARCH ?= x64
ifeq ($(TARGET_PLAT), web)
TARGET_SPEC = $(TARGET_PLAT)-$(TARGET_ARCH)
ifeq ($(TARGET_PLAT),web)
TARGET_SPEC = $(TARGET_PLAT)
else
TARGET_SPEC = $(TARGET_PLAT)-$(TARGET_ARCH)
endif

TARGET_PROFILE ?= release
TARGET_VSIX = $(TARGET_NAME)-$(VERSION)-$(TARGET_SPEC)-$(TARGET_PROFILE).vsix

DOT_EXE = $(if $(filter win32,$(TARGET_PLAT)),.exe)
SUPERBOL_LSP = superbol-free-$(TARGET_SPEC)$(DOT_EXE)
SUPERBOL_LSPs = $(wildcard superbol-free-*-*)
ifeq ($(TARGET_PLAT), web)
ifeq ($(TARGET_PLAT),web)
SUPERBOL_LSP_BUILT = ${DUNE_BUILD_SRCDIR}/lsp/superbol-free/main.bc.js
SUPERBOL_LSP = superbol-free.js
else
SUPERBOL_LSP = superbol-free-$(TARGET_SPEC)$(DOT_EXE)
ifeq ($(TARGET_PLAT)_$(BUILD_STATIC_EXECS),linux_true)
SUPERBOL_LSP_BUILT = superbol-free
else
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_cfg/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_common/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_config/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_data/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_indent/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_indent_old/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_lsp/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_parser/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_preproc/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_ptree/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_typeck/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/cobol_unit/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/ebcdic_lib/ebcdic_version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/ezr_toml/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/ppx_cobcflags/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/pretty/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/sql_ast/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/sql_parser/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/superbol_free_lib/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/superbol_preprocs/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
9 changes: 7 additions & 2 deletions src/lsp/superbol_project/version.mlt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ let query cmd =
else None
with End_of_file -> None

let commit_hash = query "git show -s --pretty=format:%H"
let commit_date = query "git show -s --pretty=format:%ci"
let gitdir =
try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> ""

let commit_hash =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%H")
let commit_date =
query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci")
let version = "0.1.5"

let string_option = function
Expand Down
Loading

0 comments on commit e58a5ff

Please sign in to comment.