Changeset c391984 in nscp for helpers/installers


Ignore:
Timestamp:
04/03/11 23:05:52 (2 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2
Children:
b7d17f8
Parents:
2d69ab6
Message:

0.4.x:

  • tweaks to the build environment to make the installer work
  • fixed Unicode issue
  • fixed performance data
  • improved so alias doesn't re-process the data so much
File:
1 edited

Legend:

Unmodified
Added
Removed

  • helpers/installers/installer/Product.wxs

    r2d69ab6 rc391984  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> 
    3   <!-- 
    4   <?define boost = "false" ?> 
    5    --> 
    6   <?ifdef var.boost ?> 
    7     <?define PlatForm = "$(var.arch)" ?> 
    8     <?define Mode = "Nightly" ?> 
    9     <?define SysTray.ConfigurationName = "BOOST BUILD" ?> 
    10   <?else?> 
    11     <?if "$(var.SysTray.ConfigurationName)" = "Debug|Win32"?> 
    12       <?define PlatForm = "Win32" ?> 
    13       <?define Mode = "Debug" ?> 
    14     <?elseif "$(var.SysTray.ConfigurationName)" = "Debug|x64"?> 
    15       <?define PlatForm = "x64" ?> 
    16       <?define Mode = "Debug" ?> 
    17     <?elseif "$(var.SysTray.ConfigurationName)" = "Nightly|Win32"?> 
    18       <?define PlatForm = "Win32" ?> 
    19       <?define Mode = "Nightly" ?> 
    20     <?elseif "$(var.SysTray.ConfigurationName)" = "Nightly|x64"?> 
    21       <?define PlatForm = "x64" ?> 
    22       <?define Mode = "Nightly" ?> 
    23     <?else?> 
    24       <?define PlatForm = "Unknown: plattform" ?> 
    25     <?endif?> 
    26   <?endif?> 
     3  <?define PlatForm = "$(var.arch)" ?> 
     4  <?define Mode = "Nightly" ?> 
     5  <?define SysTray.ConfigurationName = "BOOST BUILD" ?> 
    276 
    287  <?if "$(var.PlatForm)" = "x64"?> 
    … …  
    4625    <?define Source = "../../$(var.PlatForm)/$(var.Mode)/" ?> 
    4726  <?endif?> 
    48   <!-- 
    49   <?ifndef var.Helpers ?> 
    50     <?define Helpers = "../../$(var.PlatForm)/$(var.Mode)-helpers/" ?> 
    51   <?endif?> 
    52      --> 
    5327 
    5428  <?define Version.String = "$(var.Version.Major).$(var.Version.Minor).$(var.Version.Revision).$(var.Version.Build)" ?> 
    … …  
    10579              <!-- 
    10680              <File Id="NSClientINI" Name="NSC.ini" LongName="NSC.ini" DiskId="1" Source="$(var.Path.ini)/NSC.ini" Vital="yes"/> 
    107               <?ifdef var.boost ?> 
    108                 <File Id="Changelog" Name="change.log" LongName="changelog.txt" DiskId="1" Source="$(var.Source)/changelog.txt" Vital="no"/> 
    109               <?else?> 
    110                 <File Id="Changelog" Name="change.log" LongName="changelog.txt" DiskId="1" Source="$(var.Source)/changelog" Vital="no"/> 
    111               <?endif?> 
     81              --> 
     82              <File Id="Changelog" Name="change.log" LongName="changelog.txt" DiskId="1" Source="$(var.Source)/changelog" Vital="no"/> 
    11283              <File Id="Counters" Name="counters.def" LongName="counters.defs" DiskId="1" Source="$(var.Source)/counters.defs" Vital="no"/> 
    11384              <File Id="License" Name="license.txt" LongName="license.txt" DiskId="1" Source="$(var.Source)/license.txt" Vital="no"/> 
    114               --> 
     85               
    11586              <RemoveFile Id="LogFile1" Name="nsclient.log" On="uninstall" /> 
    11687              <RemoveFile Id="LogFile2" Name="nsc.log" On="uninstall" /> 
    … …  
    12192            <Component Id="ServiceRegistration" Guid="F6636DB0-A0B9-4dA2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)" /> 
    12293            <Component Id="Documentation" Guid="9B490E67-5472-4267-889C-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    123               <!-- 
    124               <File Id="doc.usage.nagios" Name="nagios.pdf" LongName="Nagios Usage Guide.pdf" DiskId="1" Source="$(var.Source)/Nagios Usage Guide.pdf" Vital="no" > 
     94              <File Id="doc.usage.nagios" Name="nagios.pdf" LongName="Nagios Usage Guide.pdf" DiskId="1" Source="$(var.Source)/docs/Nagios Usage Guide.pdf" Vital="no" > 
    12595                <Shortcut Id="Startmenu.doc.nagios" Directory="ProgramMenuDir" Name="nagios" 
    12696                          LongName="Nagios Usage Guide" WorkingDirectory="INSTALLDIR" Description="Nagios Usage Guide"/> 
    12797              </File> 
    128               <File Id="doc.reference" Name="nsclient.pdf" LongName="NSClient++ Reference Manual.pdf" DiskId="1" Source="$(var.Source)/NSClient++ Reference Manual.pdf" Vital="no" > 
     98              <File Id="doc.reference" Name="nsclient.pdf" LongName="NSClient++ Reference Manual.pdf" DiskId="1" Source="$(var.Source)/docs/NSClient++ Reference Manual.pdf" Vital="no" > 
    12999                <Shortcut Id="Startmenu.doc.ref" Directory="ProgramMenuDir" Name="refman" 
    130100                          LongName="NSClient++ Reference Manual" WorkingDirectory="INSTALLDIR" Description="NSClient++ Reference Manual"/> 
    131101              </File> 
    132               --> 
    133102            </Component> 
     103            <Directory Id="INSTALLLOCATION_SECURITY" Name="security"> 
     104              <Component Id="NRPEServerCert" Guid="5A0246F8-5167-45db-2E46-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
     105                <File Id="NRPECert" Name="nrpe_dh.pem" LongName="nrpe_dh_512.pem" DiskId="1" Source="$(var.Source)/security/nrpe_dh_512.pem" Vital="no"/> 
     106              </Component> 
     107            </Directory> 
    134108            <Directory Id="INSTALLLOCATION_MODS" Name="modules"> 
    135               <Component Id="NRPEListener" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    136                            <!-- 
    137                 <File Id="NRPEListenerDLL" Name="NRPELsnr.dll" LongName="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEListener.dll" Vital="no" /> 
     109              <Component Id="NRPEServer" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
     110                <File Id="NRPEListenerDLL" Name="NRPELsnr.dll" LongName="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEServer.dll" Vital="no" /> 
    138111                <File Id="NRPEClientDLL" Name="NRPEClnt.dll" LongName="NRPEClient.dll" DiskId="1" Source="$(var.Source)/modules/NRPEClient.dll" Vital="no" /> 
    139                             --> 
    140112              </Component> 
    141113              <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    142                            <!-- 
    143                 <File Id="NSCListenerDLL" Name="NSCLsnr.dll" LongName="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientListener.dll" Vital="no" /> 
    144                             --> 
     114                <File Id="NSCListenerDLL" Name="NSCLsnr.dll" LongName="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientServer.dll" Vital="no" /> 
    145115              </Component> 
    146116              <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    147                            <!-- 
    148117                <File Id="NSCAAgentDLL" Name="NSCAAgnt.dll" LongName="NSCAAgent.dll" DiskId="1" Source="$(var.Source)/modules/NSCAAgent.dll" Vital="no" /> 
    149                             --> 
     118                <File Id="SchedulerDLL" Name="Sched.dll" LongName="Scheduler.dll" DiskId="1" Source="$(var.Source)/modules/Scheduler.dll" Vital="no" /> 
    150119              </Component> 
    151120              <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    … …  
    160129                <File Id="ModFileLogger.dll" Name="Logger.dll" LongName="FileLogger.dll" DiskId="1" Source="$(var.Source)/modules/FileLogger.dll" Vital="no" /> 
    161130                <File Id="ModLUAScript.dll" Name="LUAScr.dll" LongName="LUAScript.dll" DiskId="1" Source="$(var.Source)/modules/LUAScript.dll" Vital="no" /> 
     131                <File Id="ModCheckNSCP.dll" Name="CNSCP.dll" LongName="CheckNSCP.dll" DiskId="1" Source="$(var.Source)/modules/CheckNSCP.dll" Vital="no" /> 
    162132                <!-- 
    163133                <File Id="ModRemoteConfiguration.dll" Name="RmtCfg.dll" LongName="RemoteConfiguration.dll" DiskId="1" Source="$(var.Source)/modules/RemoteConfiguration.dll" Vital="no" /> 
    … …  
    167137                <File Id="ModCheckTaskSched.dll" Name="TaskSch.dll" LongName="CheckTaskSched.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched.dll" Vital="no" /> 
    168138                <File Id="ModCheckTaskSched2.dll" Name="TaskSch2.dll" LongName="CheckTaskSched2.dll" DiskId="1" Source="$(var.Source)/modules/CheckTaskSched2.dll" Vital="no" /> 
    169                 <File Id="ModCheckNSCP.dll" Name="CNSCP.dll" LongName="CheckNSCP.dll" DiskId="1" Source="$(var.Source)/modules/CheckNSCP.dll" Vital="no" /> 
    170139              </Component> 
    171140            </Directory> 
    172141            <Directory Id="INSTALLLOCATION_SCRIPTS" Name="scripts"> 
    173142              <Component Id="Scripts" Guid="9B490E67-5472-4268-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    174           <!-- 
    175143                <File Id="script001" Name="c_60s.bat" LongName="check_60s.bat" DiskId="1" Source="$(var.Source)/scripts/check_60s.bat" Vital="no" /> 
    176144                <File Id="script002" Name="c_btry.vbs" LongName="check_battery.vbs" DiskId="1" Source="$(var.Source)/scripts/check_battery.vbs" Vital="no" /> 
    … …  
    182150                <File Id="sample002" Name="c_test.ps1" LongName="check_test.ps1" DiskId="1" Source="$(var.Source)/scripts/check_test.ps1" Vital="no" /> 
    183151                <File Id="sample003" Name="c_test.vbs" LongName="check_test.vbs" DiskId="1" Source="$(var.Source)/scripts/check_test.vbs" Vital="no" /> 
     152          <!-- 
    184153                <File Id="lua001" Name="test.lua" LongName="test.lua" DiskId="1" Source="$(var.Source)/scripts/test.lua" Vital="no" /> 
    185154        --> 
    … …  
    187156              <Directory Id="INSTALLLOCATION_SCRIPTS_LIB" Name="lib"> 
    188157                <Component Id="ScriptLibs" Guid="9B490E67-5472-4267-96DF-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    189           <!-- 
    190158                  <File Id="lib001" Name="nagplug.vbs" LongName="NagiosPlugins.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/NagiosPlugins.vbs" Vital="no" /> 
    191159                  <File Id="lib002" Name="wrapper.vbs" LongName="wrapper.vbs" DiskId="1" Source="$(var.Source)/scripts/lib/wrapper.vbs" Vital="no" /> 
    192           --> 
    193160                </Component> 
    194161              </Directory> 
    … …  
    223190        </Feature> 
    224191        <Feature Id="NRPEPlugins" Title="NRPE Support" Description="NRPE Listener Plugin. Support for the more vercitile NRPE protocol (check_nrpe)" Level="1" Absent="disallow"> 
    225           <ComponentRef Id="NRPEListener" /> 
     192          <ComponentRef Id="NRPEServer" /> 
     193          <ComponentRef Id="NRPEServerCert" /> 
    226194        </Feature> 
    227195        <Feature Id="NSCPlugins" Title="NSClient support" Description="NSClient Listener Plugin. Support for the old NSClient protocol (check_nt)" Level="1" Absent="disallow"> 
    … …  
    274242      <Row> 
    275243        <Data Column="Id">SVC</Data> 
    276         <Data Column="ShortName">NSClientpp</Data> 
     244        <Data Column="ShortName">nscp</Data> 
    277245        <Data Column="LongName">$(var.App.Title) ($(var.PlatForm))</Data> 
    278246        <Data Column="Description">Monitoring agent for nagios (and others) used to respond to status queries.</Data> 
    279247        <Data Column="Component_">ServiceRegistration</Data> 
    280         <Data Column="Program">[#NSClientEXE]</Data> 
     248        <Data Column="Program">[#NSClientEXE] --service --run --name nscp</Data> 
    281249        <Data Column="Dependencies"></Data> 
    282250      </Row> 
Note: See TracChangeset for help on using the changeset viewer.