diff options
author | Ernie Hershey <ernie.hershey@10gen.com> | 2014-02-26 17:54:27 -0500 |
---|---|---|
committer | Ernie Hershey <ernie.hershey@10gen.com> | 2014-02-26 17:54:27 -0500 |
commit | 56e74d27c1a50ff945266e63a34643610fa3c46c (patch) | |
tree | e4f5cfc252ec0223436584bd73aab5236a4a6d8c | |
parent | d908a87df9f601cec7be3d34abd00f258679ff44 (diff) | |
download | mongo-56e74d27c1a50ff945266e63a34643610fa3c46c.tar.gz |
SERVER-12030 Have MSI put SNMP docs in snmp directory
-rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 9 | ||||
-rw-r--r-- | src/mongo/installer/msi/wxs/Installer_64.wxs | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index f47bb25273c..3d4d8fcb504 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -87,6 +87,14 @@ <File Id="f_snmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb" DiskId="1" KeyPath="yes" /> </Component> + <?endif ?> + </DirectoryRef> + <DirectoryRef Id="SNMP"> + <?if $(var.Edition) = Enterprise ?> + <Component Id="c_snmpReadme" Guid="B968FBAC-1813-4039-9FED-A607A0E4CBB3"> + <File Id="f_snmpReadme" Name="README-snmp.txt" Source="$(var.EnterpriseBase)\docs\README-snmp.txt" + DiskId="1" KeyPath="yes" /> + </Component> <Component Id="c_snmpConfMaster" Guid="0C8CAA6C-1473-4B14-9EE5-AF5A35B1DD8D"> <File Id="f_snmpConfMaster" Name="mongod.conf.master" Source="$(var.EnterpriseBase)\docs\mongod.conf.master" DiskId="1" KeyPath="yes" /> @@ -124,6 +132,7 @@ <ComponentGroupRef Id="cg_EnterpriseBase" /> <ComponentRef Id="c_snmp" /> <ComponentRef Id="c_snmpPdb" /> + <ComponentRef Id="c_snmpReadme" /> <ComponentRef Id="c_snmpConfMaster" /> <ComponentRef Id="c_snmpConfSubagent" /> <ComponentRef Id="c_snmpMongodMib" /> diff --git a/src/mongo/installer/msi/wxs/Installer_64.wxs b/src/mongo/installer/msi/wxs/Installer_64.wxs index 0dea590afdd..1b5f48b9d16 100644 --- a/src/mongo/installer/msi/wxs/Installer_64.wxs +++ b/src/mongo/installer/msi/wxs/Installer_64.wxs @@ -32,6 +32,7 @@ <Directory Id="ProgramFiles64Folder"> <Directory Id="INSTALLLOCATION" Name="!(wix.InstallFolder)"> <Directory Id="BIN" Name="bin" /> + <Directory Id="SNMP" Name="snmp" /> </Directory> </Directory> </Directory> |