From a4be1fb7752bd8244623b6bfa2983eb1f83b1672 Mon Sep 17 00:00:00 2001 From: Jonah Beckford <9566106-jonahbeckford@users.noreply.gitlab.com> Date: Sat, 14 Sep 2024 07:56:49 -0700 Subject: [PATCH] Support Win32 long paths: setup.exe, dkml-package-entry.exe https://github.com/diskuv/dkcoder/issues/2 + Change dkml-package-entry.exe name to Diskuv.DkML.ConsoleEntrySetupExe from Diskuv.DKML.ConsoleEntrySetupExe --- .ocamlformat | 1 - CHANGES.md | 1 + .../ml-generator/code/entry-application.manifest | 3 ++- .../ml-generator/code/entry_assembly_manifest.ml | 11 +++++------ .../create/assets/manifests/setup.exe.manifest | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.ocamlformat b/.ocamlformat index bd1f239..bc42d58 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,2 +1 @@ -version=0.25.1 profile=conventional diff --git a/CHANGES.md b/CHANGES.md index 572643e..68bc7ad 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ ## Pending * Add `uninstall_file_onerror_exit` to API +* Enable Windows long path support for `setup.exe` and `dkml-package-entry.exe` in application manifest. Confer ## 0.5.2 diff --git a/installer/ml-generator/code/entry-application.manifest b/installer/ml-generator/code/entry-application.manifest index 18ba8aa..ceaf196 100644 --- a/installer/ml-generator/code/entry-application.manifest +++ b/installer/ml-generator/code/entry-application.manifest @@ -1,8 +1,9 @@ - + UTF-8 + true \ No newline at end of file diff --git a/installer/ml-generator/code/entry_assembly_manifest.ml b/installer/ml-generator/code/entry_assembly_manifest.ml index 608dcec..20f7cdb 100644 --- a/installer/ml-generator/code/entry_assembly_manifest.ml +++ b/installer/ml-generator/code/entry_assembly_manifest.ml @@ -2,12 +2,11 @@ let () = let version_m_n_o_p = Dkml_package_console_common.version_m_n_o_p Private_common.program_version in + (* This generated manifest is merged with [entry-application.manifest] in `discover.ml` *) print_endline (Fmt.str - "\n\ - \n\ - \ \n\ - " + {| + + +|} version_m_n_o_p) diff --git a/package/console/create/assets/manifests/setup.exe.manifest b/package/console/create/assets/manifests/setup.exe.manifest index 88163b8..27b9055 100644 --- a/package/console/create/assets/manifests/setup.exe.manifest +++ b/package/console/create/assets/manifests/setup.exe.manifest @@ -9,8 +9,9 @@ - + UTF-8 + true \ No newline at end of file