Add implicit env variables when building packages.

Now, OPAM_PACKAGE_NAME and OPAM_PACKAGE_VERSION are available.
samoht · Jan 28, 2013 · 7558a11 · 7558a11
1 parent 4138ed8
commit 7558a11
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/client/opamSolution.ml b/src/client/opamSolution.ml
@@ -226,7 +226,11 @@ let string_of_commands commands =
 
 let compilation_env t opam =
   let env0 = OpamState.get_full_env t in
-  OpamState.add_to_env t env0 (OpamFile.OPAM.build_env opam)
+  let env1 = [
+    ("OPAM_PACKAGE_NAME", OpamPackage.Name.to_string (OpamFile.OPAM.name opam));
+    ("OPAM_PACKAGE_VERSION", OpamPackage.Version.to_string (OpamFile.OPAM.version opam))
+  ] @ env0 in
+  OpamState.add_to_env t env1 (OpamFile.OPAM.build_env opam)
 
 let proceed_to_delete ~rm_build t nv =
   log "deleting %s" (OpamPackage.to_string nv);

diff --git a/tests/packages/P3/build.sh b/tests/packages/P3/build.sh
@@ -1,4 +1,9 @@
 #!/bin/bash -eu
 
-echo "Building P3"
-ocamlbuild p3.cma p3.cmxa p3_bar.cma p3_bar.cmxa
+echo "Building P3 version ${OPAM_PACKAGE_VERSION}"
+
+if [ x${OPAM_PACKAGE_NAME} == xP3 ]; then
+    ocamlbuild p3.cma p3.cmxa p3_bar.cma p3_bar.cmxa
+else
+   exit 1
+fi