From ca5c46230a998562d7a3e733c4ee9e6e8a823402 Mon Sep 17 00:00:00 2001 From: Jonah Beckford <71855677+jonahbeckford@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:10:44 -0800 Subject: [PATCH] Switch to offline-unixutils - Using offline-unixutils has the net effect of removing the need for the staging-curl component. - Fixes https://github.com/diskuv/dkml-installer-ocaml/issues/19. --- dkml-installer-network-ocaml.opam | 6 +- dkml-installer-network-ocaml.opam.template | 6 +- installer/bin/dune.inc | 86 +++++++++++----------- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dkml-installer-network-ocaml.opam b/dkml-installer-network-ocaml.opam index a3b9bb5..1a6c677 100644 --- a/dkml-installer-network-ocaml.opam +++ b/dkml-installer-network-ocaml.opam @@ -99,11 +99,11 @@ pin-depends: [ ] [ - "dkml-runtime-common.1.0.2~prerel26" + "dkml-runtime-common.1.0.2~prerel27" "git+https://github.com/diskuv/dkml-runtime-common.git" ] [ - "dkml-runtime-distribution.1.0.2~prerel26" + "dkml-runtime-distribution.1.0.2~prerel27" "git+https://github.com/diskuv/dkml-runtime-distribution.git" ] [ @@ -159,7 +159,7 @@ pin-depends: [ "git+https://github.com/diskuv/dkml-component-unixutils.git" ] [ - "dkml-component-network-unixutils.0.2.0" + "dkml-component-offline-unixutils.0.2.0" "git+https://github.com/diskuv/dkml-component-unixutils.git" ] [ diff --git a/dkml-installer-network-ocaml.opam.template b/dkml-installer-network-ocaml.opam.template index 3330116..3466ef1 100644 --- a/dkml-installer-network-ocaml.opam.template +++ b/dkml-installer-network-ocaml.opam.template @@ -58,11 +58,11 @@ pin-depends: [ ] [ - "dkml-runtime-common.1.0.2~prerel26" + "dkml-runtime-common.1.0.2~prerel27" "git+https://github.com/diskuv/dkml-runtime-common.git" ] [ - "dkml-runtime-distribution.1.0.2~prerel26" + "dkml-runtime-distribution.1.0.2~prerel27" "git+https://github.com/diskuv/dkml-runtime-distribution.git" ] [ @@ -118,7 +118,7 @@ pin-depends: [ "git+https://github.com/diskuv/dkml-component-unixutils.git" ] [ - "dkml-component-network-unixutils.0.2.0" + "dkml-component-offline-unixutils.0.2.0" "git+https://github.com/diskuv/dkml-component-unixutils.git" ] [ diff --git a/installer/bin/dune.inc b/installer/bin/dune.inc index ab745f4..799d540 100644 --- a/installer/bin/dune.inc +++ b/installer/bin/dune.inc @@ -2,7 +2,7 @@ ; Do not edit unless need to regenerate! ; When regenerating, erase **all** content from this file, save the file, and then run: ; dune clean -; dune build installer/bin/dune.gen.inc --auto-promote +; dune build '@installer/bin//gen-dkml' --auto-promote (executable (name discover) (libraries dune.configurator bos fpath) (modules discover)) @@ -15,53 +15,53 @@ (executable (public_name dkml-install-user-runner) (name runner_user) (modules runner_user) (ocamlopt_flags (:include user-link-flags.sexp)) (libraries dkml-install-runner.user private_common - dkml-component-network-ocamlcompiler dkml-component-network-unixutils - dkml-component-offline-desktop-full dkml-component-offline-opamshim - dkml-component-staging-curl dkml-component-staging-desktop-compile - dkml-component-staging-desktop-full dkml-component-staging-ocamlrun - dkml-component-staging-opam32 dkml-component-staging-opam64 - dkml-component-staging-unixutils dkml-component-staging-withdkml)) + dkml-component-network-ocamlcompiler dkml-component-offline-desktop-full + dkml-component-offline-opamshim dkml-component-offline-unixutils + dkml-component-staging-desktop-compile dkml-component-staging-desktop-full + dkml-component-staging-ocamlrun dkml-component-staging-opam32 + dkml-component-staging-opam64 dkml-component-staging-unixutils + dkml-component-staging-withdkml)) (executable (public_name dkml-install-admin-runner) (name runner_admin) (modules runner_admin) (ocamlopt_flags (:include admin-link-flags.sexp)) (libraries dkml-install-runner.admin private_common - dkml-component-network-ocamlcompiler dkml-component-network-unixutils - dkml-component-offline-desktop-full dkml-component-offline-opamshim - dkml-component-staging-curl dkml-component-staging-desktop-compile - dkml-component-staging-desktop-full dkml-component-staging-ocamlrun - dkml-component-staging-opam32 dkml-component-staging-opam64 - dkml-component-staging-unixutils dkml-component-staging-withdkml)) + dkml-component-network-ocamlcompiler dkml-component-offline-desktop-full + dkml-component-offline-opamshim dkml-component-offline-unixutils + dkml-component-staging-desktop-compile dkml-component-staging-desktop-full + dkml-component-staging-ocamlrun dkml-component-staging-opam32 + dkml-component-staging-opam64 dkml-component-staging-unixutils + dkml-component-staging-withdkml)) (executable (public_name dkml-install-create-installers) (name create_installers) (libraries dkml-package-console.create cmdliner private_common - dkml-component-network-ocamlcompiler dkml-component-network-unixutils - dkml-component-offline-desktop-full dkml-component-offline-opamshim - dkml-component-staging-curl dkml-component-staging-desktop-compile - dkml-component-staging-desktop-full dkml-component-staging-ocamlrun - dkml-component-staging-opam32 dkml-component-staging-opam64 - dkml-component-staging-unixutils dkml-component-staging-withdkml) + dkml-component-network-ocamlcompiler dkml-component-offline-desktop-full + dkml-component-offline-opamshim dkml-component-offline-unixutils + dkml-component-staging-desktop-compile dkml-component-staging-desktop-full + dkml-component-staging-ocamlrun dkml-component-staging-opam32 + dkml-component-staging-opam64 dkml-component-staging-unixutils + dkml-component-staging-withdkml) (modules create_installers)) (executable (public_name dkml-install-package-install) (name entry_install) (libraries dkml-package-console.entry cmdliner private_common - dkml-component-network-ocamlcompiler dkml-component-network-unixutils - dkml-component-offline-desktop-full dkml-component-offline-opamshim - dkml-component-staging-curl dkml-component-staging-desktop-compile - dkml-component-staging-desktop-full dkml-component-staging-ocamlrun - dkml-component-staging-opam32 dkml-component-staging-opam64 - dkml-component-staging-unixutils dkml-component-staging-withdkml) + dkml-component-network-ocamlcompiler dkml-component-offline-desktop-full + dkml-component-offline-opamshim dkml-component-offline-unixutils + dkml-component-staging-desktop-compile dkml-component-staging-desktop-full + dkml-component-staging-ocamlrun dkml-component-staging-opam32 + dkml-component-staging-opam64 dkml-component-staging-unixutils + dkml-component-staging-withdkml) (modules entry_install) (ocamlopt_flags (:include console-link-flags.sexp))) (executable (public_name dkml-install-package-uninstall) (name entry_uninstall) (libraries dkml-package-console.entry cmdliner private_common - dkml-component-network-ocamlcompiler dkml-component-network-unixutils - dkml-component-offline-desktop-full dkml-component-offline-opamshim - dkml-component-staging-curl dkml-component-staging-desktop-compile - dkml-component-staging-desktop-full dkml-component-staging-ocamlrun - dkml-component-staging-opam32 dkml-component-staging-opam64 - dkml-component-staging-unixutils dkml-component-staging-withdkml) + dkml-component-network-ocamlcompiler dkml-component-offline-desktop-full + dkml-component-offline-opamshim dkml-component-offline-unixutils + dkml-component-staging-desktop-compile dkml-component-staging-desktop-full + dkml-component-staging-ocamlrun dkml-component-staging-opam32 + dkml-component-staging-opam64 dkml-component-staging-unixutils + dkml-component-staging-withdkml) (modules entry_uninstall) (ocamlopt_flags (:include console-link-flags.sexp))) @@ -74,22 +74,22 @@ (executable (name package_setup) (modes (byte exe)) (libraries dkml-package-console.setup cmdliner private_common - dkml-component-network-ocamlcompiler dkml-component-network-unixutils - dkml-component-offline-desktop-full dkml-component-offline-opamshim - dkml-component-staging-curl dkml-component-staging-desktop-compile - dkml-component-staging-desktop-full dkml-component-staging-ocamlrun - dkml-component-staging-opam32 dkml-component-staging-opam64 - dkml-component-staging-unixutils dkml-component-staging-withdkml) + dkml-component-network-ocamlcompiler dkml-component-offline-desktop-full + dkml-component-offline-opamshim dkml-component-offline-unixutils + dkml-component-staging-desktop-compile dkml-component-staging-desktop-full + dkml-component-staging-ocamlrun dkml-component-staging-opam32 + dkml-component-staging-opam64 dkml-component-staging-unixutils + dkml-component-staging-withdkml) (modules package_setup)) (executable (name package_uninstaller) (modes (byte exe)) (libraries dkml-package-console.uninstaller cmdliner private_common - dkml-component-network-ocamlcompiler dkml-component-network-unixutils - dkml-component-offline-desktop-full dkml-component-offline-opamshim - dkml-component-staging-curl dkml-component-staging-desktop-compile - dkml-component-staging-desktop-full dkml-component-staging-ocamlrun - dkml-component-staging-opam32 dkml-component-staging-opam64 - dkml-component-staging-unixutils dkml-component-staging-withdkml) + dkml-component-network-ocamlcompiler dkml-component-offline-desktop-full + dkml-component-offline-opamshim dkml-component-offline-unixutils + dkml-component-staging-desktop-compile dkml-component-staging-desktop-full + dkml-component-staging-ocamlrun dkml-component-staging-opam32 + dkml-component-staging-opam64 dkml-component-staging-unixutils + dkml-component-staging-withdkml) (modules package_uninstaller)) (install (section bin)