Changeset da1c7e1 in nscp for helpers


Ignore:
Timestamp:
07/02/08 07:14:22 (5 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2, stable
Children:
846bbe4
Parents:
34e7428
Message:

rollup for 0.3.3

File:
1 edited

Legend:

Unmodified
Added
Removed

  • helpers/installer/Product.wxs

    re1ef872 rda1c7e1  
    1515  <?if "$(var.PlatForm)" = "x64"?> 
    1616    <?define PlatForm.x64 ?> 
     17    <?define Product.GUID = "2D1374D5-8026-4e58-8F2E-6A3C40444769" ?> 
     18    <?define Package.GUID = "4E50A0E0-AE48-4737-A6A7-07F3A9F94C29" ?> 
     19    <?define Postfix.GUID = "DD5862EE637C" ?> 
    1720  <?else?> 
    18     <?define PlatForm.Win32 ?> 
     21    <?define Product.GUID = "BD153740-D13B-4432-8D39-EE8D2F100B0A" ?> 
     22    <?define Package.GUID = "93CF1821-AB09-4c77-AA15-DD5862EE637B" ?> 
     23    <?define Postfix.GUID = "DD5862EE637B" ?> 
     24  <?define PlatForm.Win32 ?> 
    1925  <?endif?> 
    2026   
    … …  
    2935  <?endif?> 
    3036 
    31   <Product Id="2D1374D5-8026-4e58-8F2E-6A3C40444769" Name="NSClient++ ($(var.PlatForm))" Language="1033" Version="0.3.1.0" Manufacturer="MySolutions NORDIC"> 
    32     <Package Id="93CF1821-AB09-4c77-AA15-DD5862EE637B" Description="A simple windows monitor agent for (amongst others) nagios." 
     37  <Product Id="$(var.Product.GUID)" Name="NSClient++ ($(var.PlatForm))" Language="1033" Version="0.3.1.0" Manufacturer="MySolutions NORDIC"> 
     38    <Package Id="$(var.Package.GUID)" Description="A simple windows monitor agent for (amongst others) nagios." 
    3339             Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes"/> 
    3440    <?ifdef var.PlatForm.Win32?> 
    35       <Condition Message="x64 bit version not supported on Win32 bit platform (get Win32 bit version instead)">NOT VersionNT64</Condition> 
     41      <Condition Message="x64 bit version not supported (by installer) on Win32 bit platform (get Win32 bit version instead)">NOT VersionNT64</Condition> 
    3642    <?else?> 
    37       <Condition Message="Win32 bit version not supported on x64 bit platform (get x64 bit version instead)">VersionNT64</Condition> 
     43      <Condition Message="Win32 bit version not supported (by installer) on x64 bit platform (get x64 bit version instead)">VersionNT64</Condition> 
    3844    <?endif?> 
    3945    <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high"> 
    … …  
    4248      <Directory Id="$(var.ProgramFiles)"> 
    4349        <Directory Id="INSTALLLOCATION" Name="NSClient" LongName="NSClient++"> 
    44             <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-B91D05D3CBE7" Win64="$(var.Win64)"> 
     50            <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    4551              <File Id="NSClientEXE" Name="nsclient.exe" LongName="nsclient++.exe" DiskId="1"  
    4652                    Source="$(var.Source)/nsclient++.exe" Vital="yes"> 
    … …  
    6167            </Component> 
    6268            <Directory Id="INSTALLLOCATION_MODS" Name="modules"> 
    63               <Component Id="NRPEListener" Guid="5A0246F8-5167-45db-B246-88F694C7CD7B" Win64="$(var.Win64)"> 
     69              <Component Id="NRPEListener" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    6470                <File Id="NRPEListenerDLL" Name="NRPELsnr.dll" LongName="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEListener.dll" Vital="no" /> 
    6571                <File Id="NRPEClientDLL" Name="NRPEClnt.dll" LongName="NRPEClient.dll" DiskId="1" Source="$(var.Source)/modules/NRPEClient.dll" Vital="no" /> 
    6672              </Component> 
    67               <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-A6CF832E2A69" Win64="$(var.Win64)"> 
     73              <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    6874                <File Id="NSCListenerDLL" Name="NSCLsnr.dll" LongName="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientListener.dll" Vital="no" /> 
    6975              </Component> 
    70               <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-E750EB112CAA" Win64="$(var.Win64)"> 
     76              <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    7177                <File Id="NSCAAgentDLL" Name="NSCAAgnt.dll" LongName="NSCAAgent.dll" DiskId="1" Source="$(var.Source)/modules/NSCAAgent.dll" Vital="no" /> 
    7278              </Component> 
    73               <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-5C36F3F3209B" Win64="$(var.Win64)"> 
     79              <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    7480                <File Id="ModCheckEventLog.dll" Name="EvntLg.dll" LongName="CheckEventLog.dll" DiskId="1" Source="$(var.Source)/modules/CheckEventLog.dll" Vital="no" /> 
    7581                <File Id="ModCheckExternalScripts.dll" Name="ExtScr.dll" LongName="CheckExternalScripts.dll" DiskId="1" Source="$(var.Source)/modules/CheckExternalScripts.dll" Vital="no" /> 
Note: See TracChangeset for help on using the changeset viewer.