diff options
| author | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-09-23 22:16:55 -0700 |
|---|---|---|
| committer | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-09-24 11:38:28 -0700 |
| commit | ddb216a374b3daf5c2ee438803c6bf2ff7290fe4 (patch) | |
| tree | 31e48661bb1082dfd99d0780511638ce6f4773d6 /buildscripts | |
| parent | ff60a1debd72cda29197871d1c19f536fb434eac (diff) | |
| download | mongo-ddb216a374b3daf5c2ee438803c6bf2ff7290fe4.tar.gz | |
SERVER-10730 - Allow user specified install directory
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/packaging/msi/wxs/FeatureFragment.wxs | 3 | ||||
| -rwxr-xr-x | buildscripts/packaging/msi/wxs/Installer.wxs | 4 | ||||
| -rwxr-xr-x | buildscripts/packaging/msi/wxs/Installer_64.wxs | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/buildscripts/packaging/msi/wxs/FeatureFragment.wxs b/buildscripts/packaging/msi/wxs/FeatureFragment.wxs index 3ff6d19f40a..a4725ea27f2 100755 --- a/buildscripts/packaging/msi/wxs/FeatureFragment.wxs +++ b/buildscripts/packaging/msi/wxs/FeatureFragment.wxs @@ -5,7 +5,8 @@ <Feature Id="ProductFeature"
Title="!(wix.ProductName)"
Description="!(wix.ProductName)"
- Level="1">
+ Level="1"
+ ConfigurableDirectory="INSTALLLOCATION">
<ComponentGroupRef Id="cg_License" />
<Feature Id="Server"
Title ="Server"
diff --git a/buildscripts/packaging/msi/wxs/Installer.wxs b/buildscripts/packaging/msi/wxs/Installer.wxs index 82bfa05f654..d70f257264e 100755 --- a/buildscripts/packaging/msi/wxs/Installer.wxs +++ b/buildscripts/packaging/msi/wxs/Installer.wxs @@ -24,9 +24,9 @@ <WixVariable Id="WixUIBannerBmp" Value="Banner.bmp" />
<WixVariable Id="WixUIInfoIco" Value="Installer_Icon_32x32.ico" />
<WixVariable Id="WixUIExclamationIco" Value="Installer_Icon_32x32.ico" />
+ <!--
<WixVariable Id="WixUINewIco" Value="Installer_Icon_16x16.ico" />
<WixVariable Id="WixUIUpIco" Value="Installer_Icon_16x16.ico" />
- <!--
More information can be found at http://wix.tramontana.co.hu/tutorial/user-interface/ui-wizardry
-->
@@ -34,6 +34,6 @@ <UIRef Id="WixUI_Mondo" />
<UIRef Id="WixUI_ErrorProgressText" />
- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
</Product>
</Wix>
diff --git a/buildscripts/packaging/msi/wxs/Installer_64.wxs b/buildscripts/packaging/msi/wxs/Installer_64.wxs index d6a53f344e5..754c73a8f72 100755 --- a/buildscripts/packaging/msi/wxs/Installer_64.wxs +++ b/buildscripts/packaging/msi/wxs/Installer_64.wxs @@ -37,9 +37,9 @@ <WixVariable Id="WixUIBannerBmp" Value="Banner.bmp" />
<WixVariable Id="WixUIInfoIco" Value="Installer_Icon_32x32.ico" />
<WixVariable Id="WixUIExclamationIco" Value="Installer_Icon_32x32.ico" />
+ <!--
<WixVariable Id="WixUINewIco" Value="Installer_Icon_16x16.ico" />
<WixVariable Id="WixUIUpIco" Value="Installer_Icon_16x16.ico" />
- <!--
More information can be found at http://wix.tramontana.co.hu/tutorial/user-interface/ui-wizardry
-->
@@ -47,6 +47,6 @@ <UIRef Id="WixUI_Mondo" />
<UIRef Id="WixUI_ErrorProgressText" />
- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
</Product>
</Wix>
|