From 1bfd37a013a6b154308929c763988bb73136d340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Cereto=20Massagu=C3=A9?= <ssorgatem@gmail.com>
Date: Wed, 14 Mar 2018 20:38:38 +0100
Subject: [PATCH] Some changes to the packaging script (#162)

* enable unity build for releases

* let the packaging script work wth relative paths

* add build option to enable building the test binaries; disabled by default

* disable unity build until it's been more tested
---
 meson.build        | 8 +++++++-
 meson_options.txt  | 1 +
 package-release.sh | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 meson_options.txt

diff --git a/meson.build b/meson.build
index 9557e516..6a1dc5a0 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,13 @@ glsl_generator = generator(glsl_compiler,
   arguments : [ '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@' ])
 
 subdir('src')
-if dxvk_compiler.get_id() != 'msvc'
+
+enable_tests = get_option('enable_tests')
+
+if enable_tests
   subdir('tests')
+endif
+
+if dxvk_compiler.get_id() != 'msvc'
   subdir('wine_utils')
 endif
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 00000000..6e0f05b5
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1 @@
+option('enable_tests', type : 'boolean', value : false)
diff --git a/package-release.sh b/package-release.sh
index bbb70eb9..6a471094 100755
--- a/package-release.sh
+++ b/package-release.sh
@@ -8,7 +8,7 @@ fi
 DXVK_VERSION="$1"
 DXVK_SRC_DIR=`dirname $(readlink -f $0)`
 DXVK_TMP_DIR="/tmp/dxvk-$DXVK_VERSION"
-DXVK_ARCHIVE_PATH="$2/dxvk-$DXVK_VERSION.tar.gz"
+DXVK_ARCHIVE_PATH=$(realpath "$2")"/dxvk-$DXVK_VERSION.tar.gz"
 
 function build_arch {
   cd "$DXVK_SRC_DIR"
@@ -16,7 +16,9 @@ function build_arch {
   meson --cross-file "$DXVK_SRC_DIR/build-win$1.txt"  \
         --buildtype "release"                         \
         --prefix "$DXVK_TMP_DIR/install.$1"           \
+	--unity off                                   \
         --strip                                       \
+        -Denable_tests=false                          \
         "$DXVK_TMP_DIR/build.$1"
 
   cd "$DXVK_TMP_DIR/build.$1"
@@ -40,4 +42,4 @@ function package {
 
 build_arch 64
 build_arch 32
-package
\ No newline at end of file
+package