diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-23 16:50:49 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-23 16:50:49 (GMT) |
| commit | d28a8a994bbd41d4f0fa3f4b69508b06e7e96d06 (patch) | |
| tree | 0798846d220f020042e949a559138423b4eea0e4 /Tools/msi/wix.props | |
| parent | de6e800f45b292c6290359ddbe9f079de3e08663 (diff) | |
| download | cpython-d28a8a994bbd41d4f0fa3f4b69508b06e7e96d06.zip cpython-d28a8a994bbd41d4f0fa3f4b69508b06e7e96d06.tar.gz cpython-d28a8a994bbd41d4f0fa3f4b69508b06e7e96d06.tar.bz2 | |
Moves Windows installer externals onto SVN and updates the build process to grab them automatically.
Diffstat (limited to 'Tools/msi/wix.props')
| -rw-r--r-- | Tools/msi/wix.props | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/msi/wix.props b/Tools/msi/wix.props index 35492f9..fbb2d10 100644 --- a/Tools/msi/wix.props +++ b/Tools/msi/wix.props @@ -4,9 +4,9 @@ <PropertyGroup> <WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(MSBuildThisFileDirectory)\Wix')">$(MSBuildThisFileDirectory)\Wix\</WixInstallPath> - <WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(ExternalsDir)\Wix')">$(ExternalsDir)\Wix\</WixInstallPath> - <WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.9@InstallRoot)</WixInstallPath> - <WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.9@InstallRoot)</WixInstallPath> + <WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(ExternalsDir)\windows-installer\wix')">$(ExternalsDir)\windows-installer\wix\</WixInstallPath> + <WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath> + <WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath> <WixTargetsPath>$(WixInstallPath)\Wix.targets</WixTargetsPath> </PropertyGroup> </Project>
\ No newline at end of file |