Recompute source digest instead of using build-uid

OCamlPro · Jul 27, 2020 · a172edc · a172edc
1 parent 7ff01ad
commit a172edc
Show file tree

Hide file tree

Showing 12 changed files with 491 additions and 291 deletions.
diff --git a/scripts/test-altergo.sh b/scripts/test-altergo.sh
@@ -13,8 +13,8 @@ call ./opam-bin clean
 call opam update local-bin
 
 call opam switch remove opam_bin -y
-call opam switch create opam_bin 4.07.1
-call opam install alt-ergo -y
+call opam switch create opam_bin 4.07.1 -j 1
+call opam install alt-ergo -y -j 1
 rm -rf $HOME/.opam/opam_bin.backup
 cp -dpR $HOME/.opam/opam_bin $HOME/.opam/opam_bin.backup
 mv $HOME/.opam/_opam-bin/opam-bin.log $HOME/.opam/opam_bin.backup/opam-bin.log
@@ -25,6 +25,6 @@ call ./opam-bin clean log
 call opam update local-bin
 call opam switch remove test_bin -y
 export OPAM_BIN_FORCE=1
-call opam switch create test_bin 4.07.1
-call opam install alt-ergo -y
+call opam switch create test_bin 4.07.1 -j 1
+call opam install alt-ergo -y -j 1
 
diff --git a/src/opambin.ml b/src/opambin.ml
@@ -44,6 +44,7 @@ let () =
         commands
     with
       exn ->
-      OpambinMisc.global_log "fatal exception %s"
-        (Printexc.to_string exn);
+      let error = Printexc.to_string exn in
+      OpambinMisc.global_log "fatal exception %s" error ;
+      Printf.eprintf "fatal exception %s" error ;
       exit 2
diff --git a/src/opambinCommandInstall.ml b/src/opambinCommandInstall.ml
@@ -46,22 +46,22 @@ let action () =
       Some (
         List.rev @@
         OpambinMisc.opam_variable "pre-build-commands"
-          {| ["%s" "pre-build" name version build-id depends] {?build-id} |}
+          {| ["%s" "pre-build" name version depends] {?build-id} |}
           OpambinGlobals.opambin_bin ::
         OpambinMisc.opam_variable "wrap-build-commands"
-          {| ["%s" "wrap-build" name version build-id depends "--"] {?build-id} |}
+          {| ["%s" "wrap-build" name version depends "--"] {?build-id} |}
           OpambinGlobals.opambin_bin ::
         OpambinMisc.opam_variable "pre-install-commands"
-          {| ["%s" "pre-install" name version build-id depends] {?build-id} |}
+          {| ["%s" "pre-install" name version depends] {?build-id} |}
           OpambinGlobals.opambin_bin ::
         OpambinMisc.opam_variable "wrap-install-commands"
-          {| ["%s" "wrap-install" name version build-id depends "--"] {?build-id} |}
+          {| ["%s" "wrap-install" name version depends "--"] {?build-id} |}
           OpambinGlobals.opambin_bin ::
         OpambinMisc.opam_variable "post-install-commands"
-          {| ["%s" "post-install" name version build-id depends installed-files] {?build-id & error-code = 0} |}
+          {| ["%s" "post-install" name version depends installed-files] {?build-id & error-code = 0} |}
           OpambinGlobals.opambin_bin  ::
         OpambinMisc.opam_variable "pre-remove-commands"
-          {| ["%s" "pre-remove" name version build-id depends] {?build-id} |}
+          {| ["%s" "pre-remove" name version depends] {?build-id} |}
           OpambinGlobals.opambin_bin ::
         List.rev file_contents
       )