Merge #610: Release packaging improvements

2888db4 contrib: remove former script to generate Debian packages (Antoine Poinsot) 3e23bf5 contrib: Debian packaging for releases (Antoine Poinsot) 8a7c283 contrib: use a zip archive for the MacOS sample app folder (Antoine Poinsot) Pull request description: This cleans up the MacOS distribution and adds Debian packaging to the release script. This gives users of Debian-based distributions (Ubuntu, etc..) a simple way of installing our software. Fixes #519. ACKs for top commit: darosior: ACK 2888db4 Tree-SHA512: 04de4d455138e214dd73cf3d7d9623aae341271bf32201ef50eae4b3f07c572a4d2d7b4f3af9705d24a788ceffccedbfdca156fafbe9d7c475a8f655edf8e49a
wizardsardine · Aug 18, 2023 · bdeaf93 · bdeaf93
2 parents 0e71137 + 2888db4
commit bdeaf93
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 153 deletions.
diff --git a/contrib/build_deb_package.py b/contrib/build_deb_package.py
diff --git a/contrib/release/debian/package.zip b/contrib/release/debian/package.zip
diff --git a/contrib/release/macos/Liana.app.zip b/contrib/release/macos/Liana.app.zip
diff --git a/contrib/release/macos/Liana.app/Contents/Info.plist b/contrib/release/macos/Liana.app/Contents/Info.plist
diff --git a/contrib/release/macos/Liana.app/Contents/PkgInfo b/contrib/release/macos/Liana.app/Contents/PkgInfo
diff --git a/contrib/release/macos/Liana.app/Contents/Resources/Liana.icns b/contrib/release/macos/Liana.app/Contents/Resources/Liana.icns
diff --git a/contrib/release/release.sh b/contrib/release/release.sh
@@ -34,13 +34,21 @@ create_dir "$BUILD_DIR"
 OUT_DIR="$BUILD_DIR" ./contrib/reproducible/guix/guix-build.sh
 TARGET_DIR="$BUILD_DIR" ./contrib/reproducible/docker/docker-build.sh
 
-# Create the Linux archive
+# Create the Linux archive and Debian binary package.
 (
     cd "$BUILD_DIR"
     create_dir "$LINUX_DIR_NAME"
     cp "$BUILD_DIR/release/lianad" "$BUILD_DIR/release/liana-cli" "$BUILD_DIR/gui/release/liana-gui" ../README.md "$LINUX_DIR_NAME"
     tar -czf "$LINUX_ARCHIVE" "$LINUX_DIR_NAME"
     cp "$LINUX_ARCHIVE" "$RELEASE_DIR"
+
+    unzip ../contrib/release/debian/package.zip
+    sed -i "s/VERSION_PLACEHOLDER/$VERSION/g" ./package/DEBIAN/control
+    cp "$BUILD_DIR/release/lianad" "$BUILD_DIR/release/liana-cli" "$BUILD_DIR/gui/release/liana-gui" ../README.md ./package/usr/local/bin/
+    DIRNAME="liana_$VERSION-1_amd64"
+    mv ./package "$DIRNAME"
+    dpkg-deb --build "$DIRNAME"
+    mv "$DIRNAME.deb" "$RELEASE_DIR"
 )
 
 # Create the Windows archive and the raw executable
@@ -61,7 +69,7 @@ TARGET_DIR="$BUILD_DIR" ./contrib/reproducible/docker/docker-build.sh
     tar -czf "$MAC_ARCHIVE" "$MAC_DIR_NAME"
     cp "$MAC_ARCHIVE" "$RELEASE_DIR"
 
-    cp -r ../contrib/release/macos/Liana.app ./
+    unzip ../contrib/release/macos/Liana.app.zip ./
     sed -i "s/VERSION_PLACEHOLDER/$VERSION/g" ./Liana.app/Contents/Info.plist
     cp "$BUILD_DIR/gui/x86_64-apple-darwin/release/liana-gui" ./Liana.app/Contents/MacOS/Liana
     zip -ry Liana-noncodesigned.zip Liana.app