Make builds incremental by preserving source/build dirs (#45)

bzip2/build.sh

@@ -4,24 +4,19 @@ set -e
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 cd "$DIR"
 
-VERSION="1.0.8"
+VERSION="bzip2-1.0.8"
 INSTALL_DIR="$DIR/bzip2/install"
 
-# Idempotent: skip if already built
-if [ -f "$INSTALL_DIR/lib/libbz2.a" ]; then
-  echo "bzip2 already present, skipping build."
-  exit 0
-fi
-
 NJOBS="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)"
+CC="ccache ${CC:-cc}"
 
-# Download
-if [ ! -d "bzip2-src" ]; then
-  curl -L "https://sourceware.org/pub/bzip2/bzip2-${VERSION}.tar.gz" -o bzip2.tar.gz
-  mkdir -p bzip2-src
-  tar xzf bzip2.tar.gz -C bzip2-src --strip-components=1
-  rm bzip2.tar.gz
+# Clone/update source
+if [ ! -d "bzip2-src/.git" ]; then
+  rm -rf bzip2-src
+  git clone --depth 1 https://gitlab.com/bzip2/bzip2.git bzip2-src
 fi
+git -C bzip2-src fetch --depth 1 origin "$VERSION"
+git -C bzip2-src checkout --force FETCH_HEAD
 
 # Build static library with -fPIC
 cd bzip2-src
@@ -38,8 +33,5 @@ cp bzip2-src/libbz2.a "$INSTALL_DIR/lib/"
 # Headers
 cp bzip2-src/bzlib.h "$INSTALL_DIR/include/"
 
-# Clean up
-rm -rf bzip2-src
-
 echo "Installed bzip2 to $INSTALL_DIR"
 du -sh "$INSTALL_DIR"

bzip2/setup.py

@@ -15,11 +15,8 @@ class BuildBzip2(build_py):
 
   def run(self):
     pkg_dir = os.path.dirname(os.path.abspath(__file__))
-    marker = os.path.join(pkg_dir, "bzip2", "install", "lib", "libbz2.a")
-
-    if not os.path.exists(marker):
-      build_script = os.path.join(pkg_dir, "build.sh")
-      subprocess.check_call(["bash", build_script], cwd=pkg_dir)
+    build_script = os.path.join(pkg_dir, "build.sh")
+    subprocess.check_call(["bash", build_script], cwd=pkg_dir)
 
     super().run()