From e197dd3fbe3c3d53b46dd2c6bdcd18aed3be6d88 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 28 Nov 2016 12:21:28 +0100 Subject: [PATCH] Move installer files under scripts/ folder --- scripts/dist.sh | 8 ++++---- {installer => scripts/installer}/Installer32.wxs | 0 {installer => scripts/installer}/Installer64.wxs | 0 {installer => scripts/installer}/LICENSE.rtf | Bin {installer => scripts/installer}/bannrbmp.bmp | Bin {installer => scripts/installer}/chm.ico | Bin {installer => scripts/installer}/customtext.wxl | 0 {installer => scripts/installer}/dlgbmp.bmp | Bin 8 files changed, 4 insertions(+), 4 deletions(-) rename {installer => scripts/installer}/Installer32.wxs (100%) rename {installer => scripts/installer}/Installer64.wxs (100%) rename {installer => scripts/installer}/LICENSE.rtf (100%) rename {installer => scripts/installer}/bannrbmp.bmp (100%) rename {installer => scripts/installer}/chm.ico (100%) rename {installer => scripts/installer}/customtext.wxl (100%) rename {installer => scripts/installer}/dlgbmp.bmp (100%) diff --git a/scripts/dist.sh b/scripts/dist.sh index ed1dfa218..6abe08163 100644 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -107,10 +107,10 @@ VERSION=`grep -E "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/api/replay/ export RENDERDOC_VERSION="${VERSION}.0" -"$WIX/bin/candle.exe" -o dist/Installer32.wixobj installer/Installer32.wxs -"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc installer/customtext.wxl -o dist/Installer32.msi dist/Installer32.wixobj +"$WIX/bin/candle.exe" -o dist/Installer32.wixobj scripts/installer/Installer32.wxs +"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc scripts/installer/customtext.wxl -o dist/Installer32.msi dist/Installer32.wixobj -"$WIX/bin/candle.exe" -o dist/Installer64.wixobj installer/Installer64.wxs -"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc installer/customtext.wxl -o dist/Installer64.msi dist/Installer64.wixobj +"$WIX/bin/candle.exe" -o dist/Installer64.wixobj scripts/installer/Installer64.wxs +"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc scripts/installer/customtext.wxl -o dist/Installer64.msi dist/Installer64.wixobj rm dist/*.wixobj dist/*.wixpdb diff --git a/installer/Installer32.wxs b/scripts/installer/Installer32.wxs similarity index 100% rename from installer/Installer32.wxs rename to scripts/installer/Installer32.wxs diff --git a/installer/Installer64.wxs b/scripts/installer/Installer64.wxs similarity index 100% rename from installer/Installer64.wxs rename to scripts/installer/Installer64.wxs diff --git a/installer/LICENSE.rtf b/scripts/installer/LICENSE.rtf similarity index 100% rename from installer/LICENSE.rtf rename to scripts/installer/LICENSE.rtf diff --git a/installer/bannrbmp.bmp b/scripts/installer/bannrbmp.bmp similarity index 100% rename from installer/bannrbmp.bmp rename to scripts/installer/bannrbmp.bmp diff --git a/installer/chm.ico b/scripts/installer/chm.ico similarity index 100% rename from installer/chm.ico rename to scripts/installer/chm.ico diff --git a/installer/customtext.wxl b/scripts/installer/customtext.wxl similarity index 100% rename from installer/customtext.wxl rename to scripts/installer/customtext.wxl diff --git a/installer/dlgbmp.bmp b/scripts/installer/dlgbmp.bmp similarity index 100% rename from installer/dlgbmp.bmp rename to scripts/installer/dlgbmp.bmp