alibuild 1.17.0rc1__tar.gz → 1.17.0rc2__tar.gz

{alibuild-1.17.0rc1/alibuild.egg-info → alibuild-1.17.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.17.0rc1
+Version: 1.17.0rc2
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2/alibuild.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.17.0rc1
+Version: 1.17.0rc2
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2}/alibuild_helpers/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.0rc1'
+__version__ = version = '1.17.0rc2'
 __version_tuple__ = version_tuple = (1, 17, 0)

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2}/alibuild_helpers/build.py

@@ -12,7 +12,7 @@ from alibuild_helpers.utilities import getPackageList, asList
 from alibuild_helpers.utilities import validateDefaults
 from alibuild_helpers.utilities import Hasher
 from alibuild_helpers.utilities import yamlDump
-from alibuild_helpers.utilities import resolve_tag, resolve_version
+from alibuild_helpers.utilities import resolve_tag, resolve_version, short_commit_hash
 from alibuild_helpers.git import Git, git
 from alibuild_helpers.sl import Sapling
 from alibuild_helpers.scm import SCMError
@@ -659,27 +659,21 @@ def doBuild(args, parser):
 
   # We recursively calculate the full set of requires "full_requires"
   # including build_requires and the subset of them which are needed at
-  # runtime "full_runtime_requires".
+  # runtime "full_runtime_requires". Do this in build order, so that we can
+  # rely on each spec's dependencies already having their full_*_requires
+  # properties populated.
   for p in buildOrder:
     spec = specs[p]
-    todo = [p]
-    spec["full_requires"] = []
-    spec["full_runtime_requires"] = []
-    spec["full_build_requires"] = []
-    while todo:
-      i = todo.pop(0)
-      requires = specs[i].get("requires", [])
-      runTimeRequires = specs[i].get("runtime_requires", [])
-      buildRequires = specs[i].get("build_requires", [])
-      spec["full_requires"] += requires
-      spec["full_runtime_requires"] += runTimeRequires
-      spec["full_build_requires"] += buildRequires
-      todo += requires
-    spec["full_requires"] = set(spec["full_requires"])
-    spec["full_runtime_requires"] = set(spec["full_runtime_requires"])
-    # If something requires or runtime_requires a package, then it's not 
-    # a build_requires only anymore, so we drop it from the list.
-    spec["full_build_requires"] = set(spec["full_build_requires"]) - spec["full_runtime_requires"]
+    for key in ("requires", "runtime_requires", "build_requires"):
+      full_key = "full_" + key
+      spec[full_key] = set()
+      for dep in spec.get(key, ()):
+        spec[full_key].add(dep)
+        # Runtime deps of build deps should count as build deps.
+        spec[full_key] |= specs[dep]["full_requires" if key == "build_requires" else full_key]
+    # If something requires or runtime_requires a package, then it's not a
+    # pure build_requires only anymore, so we drop it from the list.
+    spec["full_build_requires"] -= spec["full_runtime_requires"]
 
   # Use the selected plugin to build, instead of the default behaviour, if a
   # plugin was selected.
@@ -1009,8 +1003,7 @@ def doBuild(args, parser):
       ("BUILD_REQUIRES", " ".join(spec["build_requires"])),
       ("CACHED_TARBALL", cachedTarball),
       ("CAN_DELETE", args.aggressiveCleanup and "1" or ""),
-      # Shorten the commit hash if it's a real commit hash and not simply the tag.
-      ("COMMIT_HASH", spec["tag"] if spec["tag"] == spec["commit_hash"] else spec["commit_hash"][:10]),
+      ("COMMIT_HASH", short_commit_hash(spec)),
       ("DEPS_HASH", spec.get("deps_hash", "")),
       ("DEVEL_HASH", spec.get("devel_hash", "")),
       ("DEVEL_PREFIX", develPrefix),

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2}/alibuild_helpers/build_template.sh

@@ -155,7 +155,6 @@ cat <<\EOF > "$INSTALLROOT/etc/profile.d/init.sh"
 EOF
 
 cd "$WORK_DIR/INSTALLROOT/$PKGHASH"
-echo "$PKGHASH" > "$INSTALLROOT/.build-hash"
 # Replace the .envrc to point to the final installation directory.
 cat << EOF > "$BUILDDIR/.envrc"
 # Source the build environment which was used for this package
@@ -293,6 +292,9 @@ if [[ $BUILD_FAMILY ]]; then
   ln -snf $PKGVERSION-$PKGREVISION $ARCHITECTURE/$PKGNAME/latest-$BUILD_FAMILY
 fi
 
+# When the package is definitely fully installed, install the file that marks
+# the package as successful.
+echo "$PKGHASH" > "$WORK_DIR/$PKGPATH/.build-hash"
 # Mark the build as successful with a placeholder. Allows running incremental
 # recipe in case the package is in development mode.
 echo "${DEVEL_HASH}${DEPS_HASH}" > "$BUILDDIR/.build_succeeded"

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2}/alibuild_helpers/git.py

@@ -49,7 +49,11 @@ class Git(SCM):
   def cloneSourceCmd(self, source, destination, referenceRepo, usePartialClone):
     cmd = ["clone", "-n", source, destination]
     if referenceRepo:
-      cmd.extend(["--reference", referenceRepo])
+      # If we're building inside a Docker container, we can't refer to the
+      # mirror repo directly, since Git uses an absolute path. With
+      # "--dissociate", we still copy the objects locally, but we don't refer
+      # to them by path.
+      cmd.extend(["--dissociate", "--reference", referenceRepo])
     if usePartialClone:
       cmd.extend(clone_speedup_options())
     return cmd

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2}/alibuild_helpers/utilities.py

@@ -90,6 +90,18 @@ def resolve_links_path(architecture, package):
   return "/".join(("TARS", architecture, package))
 
 
+def short_commit_hash(spec):
+  """Shorten the spec's commit hash to make it more human-readable.
+
+  This is complicated by the fact that the commit_hash property is not
+  necessarily a commit hash, but might be a tag name. If it is a tag name,
+  return it as-is, else assume it is actually a commit hash and shorten it.
+  """
+  if spec["tag"] == spec["commit_hash"]:
+    return spec["commit_hash"]
+  return spec["commit_hash"][:10]
+
+
 # Date fields to substitute: they are zero-padded
 now = datetime.now()
 nowKwds = { "year": str(now.year),

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2}/alibuild_helpers/workarea.py

@@ -10,7 +10,7 @@ except ImportError:
   from ordereddict import OrderedDict
 
 from alibuild_helpers.log import dieOnError, debug, error
-from alibuild_helpers.utilities import call_ignoring_oserrors, symlink
+from alibuild_helpers.utilities import call_ignoring_oserrors, symlink, short_commit_hash
 
 FETCH_LOG_NAME = "fetch-log.txt"
 
@@ -145,7 +145,9 @@ def checkout_sources(spec, work_dir, reference_sources, containerised_build):
     return 0
 
   source_parent_dir = os.path.join(work_dir, "SOURCES", spec["package"], spec["version"])
-  source_dir = os.path.join(source_parent_dir, spec["commit_hash"])
+  # The build script expects SOURCEDIR to be named after the shortened commit
+  # hash, not the full one.
+  source_dir = os.path.join(source_parent_dir, short_commit_hash(spec))
   os.makedirs(source_parent_dir, exist_ok=True)
 
   if spec["commit_hash"] != spec["tag"]:

{alibuild-1.17.0rc1 → alibuild-1.17.0rc2}/tests/test_build.py

@@ -104,22 +104,22 @@ TEST_EXTRA_BUILD_HASH = ("9f9eb8696b7722df52c4703f5fe7acc4b8000ba2" if sys.versi
 GIT_CLONE_REF_ZLIB_ARGS = ("clone", "--bare", "https://github.com/star-externals/zlib",
                            "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
 GIT_CLONE_SRC_ZLIB_ARGS = ("clone", "-n", "https://github.com/star-externals/zlib",
-                           "/sw/SOURCES/zlib/v1.2.3/8822efa61f2a385e0bc83ca5819d608111b2168a",
-                           "--reference", "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
+                           "/sw/SOURCES/zlib/v1.2.3/8822efa61f",
+                           "--dissociate", "--reference", "/sw/MIRROR/zlib", "--filter=blob:none"), ".", False
 GIT_SET_URL_ZLIB_ARGS = ("remote", "set-url", "--push", "origin", "https://github.com/star-externals/zlib"), \
-    "/sw/SOURCES/zlib/v1.2.3/8822efa61f2a385e0bc83ca5819d608111b2168a", False
+    "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
 GIT_CHECKOUT_ZLIB_ARGS = ("checkout", "-f", "master"), \
-    "/sw/SOURCES/zlib/v1.2.3/8822efa61f2a385e0bc83ca5819d608111b2168a", False
+    "/sw/SOURCES/zlib/v1.2.3/8822efa61f", False
 
 GIT_FETCH_REF_ROOT_ARGS = ("fetch", "-f", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
                            "+refs/heads/*:refs/heads/*"), "/sw/MIRROR/root", False
 GIT_CLONE_SRC_ROOT_ARGS = ("clone", "-n", "https://github.com/root-mirror/root",
-                           "/sw/SOURCES/ROOT/v6-08-30/f7b336611753f1f4aaa94222b0d620748ae230c0",
-                           "--reference", "/sw/MIRROR/root", "--filter=blob:none"), ".", False
+                           "/sw/SOURCES/ROOT/v6-08-30/f7b3366117",
+                           "--dissociate", "--reference", "/sw/MIRROR/root", "--filter=blob:none"), ".", False
 GIT_SET_URL_ROOT_ARGS = ("remote", "set-url", "--push", "origin", "https://github.com/root-mirror/root"), \
-    "/sw/SOURCES/ROOT/v6-08-30/f7b336611753f1f4aaa94222b0d620748ae230c0", False
+    "/sw/SOURCES/ROOT/v6-08-30/f7b3366117", False
 GIT_CHECKOUT_ROOT_ARGS = ("checkout", "-f", "v6-08-00-patches"), \
-    "/sw/SOURCES/ROOT/v6-08-30/f7b336611753f1f4aaa94222b0d620748ae230c0", False
+    "/sw/SOURCES/ROOT/v6-08-30/f7b3366117", False
 
 
 def dummy_git(args, directory=".", check=True, prompt=True):