Misc: fix install

Author: hhugo

compiler/bin-js_of_ocaml/dune

@@ -47,8 +47,9 @@
     ./js_of_ocaml.exe:js_of_ocaml
     cmdliner-support))))
 
-(install
- (section share_root)
- (package js_of_ocaml-compiler)
- (dirs
-  (cmdliner-support/share as .)))
+;; Restore once fixed in dune
+;; (install
+;;  (section share_root)
+;;  (package js_of_ocaml-compiler)
+;; (dirs
+;;  (cmdliner-support/share as .)))

compiler/bin-jsoo_minify/dune

@@ -5,15 +5,3 @@
  (libraries jsoo_cmdline js_of_ocaml-compiler cmdliner compiler-libs.common)
  (flags
   (:standard -safe-string)))
-
-(rule
- (targets jsoo_minify.1)
- (action
-  (with-stdout-to
-   %{targets}
-   (run %{bin:jsoo_minify} --help=groff))))
-
-(install
- (section man)
- (package js_of_ocaml-compiler)
- (files jsoo_minify.1))

compiler/bin-wasm_of_ocaml/dune

@@ -48,8 +48,9 @@
     ./wasm_of_ocaml.exe:wasm_of_ocaml
     cmdliner-support))))
 
-(install
- (section share_root)
- (package wasm_of_ocaml-compiler)
- (dirs
-  (cmdliner-support/share as .)))
+;; Restore once fixed in dune
+;; (install
+;;  (section share_root)
+;;  (package wasm_of_ocaml-compiler)
+;;  (dirs
+;;   (cmdliner-support/share as .)))

js_of_ocaml-compiler.opam

@@ -49,6 +49,11 @@ build: [
   ["cmdliner" "install" "tool-support"
               "--update-opam-install=%{_:name}%.install"
               "_build/install/default/bin/js_of_ocaml" {os-family != "windows"}
-              "_build/install/default/bin/js_of_ocaml.exe" {os-family = "windows"}
+              "_build/install/default/bin/js_of_ocaml.exe:js_of_ocaml" {os-family = "windows"}
+              "_build/cmdliner-install"]
+  ["cmdliner" "install" "tool-support"
+              "--update-opam-install=%{_:name}%.install"
+              "_build/install/default/bin/jsoo_minify" {os-family != "windows"}
+              "_build/install/default/bin/jsoo_minify.exe:jsoo_minify" {os-family = "windows"}
               "_build/cmdliner-install"]
 ]

js_of_ocaml-compiler.opam.template

@@ -12,6 +12,11 @@ build: [
   ["cmdliner" "install" "tool-support"
               "--update-opam-install=%{_:name}%.install"
               "_build/install/default/bin/js_of_ocaml" {os-family != "windows"}
-              "_build/install/default/bin/js_of_ocaml.exe" {os-family = "windows"}
+              "_build/install/default/bin/js_of_ocaml.exe:js_of_ocaml" {os-family = "windows"}
+              "_build/cmdliner-install"]
+  ["cmdliner" "install" "tool-support"
+              "--update-opam-install=%{_:name}%.install"
+              "_build/install/default/bin/jsoo_minify" {os-family != "windows"}
+              "_build/install/default/bin/jsoo_minify.exe:jsoo_minify" {os-family = "windows"}
               "_build/cmdliner-install"]
 ]

wasm_of_ocaml-compiler.opam

@@ -50,6 +50,6 @@ build: [
   ["cmdliner" "install" "tool-support"
               "--update-opam-install=%{_:name}%.install"
               "_build/install/default/bin/wasm_of_ocaml" {os-family != "windows"}
-              "_build/install/default/bin/wasm_of_ocaml.exe" {os-family = "windows"}
+              "_build/install/default/bin/wasm_of_ocaml.exe:wasm_of_ocaml" {os-family = "windows"}
               "_build/cmdliner-install"]
 ]

wasm_of_ocaml-compiler.opam.template

@@ -12,6 +12,6 @@ build: [
   ["cmdliner" "install" "tool-support"
               "--update-opam-install=%{_:name}%.install"
               "_build/install/default/bin/wasm_of_ocaml" {os-family != "windows"}
-              "_build/install/default/bin/wasm_of_ocaml.exe" {os-family = "windows"}
+              "_build/install/default/bin/wasm_of_ocaml.exe:wasm_of_ocaml" {os-family = "windows"}
               "_build/cmdliner-install"]
 ]