Support OCaml 5.1.0

diskuv · Jul 20, 2023 · 6bfa014 · 6bfa014
1 parent 16cbbaa
commit 6bfa014
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@
 ## 0.4.0
 
 * Switch to cmdliner.1.1.1 from cmdliner.1.0.4 in the API
+* Support OCaml 5.1.0
 * Require `--package-name` to distinguish multiple installers in the same
   project
 

diff --git a/runner/bin/dune b/runner/bin/dune
@@ -31,8 +31,7 @@
  (libraries dkml-install-runner.admin))
 
 (rule
- (alias runtest)
- (package dkml-install-runner)
+;  (package dkml-install-runner)
  (target validate_user.dlls.txt.corrected)
  (deps
   (:bc validate_user.bc))
@@ -44,22 +43,47 @@
     (run ocamlobjinfo %{bc}))
    (with-stdout-to
     %{target}
-    (run awk "/.*:/ {x=0} /Used DLLs:/{x=1} x==1 {print}" %{target}.info))
-   (diff validate_user.dlls.txt %{target}))))
+    (run awk "/.*:/ {x=0} /Used DLLs:/{x=1} x==1 {print}" %{target}.info)))))
 
 (rule
- (alias runtest)
- (package dkml-install-runner)
+;  (package dkml-install-runner)
  (target validate_admin.dlls.txt.corrected)
  (deps
   (:bc validate_admin.bc))
- ; (enabled_if (<> %{os_type} Win32))
  (action
   (progn
    (with-stdout-to
     %{target}.info
     (run ocamlobjinfo %{bc}))
    (with-stdout-to
     %{target}
-    (run awk "/.*:/ {x=0} /Used DLLs:/{x=1} x==1 {print}" %{target}.info))
-   (diff validate_admin.dlls.txt %{target}))))
+    (run awk "/.*:/ {x=0} /Used DLLs:/{x=1} x==1 {print}" %{target}.info)))))
+
+(rule
+ (alias runtest)
+ (package dkml-install-runner)
+ (enabled_if (< %{ocaml_version} 5.1.0))
+ (action
+   (diff validate_user_pre51.dlls.txt validate_user.dlls.txt.corrected)))
+
+(rule
+ (alias runtest)
+ (package dkml-install-runner)
+ (enabled_if (< %{ocaml_version} 5.1.0))
+ (action
+   (diff validate_admin_pre51.dlls.txt validate_admin.dlls.txt.corrected)))
+
+(rule
+ (alias runtest)
+ (package dkml-install-runner)
+ (enabled_if (>= %{ocaml_version} 5.1.0))
+ (action
+   (diff validate_user_51.dlls.txt validate_user.dlls.txt.corrected)))
+
+(rule
+ (alias runtest)
+ (package dkml-install-runner)
+ (enabled_if (>= %{ocaml_version} 5.1.0))
+ (action
+   (diff validate_admin_51.dlls.txt validate_admin.dlls.txt.corrected)))
+
diff --git a/runner/bin/validate_admin_51.dlls.txt b/runner/bin/validate_admin_51.dlls.txt
@@ -0,0 +1,3 @@
+Used DLLs:
+	dllunixbyt
+	dllcamlstrbyt
diff --git a/runner/bin/validate_admin.dlls.txt → runner/bin/validate_admin_pre51.dlls.txt b/runner/bin/validate_admin.dlls.txt → runner/bin/validate_admin_pre51.dlls.txt
diff --git a/runner/bin/validate_user_51.dlls.txt b/runner/bin/validate_user_51.dlls.txt
@@ -0,0 +1,3 @@
+Used DLLs:
+	dllunixbyt
+	dllcamlstrbyt
diff --git a/runner/bin/validate_user.dlls.txt → runner/bin/validate_user_pre51.dlls.txt b/runner/bin/validate_user.dlls.txt → runner/bin/validate_user_pre51.dlls.txt