- Fix custom deploy scripts

Author: hbirchtree

.build.yml

@@ -60,7 +60,7 @@ platforms:
 script_location: toolchain/ci
 template_location: toolchain/cmake/Templates
 version:
-  hotfix: 22
+  hotfix: 23
   major: 0
   minor: 3
   patch: 0

cb

@@ -73,47 +73,45 @@ case $1 in
         ${CONTAINER} /build/src/cb ci-build ${@:2}
 ;;
 "compress-usr-dir")
-    OUTPUT=$(realpath .)/${2}_${BUILDVARIANT}.tar.bz2
     INSTALL_DIR=$(realpath .)/build/install
 
-    echo "-- Creating $OUTPUT from $INSTALL_DIR"
-
-    echo "-- Current directory: $(pwd)"
+    if [ -f "${BASE_DIR}/deploy-script.sh" ]; then
+        echo "-- Using customized deploy script"
+        source ${BASE_DIR}/deploy-script.sh
+    else
+        OUTPUT=$(realpath .)/${2}_${BUILDVARIANT}.tar.bz2
+        echo "-- Creating $OUTPUT from $INSTALL_DIR"
 
-    echo "-- Source dir: ${BASE_DIR}"
-    ls ${BASE_DIR}
-    echo "-- Build dir: $(realpath .)/build"
-    ls $(realpath .)/build
-    echo "-- Install dir: ${INSTALL_DIR}"
-    ls ${INSTALL_DIR}
+        echo "-- Current directory: $(pwd)"
 
-    #echo "-- Install dir contents:"
-    #ls -R ${INSTALL_DIR}
-    #echo "-- Build dir contents:"
-    #ls ${INSTALL_DIR}
-    #echo "-- Root dir contents:"
-    #ls -R $(realpath .)
+        echo "-- Source dir: ${BASE_DIR}"
+        ls ${BASE_DIR}
+        echo "-- Build dir: $(realpath .)/build"
+        ls $(realpath .)/build
+        echo "-- Install dir: ${INSTALL_DIR}"
+        ls ${INSTALL_DIR}
 
-    pushd ${INSTALL_DIR}
-    case $2 in
-    "bin")
-        tar vcf ${OUTPUT} \
-            --exclude=${INSTALL_DIR}/include \
-            --exclude=${INSTALL_DIR}/lib \
-            --exclude=${INSTALL_DIR}/share \
-            ${INSTALL_DIR}
-    ;;
-    "libraries")
-        tar vcf ${OUTPUT} \
-            --exclude=${INSTALL_DIR}/bin \
-            --exclude=${INSTALL_DIR}/packaged \
-            ${INSTALL_DIR}
-    ;;
-    *)
-        echo "-- Unhandled case $2"
-    ;;
-    esac
-    popd
+        pushd ${INSTALL_DIR}
+        case $2 in
+        "bin")
+            tar cvf ${OUTPUT} \
+                --exclude=${INSTALL_DIR}/include \
+                --exclude=${INSTALL_DIR}/lib \
+                --exclude=${INSTALL_DIR}/share \
+                ${INSTALL_DIR}
+        ;;
+        "libraries")
+            tar cvf ${OUTPUT} \
+                --exclude=${INSTALL_DIR}/bin \
+                --exclude=${INSTALL_DIR}/packaged \
+                ${INSTALL_DIR}
+        ;;
+        *)
+            echo "-- Unhandled case $2"
+        ;;
+        esac
+        popd
+    fi
 ;;
 "push-asset")
     TAG_NAME=$(github_api list tag "$TRAVIS_REPO_SLUG" "^$TRAVIS_COMMIT$" | cut -d'|' -f 2)

deploy-script.sh

@@ -1,17 +1,15 @@
 ASSETS=(openal bullet assimp squish glslang shaderc spirvcross sdl2 openssl ffmpeg compressonator zlib lz4 zstd discord-rpc)
 
-INSTALL_BASE_DIR=$BUILD_DIR/$BUILDVARIANT/install
-
 for a in ${ASSETS[@]}; do
-    ASSET="${PWD}/${a}_${BUILDVARIANT}.tar.gz"
+    ASSET="${PWD}/${a}_${BUILDVARIANT}.tar.bz2"
 
-    if [[ ! -d "$INSTALL_BASE_DIR/$a" ]]; then
+    if [[ ! -d "$INSTALL_DIR/$a" ]]; then
         continue
     fi
 
-    pushd $INSTALL_BASE_DIR/$a
-    tar -zcvf "$ASSET" *
-    popd
+    echo "-- Packaging ${a} => ${ASSET}"
 
-    deploy_asset "$(basename ${ASSET})" ${TARGET_SLUG}
+    pushd $INSTALL_DIR/$a
+    tar -cvf "$ASSET" *
+    popd
 done