diff --git a/VERSION b/VERSION index dbe5900..1817afe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.8.1 +2.8.2 diff --git a/bin/package_libs b/bin/package_libs index 564c71a..854ee18 100755 --- a/bin/package_libs +++ b/bin/package_libs @@ -5,27 +5,38 @@ set -e # Package shared/rarely-changing library artifacts. # -# Produces 6 total artifacts (3 apps x 2 arch): -# - breezyVulkan-libs-$ARCH.tar.gz -# - breezyGNOME-libs-$ARCH.tar.gz -# - breezyKWin-libs-$ARCH.tar.gz +# Produces 5 total artifacts: +# - breezyVulkan-libs-x86_64.tar.gz +# - breezyGNOME-libs-$ARCH.tar.gz (x86_64 + aarch64) +# - breezyKWin-libs-$ARCH.tar.gz (x86_64 + aarch64) # # For now, each of these contains ONLY the XR driver libs archive: # xrDriver-libs-$ARCH.tar.gz ARCHITECTURES=("x86_64" "aarch64") +VULKAN_ARCHITECTURES=("x86_64") APPS=("breezyVulkan" "breezyGNOME" "breezyKWin") # https://stackoverflow.com/a/246128 SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) ROOT_DIR=$(realpath "$SCRIPT_DIR/..") XR_DRIVER_DIR="$ROOT_DIR/modules/XRLinuxDriver" +VULKAN_DIR="$ROOT_DIR/vulkan" +VKBASALT_MODULE_DIR="$VULKAN_DIR/modules/vkBasalt" +VKBASALT_BUILD_DIR="$VKBASALT_MODULE_DIR/out" echo "Building XR Driver libs packages" pushd "$XR_DRIVER_DIR" > /dev/null ./bin/package_libs popd > /dev/null +echo "Building vkBasalt build artifacts" +if [ ! -d "$VKBASALT_BUILD_DIR" ] || [ "${1:-}" == "--rebuild-vkbasalt" ]; then + pushd "$VKBASALT_MODULE_DIR" > /dev/null + ./docker-build + popd > /dev/null +fi + echo "Building Breezy libs packages for all architectures" BUILD_PATH="$ROOT_DIR/build" @@ -33,14 +44,26 @@ mkdir -p "$BUILD_PATH" pushd "$BUILD_PATH" > /dev/null -for ARCH in "${ARCHITECTURES[@]}"; do - XR_LIB_ARCHIVE="$XR_DRIVER_DIR/out/xrDriver-libs-$ARCH.tar.gz" +for APP in "${APPS[@]}"; do + ARCHES=("${ARCHITECTURES[@]}") + if [ "$APP" == "breezyVulkan" ]; then + ARCHES=("${VULKAN_ARCHITECTURES[@]}") + fi + + for ARCH in "${ARCHES[@]}"; do + XR_LIB_ARCHIVE="$XR_DRIVER_DIR/out/xrDriver-libs-$ARCH.tar.gz" - for APP in "${APPS[@]}"; do PACKAGE_LIB_DIR=breezy_desktop_lib rm -rf "$PACKAGE_LIB_DIR" mkdir -p "$PACKAGE_LIB_DIR" - cp "$XR_LIB_ARCHIVE" ""$PACKAGE_LIB_DIR"" + cp "$XR_LIB_ARCHIVE" "$PACKAGE_LIB_DIR/" + + if [ "$APP" == "breezyVulkan" ]; then + mkdir -p "$PACKAGE_LIB_DIR"/{vkBasalt.64,vkBasalt.32} + cp "$VKBASALT_BUILD_DIR/builddir/src/libvkbasalt.so" "$PACKAGE_LIB_DIR/vkBasalt.64/" + cp "$VKBASALT_BUILD_DIR/builddir/config/vkBasalt.json" "$PACKAGE_LIB_DIR/vkBasalt.64/" + cp "$VKBASALT_BUILD_DIR/builddir.32/src/libvkbasalt.so" "$PACKAGE_LIB_DIR/vkBasalt.32/" + fi LIB_ARTIFACT_NAME="$APP-libs-$ARCH.tar.gz" tar -zcvf "$LIB_ARTIFACT_NAME" "$PACKAGE_LIB_DIR" > /dev/null diff --git a/bin/package_vulkan b/bin/package_vulkan index c2f2e4f..d3f19a8 100755 --- a/bin/package_vulkan +++ b/bin/package_vulkan @@ -26,21 +26,6 @@ else fi BUILD_FILE_NAME=breezyVulkan-$ARCH.tar.gz -# build vkBasalt -VKBASALT_MODULE_DIR=$VULKAN_MODULES/vkBasalt -VKBASALT_BUILD_DIR=$VKBASALT_MODULE_DIR/out -if [ ! -d "$VKBASALT_BUILD_DIR" ] || [ "$1" == "--rebuild-vkbasalt" ]; then - pushd $VKBASALT_MODULE_DIR - ./docker-build - popd -fi - -# copy vkBasalt binaries and configs -mkdir -p $PACKAGE_DIR/{vkBasalt.64,vkBasalt.32} -cp $VKBASALT_BUILD_DIR/builddir/src/libvkbasalt.so $PACKAGE_DIR/vkBasalt.64/ -cp $VKBASALT_BUILD_DIR/builddir/config/vkBasalt.json $PACKAGE_DIR/vkBasalt.64/ -cp $VKBASALT_BUILD_DIR/builddir.32/src/libvkbasalt.so $PACKAGE_DIR/vkBasalt.32/ - # copy Sombrero shader, get ReShade headers cp modules/sombrero/*.frag $PACKAGE_DIR cp modules/sombrero/*.png $PACKAGE_DIR @@ -94,7 +79,7 @@ cp $XR_DRIVER_DIR/bin/xr_driver_setup $PACKAGE_DIR/bin # include any file that doesn't get modified during setup (e.g. vkBasalt.json files) pushd $PACKAGE_DIR echo $XR_DRIVER_MANIFEST_LINE > manifest -sha256sum bin/breezy_vulkan_uninstall vkBasalt.64/libvkbasalt.so vkBasalt.32/libvkbasalt.so *.frag *.fx* *.png >> manifest +sha256sum bin/breezy_vulkan_uninstall *.frag *.fx* *.png >> manifest popd # bundle everything up