From adb3bb8cc6bdd7f8261e5df2b0096f3f4ef5ebd5 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 18 Aug 2018 23:24:52 +0100 Subject: [PATCH] Ensure RENDERDOC_VERSION env var passed to WiX on Windows 10 WSL --- util/buildscripts/scripts/make_package_win32.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/buildscripts/scripts/make_package_win32.sh b/util/buildscripts/scripts/make_package_win32.sh index 8c4fea2a3..20fe43f86 100755 --- a/util/buildscripts/scripts/make_package_win32.sh +++ b/util/buildscripts/scripts/make_package_win32.sh @@ -112,6 +112,9 @@ VERSION=`grep -E "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/api/replay/ export RENDERDOC_VERSION="${VERSION}" +# Ensure this variable passes through to windows on WSL +export WSLENV=$WSLENV:RENDERDOC_VERSION + "$WIX/bin/candle.exe" -o dist/Installer32.wixobj util/installer/Installer32.wxs "$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc util/installer/customtext.wxl -o dist/Installer32.msi dist/Installer32.wixobj