diff options
| -rwxr-xr-x | stage | 11 | ||||
| -rwxr-xr-x | stage-pkg | 14 |
2 files changed, 22 insertions, 3 deletions
@@ -160,19 +160,26 @@ checksum_line "build2-mingw-$v-x86_64-windows.tar.xz" #checksum_line "build2-baseutils-$v-i686-windows.zip" #checksum_line "build2-mingw-$v-i686-windows.tar.xz" -# Prepare install script/batch files. +# Prepare install script/batch files and then append their checksums to +# toolchain.sha256. # case "$mode" in -q) o=--queue ;; -p) o= ;; *) o=--stage ;; esac -private/install/prepare "$o" "$dist_src" + +scripts=($(private/install/prepare "$o" "$dist_src")) + +for f in "${scripts[@]}"; do + checksum_line "$f" +done if [ "$mode" = "-p" ]; then exit 0 fi + # Sync the distribution. # # Note that we do the distribution first so that the toolchain changes are @@ -80,6 +80,18 @@ function dist() # <group> <dir> { local o="$repo_dir/$1" local b="$(basename $2)" + local d="$2-default" + + # If *-default/ exists, use that (old style out of tree configuration). + # Otherwise, use the source directory itself (new style forwarded + # configuration). + # + if ! test -d "$d"; then + d="$2" + if ! test -d "$d"; then + error "neither $2-default nor $2 exist" + fi + fi mkdir -p "$o" @@ -89,7 +101,7 @@ function dist() # <group> <dir> rm -f "$o/$b"-* fi - b "dist($2-default/)" "config.dist.archives=$owd/$o/tar.gz" + b "dist($d/)" "config.dist.archives=$owd/$o/tar.gz" } for d in "${dirs[@]}"; do |