From edd13929c03d94e960a5cbae95952277242ae4c1 Mon Sep 17 00:00:00 2001 From: sappharad Date: Mon, 23 Feb 2015 04:40:07 +0000 Subject: [PATCH] - Modify the installer to include a bootstrap wrapper which installs .NET for you if you don't have it. Note that I just gave you a working project, the list of files it installs hasn't been updated since 2013 and I haven't customized the installer at all so it's just the defaults with Lorem Ipsum for a license agreement. --- BizHawk.Installer/BizHawk.Installer.sln | 26 ++ BizHawk.Installer/BizHawk.Installer.suo | Bin 0 -> 13312 bytes BizHawk.Installer/BizHawkFiles.wxs | 454 ++++++++++++------------ BizHawk.Installer/BizHawkInstall.wxs | 18 +- BizHawk.Installer/Bootstrap.wixproj | 55 +++ BizHawk.Installer/Bootstrap.wxs | 10 + 6 files changed, 327 insertions(+), 236 deletions(-) create mode 100644 BizHawk.Installer/BizHawk.Installer.sln create mode 100644 BizHawk.Installer/BizHawk.Installer.suo create mode 100644 BizHawk.Installer/Bootstrap.wixproj create mode 100644 BizHawk.Installer/Bootstrap.wxs diff --git a/BizHawk.Installer/BizHawk.Installer.sln b/BizHawk.Installer/BizHawk.Installer.sln new file mode 100644 index 0000000000..8bce7720d5 --- /dev/null +++ b/BizHawk.Installer/BizHawk.Installer.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BizHawk.Installer", "BizHawk.Installer.wixproj", "{A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Bootstrap", "Bootstrap.wixproj", "{7A25308C-44B8-4897-9150-DF2C77F85094}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Debug|x86.ActiveCfg = Debug|x86 + {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Debug|x86.Build.0 = Debug|x86 + {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Release|x86.ActiveCfg = Release|x86 + {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Release|x86.Build.0 = Release|x86 + {7A25308C-44B8-4897-9150-DF2C77F85094}.Debug|x86.ActiveCfg = Debug|x86 + {7A25308C-44B8-4897-9150-DF2C77F85094}.Debug|x86.Build.0 = Debug|x86 + {7A25308C-44B8-4897-9150-DF2C77F85094}.Release|x86.ActiveCfg = Release|x86 + {7A25308C-44B8-4897-9150-DF2C77F85094}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/BizHawk.Installer/BizHawk.Installer.suo b/BizHawk.Installer/BizHawk.Installer.suo new file mode 100644 index 0000000000000000000000000000000000000000..0f4ae29e94f55c1e300d9128da202c56a2d54536 GIT binary patch literal 13312 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 literal 0 HcmV?d00001 diff --git a/BizHawk.Installer/BizHawkFiles.wxs b/BizHawk.Installer/BizHawkFiles.wxs index 03589e4b02..636fd7c760 100644 --- a/BizHawk.Installer/BizHawkFiles.wxs +++ b/BizHawk.Installer/BizHawkFiles.wxs @@ -12,7 +12,7 @@ - + @@ -22,660 +22,660 @@ - + - - + + + - - + + - - - - - + + - + - + - + - + - + - + - + - - - - + + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + - + - + - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/BizHawk.Installer/BizHawkInstall.wxs b/BizHawk.Installer/BizHawkInstall.wxs index 2f0b437c50..553ccb7056 100644 --- a/BizHawk.Installer/BizHawkInstall.wxs +++ b/BizHawk.Installer/BizHawkInstall.wxs @@ -11,10 +11,10 @@ - - + + - + @@ -23,13 +23,13 @@ - + - - + @@ -43,11 +43,11 @@ - + - + @@ -58,7 +58,7 @@ - + diff --git a/BizHawk.Installer/Bootstrap.wixproj b/BizHawk.Installer/Bootstrap.wixproj new file mode 100644 index 0000000000..9db0b1f011 --- /dev/null +++ b/BizHawk.Installer/Bootstrap.wixproj @@ -0,0 +1,55 @@ + + + + Debug + x86 + 3.9 + {7a25308c-44b8-4897-9150-df2c77f85094} + 2.0 + Bizhawk.Install + Bundle + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + $(WixExtDir)\WixBalExtension.dll + WixBalExtension + + + $(WixExtDir)\WixNetFxExtension.dll + WixNetFxExtension + + + + + BizHawk.Installer + {a1a56bc8-8199-4c8d-b5c9-76401d3a0a70} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + \ No newline at end of file diff --git a/BizHawk.Installer/Bootstrap.wxs b/BizHawk.Installer/Bootstrap.wxs new file mode 100644 index 0000000000..5d47de7c3f --- /dev/null +++ b/BizHawk.Installer/Bootstrap.wxs @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file