From 8006d984aa6d81fdbcfaa00aafba624f92bd0429 Mon Sep 17 00:00:00 2001 From: sappharad Date: Sun, 18 Aug 2013 05:53:27 +0000 Subject: [PATCH] Installer improvements: - Broke file definitions off into their own wxs file, so the main script just defines the installer "features" and UI windows for clarity. - Broke the install features up a bit, there are separate entries for the emulator, DiscoHawk, GBC Palettes, and Lua scripts. We don't expose the installer UI options for users to pick what they want, this is mostly for organization. - Added start menu entry for DiscoHawk. - Added commented out code to detect VS2010 SP1 runtime as a requirement for install. This is commented out because the current check only looks for a specific version of the runtime, meaning if someone has a better one that is compatible, they'll still get the error. Need a better way to do this. --- BizHawk.Installer/BizHawk.Installer.wixproj | 1 + BizHawk.Installer/BizHawkFiles.wxs | 692 +++++++++++++ BizHawk.Installer/BizHawkInstall.wxs | 1004 +++---------------- 3 files changed, 860 insertions(+), 837 deletions(-) create mode 100644 BizHawk.Installer/BizHawkFiles.wxs diff --git a/BizHawk.Installer/BizHawk.Installer.wixproj b/BizHawk.Installer/BizHawk.Installer.wixproj index d5f347485f..6f566c94a4 100644 --- a/BizHawk.Installer/BizHawk.Installer.wixproj +++ b/BizHawk.Installer/BizHawk.Installer.wixproj @@ -21,6 +21,7 @@ obj\$(Configuration)\ + diff --git a/BizHawk.Installer/BizHawkFiles.wxs b/BizHawk.Installer/BizHawkFiles.wxs new file mode 100644 index 0000000000..54c5e448cd --- /dev/null +++ b/BizHawk.Installer/BizHawkFiles.wxs @@ -0,0 +1,692 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BizHawk.Installer/BizHawkInstall.wxs b/BizHawk.Installer/BizHawkInstall.wxs index b47575859d..ef0553db74 100644 --- a/BizHawk.Installer/BizHawkInstall.wxs +++ b/BizHawk.Installer/BizHawkInstall.wxs @@ -3,694 +3,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - @@ -728,125 +47,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -864,36 +64,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -903,6 +73,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -959,10 +285,14 @@ + Installed OR NETFRAMEWORK40FULL - - + + + \ No newline at end of file