X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/c19cdfc8f47e14aaaf46ea289a13f5978217bdd7..4acfe4036f522fa5f1bf438d76aa76cb2e4b07e8:/sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index ccb1973..91da408 100755
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -10,7 +10,11 @@ set -eu
 ME="${0##*/}"
 
 BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"
-trap "cd /tmp && rm -r '$BUILDDIR'" 0
+cleanup() {
+  cd /tmp && rm -r "$BUILDDIR"
+  trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+}
+trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
@@ -24,6 +28,9 @@ dinstall() {
 print_bundle_location() {
   echo "Bundle available at $@ ."
 }
+postbuild() {
+  :
+}
 
 KEYID=
 
@@ -65,6 +72,7 @@ usage()
 
 binonly=0
 sbuild_args=
+sbuild_args_sourceful=
 schangesfile=
 arch=
 for opt in "$@"; do
@@ -146,34 +154,62 @@ dcmd "$dscfile_basename" | while read f; do
   esac
 done
 
-[ "$binonly" = 0 ] && sbuild_args="${sbuild_args:+$sbuild_args }--source --arch-all"
+rm $schangesfile
+unset schangesfile
 
-sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
-  "$dscfile_basename"
+if [ "$binonly" = 0 ]; then
+  sbuild_args_sourceful="--source --arch-all"
+fi
 
-changesfile="${packagenameversion}_${arch}.changes"
+if [ "$arch" = all ]; then
+  arch="$(schroot -l | sed -rne 's,^sid-([^-]+).*,\1,p' | uniq | tr '\n' ' ')"
+fi
 
-#mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
-#mv temp-combined.changes "$changesfile"
-#changestool "$changesfile" updatechecksums
+for a in $arch; do
+  echo "I: building $packagenameversion for $a/$dist…" >&2
 
-#sign_changes_file "$changesfile"
+  sbuild $sbuild_args $sbuild_args_sourceful \
+    --arch="$a" --dist="$dist" --keyid=$KEYID \
+    "$dscfile_basename"
 
-dinstall "$dist" "$changesfile"
+  changesfile="${packagenameversion}_${a}.changes"
 
-DATESTR="$(date +%Y.%m.%d.%H%M%S)"
-BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
+  if [ -n "$sbuild_args_sourceful" ]; then
+    schangesfile="${packagenameversion}_source+${changesfile#${packagenameversion}_}"
+    mv "$changesfile" "$schangesfile"
+    changesfile="$schangesfile"
+  fi
 
-mv current "${BUILD_PREFIX}".buildlog
-rm -f current-*
+  # subsequent iterations should be binonly
+  sbuild_args_sourceful=
 
-bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
-tar -chf "$bundle" *
-chmod 644 "$bundle"
+  echo "I: running post-build hook ($packagenameversion/$a/$dist)…" >&2
+  postbuild "$dist" "$a" "$changesfile"
+  echo "I: running dinstall ($packagenameversion/$a/$dist)…" >&2
+  dinstall "$dist" "$changesfile"
 
-rm -r "$BUILDDIR"
-trap - 0
+  echo "I: done building $packagenameversion for $a/$dist" >&2
+done
+
+if [ -n "${schangesfile:-}" ]; then
+  sarch="${schangesfile##*_}"; sarch=${sarch%.changes}
+  combined_arch="$(echo -n "${sarch}+";
+                   for i in *.changes; do
+                     [ "$i" = "$schangesfile" ] && continue
+                     t="${i##*_}"; echo "${t%.changes}"
+                   done)"
+
+  if [ -n "$combined_arch" ]; then
+    mergechanges *.changes > ${packagenameversion}_${combined_arch}.changes
+    arch="$combined_arch"
+  fi
+fi
 
+bundle="${BUNDLE_DIR}/${packagenameversion}_${arch}_bundle.tar.gz"
+tar -chzf "$bundle" *
+chmod 644 "$bundle"
 print_bundle_location "$bundle"
 
+cleanup
+
 exit 0