Move build.sh to the new python package as xcp-ng-dev-build

This needed a small bit of python glue code

Signed-off-by: Pau Ruiz Safont <[email protected]>

Author: psafont

README.md

@@ -25,6 +25,22 @@ the docker-compatible command to use (typically `podman` or `docker`).
 You'll need to install git-lfs to be able to download the source tarballs from
 git, otherwise when running xcp-ng-dev, it won't be able to extract the sources.
 
+## Installation
+
+Clone this repository and install the `xcp-ng-dev` package:
+
+```bash
+git clone xcp-ng/xcp-ng-dev-build-env
+cd xcp-ng-dev-build-env
+uv tool install --from . xcp-ng-dev
+```
+
+If `uv` is not available you can use other tools to install python packages,
+like `pipx install .`
+
+After this, two new commands will be available: `xcp-ng-dev-build` and
+`xcp-ng-dev`,
+
 ## Building the container image(s)
 
 You need one container image per target version of XCP-ng.
@@ -40,12 +56,6 @@ Usage: ./build.sh {version_of_XCP_ng}
 
 ## Using the container
 
-Install the `xcp-ng-dev` script with however you usually install python
-binaries. For example:
-
-`uv tool install --from path/to/xcp-ng-build-env xcp-ng-dev`
-`pipx install path/to/xcpng-build-env`
-
 Use `xcp-ng-dev`. It accepts a variety of parameters allowing for different uses:
 * rebuild an existing source RPM (with automated installation of the build dependencies)
 * build a package from an already extracted source RPM (sources and spec file), or from a directory that follows the rpmbuild convention (a `SOURCES/` directory and a `SPECS/` directory). Most useful for building packages from XCP-ng's git repositories of RPM sources: https://github.com/xcp-ng-rpms.

pyproject.toml

@@ -9,6 +9,7 @@ dynamic = ["version"]
 
 [project.scripts]
 xcp-ng-dev = "xcp_ng_dev.cli:main"
+xcp-ng-dev-build = "xcp_ng_dev.cli:build"
 
 [project.urls]
 Homepage = "https://github.com/xcp-ng/xcp-ng-build-env/"

build.sh renamed to src/xcp_ng_dev/build.sh

@@ -2,8 +2,10 @@
 
 set -e
 
+SELF_NAME="xcp-ng-dev-build"
+
 if [ -z "$1" ]; then
-    echo "Usage: $0 {version}"
+    echo "Usage: $SELF_NAME {version}"
     echo "... where {version} is a 'x.y' version such as 8.0."
     exit
 fi
@@ -32,12 +34,12 @@ CUSTOM_ARGS=()
 case "$1" in
     7.*)
         REPO_FILE=files/xcp-ng.repo.7.x.in
-        DOCKERFILE=Dockerfile-7.x
+        DOCKERFILE=files/Dockerfile-7.x
         CENTOS_VERSION=7.2.1511
         ;;
     8.*)
         REPO_FILE=files/xcp-ng.repo.8.x.in
-        DOCKERFILE=Dockerfile-8.x
+        DOCKERFILE=files/Dockerfile-8.x
         CENTOS_VERSION=7.5.1804
         ;;
     *)

src/xcp_ng_dev/cli.py

@@ -204,6 +204,10 @@ def main():
 
     sys.exit(return_code)
 
+def build():
+    bargs = [os.path.join(os.path.dirname(__file__ ), 'build.sh')] + sys.argv[1:]
+    return_code = subprocess.call(bargs)
+    sys.exit(return_code)
 
 if __name__ == "__main__":
     main()