From 873deed4a31c884f1d54420f0b42a2c0d3dc4be0 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Tue, 27 Mar 2018 18:45:05 +0200
Subject: [PATCH] [general] Added --no-package option to package script

---
 package-release.sh | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/package-release.sh b/package-release.sh
index 6a471094..41179143 100755
--- a/package-release.sh
+++ b/package-release.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 if [ -z "$1" ] || [ -z "$2" ]; then
-  echo "Usage: package-release.sh version destdir"
+  echo "Usage: package-release.sh version destdir [--no-package]"
   exit 1
 fi
 
 DXVK_VERSION="$1"
 DXVK_SRC_DIR=`dirname $(readlink -f $0)`
-DXVK_TMP_DIR="/tmp/dxvk-$DXVK_VERSION"
+DXVK_BUILD_DIR=$(realpath "$2")"/dxvk-$DXVK_VERSION"
 DXVK_ARCHIVE_PATH=$(realpath "$2")"/dxvk-$DXVK_VERSION.tar.gz"
 
 function build_arch {
@@ -15,31 +15,34 @@ function build_arch {
 
   meson --cross-file "$DXVK_SRC_DIR/build-win$1.txt"  \
         --buildtype "release"                         \
-        --prefix "$DXVK_TMP_DIR/install.$1"           \
-	--unity off                                   \
+        --prefix "$DXVK_BUILD_DIR/install.$1"         \
+        --unity off                                   \
         --strip                                       \
         -Denable_tests=false                          \
-        "$DXVK_TMP_DIR/build.$1"
+        "$DXVK_BUILD_DIR/build.$1"
 
-  cd "$DXVK_TMP_DIR/build.$1"
+  cd "$DXVK_BUILD_DIR/build.$1"
   ninja install
 
-  mkdir "$DXVK_TMP_DIR/x$1"
+  mkdir "$DXVK_BUILD_DIR/x$1"
 
-  cp "$DXVK_TMP_DIR/install.$1/bin/d3d11.dll" "$DXVK_TMP_DIR/x$1/d3d11.dll"
-  cp "$DXVK_TMP_DIR/install.$1/bin/dxgi.dll" "$DXVK_TMP_DIR/x$1/dxgi.dll"
-  cp "$DXVK_TMP_DIR/install.$1/bin/setup_dxvk.sh" "$DXVK_TMP_DIR/x$1/setup_dxvk.sh"
-  
-  rm -R "$DXVK_TMP_DIR/build.$1"
-  rm -R "$DXVK_TMP_DIR/install.$1"
+  cp "$DXVK_BUILD_DIR/install.$1/bin/d3d11.dll" "$DXVK_BUILD_DIR/x$1/d3d11.dll"
+  cp "$DXVK_BUILD_DIR/install.$1/bin/dxgi.dll" "$DXVK_BUILD_DIR/x$1/dxgi.dll"
+  cp "$DXVK_BUILD_DIR/install.$1/bin/setup_dxvk.sh" "$DXVK_BUILD_DIR/x$1/setup_dxvk.sh"
+
+  rm -R "$DXVK_BUILD_DIR/build.$1"
+  rm -R "$DXVK_BUILD_DIR/install.$1"
 }
 
 function package {
-  cd "$DXVK_TMP_DIR/.."
+  cd "$DXVK_BUILD_DIR/.."
   tar -czf "$DXVK_ARCHIVE_PATH" "dxvk-$DXVK_VERSION"
   rm -R "dxvk-$DXVK_VERSION"
 }
 
 build_arch 64
 build_arch 32
-package
+
+if [ "$3" != "--no-package" ]; then
+  package
+fi
\ No newline at end of file