Changeset 225


Ignore:
Timestamp:
12/06/09 22:38:03 (2 years ago)
Author:
mickem
Message:

+ Added != to all string filters
+ Sorted out the alias handling it is now wither what you specify or "files found" (this makes performance data work)
+ Added version to CheckFile2

CheckFile2 path=D:\tmp pattern=*.exe filter+version=!=1.0 "syntax=%filename%: %version%" MaxWarn=1
CheckFile2 path=D:\tmp pattern=*.exe filter+version=!=6.0.2900.5512 "syntax=%filename%: %version%" MaxWarn=1

+ Added line count to CheckFile2 to count lines

CheckFile2 path=D:\tmp pattern=*.txt filter+line-count=!=2 "syntax=%filename%: %line-count%" MaxWarn=1
CheckFile2 path=D:\tmp pattern=*.txt filter+line-count=ne:3 "syntax=%filename%: %line-count%" MaxWarn=1

Location:
branches/stable
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/AutoBuild.h

    r199 r225  
    33// change the FALSE to TRUE for autoincrement of build number 
    44#define INCREMENT_VERSION TRUE 
    5 #define FILEVER        0,3,7,486 
    6 #define PRODUCTVER     0,3,7,486 
    7 #define STRFILEVER     _T("0.3.7.486") 
    8 #define STRPRODUCTVER  _T("0.3.7.486") 
    9 #define STRPRODUCTDATE  _T("2009-10-12") 
     5#define FILEVER        0,3,7,496 
     6#define PRODUCTVER     0,3,7,496 
     7#define STRFILEVER     _T("0.3.7.496") 
     8#define STRPRODUCTVER  _T("0.3.7.496") 
     9#define STRPRODUCTDATE  _T("2009-12-06") 
    1010#endif // AUTOBUILD_H 

  • branches/stable/NSClient++-2005.sln

    r199 r225  
    22# Visual Studio 2005 
    33Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClient++", "NSClient++-2005.vcproj", "{2286162D-7571-4735-BAC8-4A8D33A4F42D}" 
     4  ProjectSection(WebsiteProperties) = preProject 
     5    Debug.AspNetCompiler.Debug = "True" 
     6    Release.AspNetCompiler.Debug = "False" 
     7  EndProjectSection 
    48  ProjectSection(ProjectDependencies) = postProject 
     9    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
     10    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 
     11    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 
     12    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
     13    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
     14    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
     15    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
     16    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
     17    {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 
     18    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
     19    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
     20    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
     21    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
     22    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 
    523    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
     24  EndProjectSection 
     25EndProject 
     26Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray-2005.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}" 
     27  ProjectSection(WebsiteProperties) = preProject 
     28    Debug.AspNetCompiler.Debug = "True" 
     29    Release.AspNetCompiler.Debug = "False" 
     30  EndProjectSection 
     31EndProject 
     32Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLogger", "modules\FileLogger\FileLogger-2005.vcproj", "{62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}" 
     33  ProjectSection(WebsiteProperties) = preProject 
     34    Debug.AspNetCompiler.Debug = "True" 
     35    Release.AspNetCompiler.Debug = "False" 
     36  EndProjectSection 
     37EndProject 
     38Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckEventLog", "modules\CheckEventLog\CheckEventLog-2005.vcproj", "{BA246C01-063A-4548-8957-32D5CC76171B}" 
     39  ProjectSection(WebsiteProperties) = preProject 
     40    Debug.AspNetCompiler.Debug = "True" 
     41    Release.AspNetCompiler.Debug = "False" 
     42  EndProjectSection 
     43EndProject 
     44Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckDisk", "modules\CheckDisk\CheckDisk-2005.vcproj", "{E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}" 
     45  ProjectSection(WebsiteProperties) = preProject 
     46    Debug.AspNetCompiler.Debug = "True" 
     47    Release.AspNetCompiler.Debug = "False" 
     48  EndProjectSection 
     49EndProject 
     50Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEListener", "modules\NRPEListener\NRPEListener-2005.vcproj", "{2FF60AF6-09AA-49AB-B414-2E8FD01655C6}" 
     51  ProjectSection(WebsiteProperties) = preProject 
     52    Debug.AspNetCompiler.Debug = "True" 
     53    Release.AspNetCompiler.Debug = "False" 
     54  EndProjectSection 
     55EndProject 
     56Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientListener", "modules\NSClientListener\NSClientListener-2005.vcproj", "{08D6246D-1B4A-47A3-965D-296DCC54A4E8}" 
     57  ProjectSection(WebsiteProperties) = preProject 
     58    Debug.AspNetCompiler.Debug = "True" 
     59    Release.AspNetCompiler.Debug = "False" 
     60  EndProjectSection 
     61EndProject 
     62Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckSystem", "modules\CheckSystem\CheckSystem-2005.vcproj", "{2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}" 
     63  ProjectSection(WebsiteProperties) = preProject 
     64    Debug.AspNetCompiler.Debug = "True" 
     65    Release.AspNetCompiler.Debug = "False" 
     66  EndProjectSection 
     67EndProject 
     68Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckHelpers", "modules\CheckHelpers\CheckHelpers-2005.vcproj", "{8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}" 
     69  ProjectSection(WebsiteProperties) = preProject 
     70    Debug.AspNetCompiler.Debug = "True" 
     71    Release.AspNetCompiler.Debug = "False" 
     72  EndProjectSection 
     73EndProject 
     74Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckWMI", "modules\CheckWMI\CheckWMI-2005.vcproj", "{05DE66AC-E55C-43B3-849F-7EC695D8B8D0}" 
     75  ProjectSection(WebsiteProperties) = preProject 
     76    Debug.AspNetCompiler.Debug = "True" 
     77    Release.AspNetCompiler.Debug = "False" 
     78  EndProjectSection 
     79EndProject 
     80Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteConfiguration", "modules\RemoteConfiguration\RemoteConfiguration-2005.vcproj", "{626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}" 
     81  ProjectSection(WebsiteProperties) = preProject 
     82    Debug.AspNetCompiler.Debug = "True" 
     83    Release.AspNetCompiler.Debug = "False" 
     84  EndProjectSection 
     85EndProject 
     86Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XAutobuild-2005", "helpers\XAutoBuild\XAutobuild-2005.csproj", "{0E2B21D9-F432-4127-8E92-7716B1072510}" 
     87  ProjectSection(WebsiteProperties) = preProject 
     88    Debug.AspNetCompiler.Debug = "True" 
     89    Release.AspNetCompiler.Debug = "False" 
     90  EndProjectSection 
     91EndProject 
     92Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSCAAgent", "modules\NSCAAgent\NSCAAgent-2005.vcproj", "{6F55C9BF-57F6-4A15-A058-C83A52F539EE}" 
     93  ProjectSection(WebsiteProperties) = preProject 
     94    Debug.AspNetCompiler.Debug = "True" 
     95    Release.AspNetCompiler.Debug = "False" 
     96  EndProjectSection 
     97EndProject 
     98Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUAScript", "modules\LUAScript\LUAScript-2005.vcproj", "{26B84883-BE52-40E6-9BEE-55AD056D5751}" 
     99  ProjectSection(WebsiteProperties) = preProject 
     100    Debug.AspNetCompiler.Debug = "True" 
     101    Release.AspNetCompiler.Debug = "False" 
     102  EndProjectSection 
     103EndProject 
     104Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckExternalScripts", "modules\CheckExternalScripts\CheckExternalScripts-2005.vcproj", "{0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}" 
     105  ProjectSection(WebsiteProperties) = preProject 
     106    Debug.AspNetCompiler.Debug = "True" 
     107    Release.AspNetCompiler.Debug = "False" 
     108  EndProjectSection 
     109EndProject 
     110Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}" 
     111  ProjectSection(WebsiteProperties) = preProject 
     112    Debug.AspNetCompiler.Debug = "True" 
     113    Release.AspNetCompiler.Debug = "False" 
     114  EndProjectSection 
     115EndProject 
     116Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{9757464B-C125-4307-A84A-F4181AE6A081}" 
     117  ProjectSection(WebsiteProperties) = preProject 
     118    Debug.AspNetCompiler.Debug = "True" 
     119    Release.AspNetCompiler.Debug = "False" 
     120  EndProjectSection 
     121EndProject 
     122Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}" 
     123  ProjectSection(WebsiteProperties) = preProject 
     124    Debug.AspNetCompiler.Debug = "True" 
     125    Release.AspNetCompiler.Debug = "False" 
     126  EndProjectSection 
     127EndProject 
     128Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\installer\installer.wixproj", "{A3CF4E23-1D1B-4D93-A16A-48C52D118560}" 
     129  ProjectSection(WebsiteProperties) = preProject 
     130    Debug.AspNetCompiler.Debug = "True" 
     131    Release.AspNetCompiler.Debug = "False" 
     132  EndProjectSection 
     133  ProjectSection(ProjectDependencies) = postProject 
     134    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 
     135    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
     136    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
     137    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 
     138    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
     139    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
     140    {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751} 
     141    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
     142    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
     143    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
     144    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
     145    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
     146    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
     147    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 
    6148    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 
    7     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
    8     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
    9     {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
    10     {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
    11     {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 
    12     {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
    13     {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751} 
    14     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
    15     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
    16     {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 
    17     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
    18     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
    19     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 
     149    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
     150    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
     151    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} 
     152  EndProjectSection 
     153EndProject 
     154Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}" 
     155  ProjectSection(WebsiteProperties) = preProject 
     156    Debug.AspNetCompiler.Debug = "True" 
     157    Release.AspNetCompiler.Debug = "False" 
     158  EndProjectSection 
     159  ProjectSection(ProjectDependencies) = postProject 
     160    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560} 
    20161    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 
    21     {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
    22   EndProjectSection 
    23   ProjectSection(WebsiteProperties) = preProject 
    24     Debug.AspNetCompiler.Debug = "True" 
    25     Release.AspNetCompiler.Debug = "False" 
    26   EndProjectSection 
    27 EndProject 
    28 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray-2005.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}" 
    29   ProjectSection(WebsiteProperties) = preProject 
    30     Debug.AspNetCompiler.Debug = "True" 
    31     Release.AspNetCompiler.Debug = "False" 
    32   EndProjectSection 
    33 EndProject 
    34 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLogger", "modules\FileLogger\FileLogger-2005.vcproj", "{62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}" 
    35   ProjectSection(WebsiteProperties) = preProject 
    36     Debug.AspNetCompiler.Debug = "True" 
    37     Release.AspNetCompiler.Debug = "False" 
    38   EndProjectSection 
    39 EndProject 
    40 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckEventLog", "modules\CheckEventLog\CheckEventLog-2005.vcproj", "{BA246C01-063A-4548-8957-32D5CC76171B}" 
    41   ProjectSection(WebsiteProperties) = preProject 
    42     Debug.AspNetCompiler.Debug = "True" 
    43     Release.AspNetCompiler.Debug = "False" 
    44   EndProjectSection 
    45 EndProject 
    46 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckDisk", "modules\CheckDisk\CheckDisk-2005.vcproj", "{E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}" 
    47   ProjectSection(WebsiteProperties) = preProject 
    48     Debug.AspNetCompiler.Debug = "True" 
    49     Release.AspNetCompiler.Debug = "False" 
    50   EndProjectSection 
    51 EndProject 
    52 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEListener", "modules\NRPEListener\NRPEListener-2005.vcproj", "{2FF60AF6-09AA-49AB-B414-2E8FD01655C6}" 
    53   ProjectSection(WebsiteProperties) = preProject 
    54     Debug.AspNetCompiler.Debug = "True" 
    55     Release.AspNetCompiler.Debug = "False" 
    56   EndProjectSection 
    57 EndProject 
    58 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientListener", "modules\NSClientListener\NSClientListener-2005.vcproj", "{08D6246D-1B4A-47A3-965D-296DCC54A4E8}" 
    59   ProjectSection(WebsiteProperties) = preProject 
    60     Debug.AspNetCompiler.Debug = "True" 
    61     Release.AspNetCompiler.Debug = "False" 
    62   EndProjectSection 
    63 EndProject 
    64 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckSystem", "modules\CheckSystem\CheckSystem-2005.vcproj", "{2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}" 
    65   ProjectSection(WebsiteProperties) = preProject 
    66     Debug.AspNetCompiler.Debug = "True" 
    67     Release.AspNetCompiler.Debug = "False" 
    68   EndProjectSection 
    69 EndProject 
    70 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckHelpers", "modules\CheckHelpers\CheckHelpers-2005.vcproj", "{8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}" 
    71   ProjectSection(WebsiteProperties) = preProject 
    72     Debug.AspNetCompiler.Debug = "True" 
    73     Release.AspNetCompiler.Debug = "False" 
    74   EndProjectSection 
    75 EndProject 
    76 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckWMI", "modules\CheckWMI\CheckWMI-2005.vcproj", "{05DE66AC-E55C-43B3-849F-7EC695D8B8D0}" 
    77   ProjectSection(WebsiteProperties) = preProject 
    78     Debug.AspNetCompiler.Debug = "True" 
    79     Release.AspNetCompiler.Debug = "False" 
    80   EndProjectSection 
    81 EndProject 
    82 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteConfiguration", "modules\RemoteConfiguration\RemoteConfiguration-2005.vcproj", "{626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}" 
    83   ProjectSection(WebsiteProperties) = preProject 
    84     Debug.AspNetCompiler.Debug = "True" 
    85     Release.AspNetCompiler.Debug = "False" 
    86   EndProjectSection 
    87 EndProject 
    88 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XAutobuild-2005", "helpers\XAutoBuild\XAutobuild-2005.csproj", "{0E2B21D9-F432-4127-8E92-7716B1072510}" 
    89   ProjectSection(WebsiteProperties) = preProject 
    90     Debug.AspNetCompiler.Debug = "True" 
    91     Release.AspNetCompiler.Debug = "False" 
    92   EndProjectSection 
    93 EndProject 
    94 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSCAAgent", "modules\NSCAAgent\NSCAAgent-2005.vcproj", "{6F55C9BF-57F6-4A15-A058-C83A52F539EE}" 
    95   ProjectSection(WebsiteProperties) = preProject 
    96     Debug.AspNetCompiler.Debug = "True" 
    97     Release.AspNetCompiler.Debug = "False" 
    98   EndProjectSection 
    99 EndProject 
    100 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUAScript", "modules\LUAScript\LUAScript-2005.vcproj", "{26B84883-BE52-40E6-9BEE-55AD056D5751}" 
    101   ProjectSection(WebsiteProperties) = preProject 
    102     Debug.AspNetCompiler.Debug = "True" 
    103     Release.AspNetCompiler.Debug = "False" 
    104   EndProjectSection 
    105 EndProject 
    106 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckExternalScripts", "modules\CheckExternalScripts\CheckExternalScripts-2005.vcproj", "{0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}" 
    107   ProjectSection(WebsiteProperties) = preProject 
    108     Debug.AspNetCompiler.Debug = "True" 
    109     Release.AspNetCompiler.Debug = "False" 
    110   EndProjectSection 
    111 EndProject 
    112 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}" 
    113   ProjectSection(WebsiteProperties) = preProject 
    114     Debug.AspNetCompiler.Debug = "True" 
    115     Release.AspNetCompiler.Debug = "False" 
    116   EndProjectSection 
    117 EndProject 
    118 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{9757464B-C125-4307-A84A-F4181AE6A081}" 
    119   ProjectSection(WebsiteProperties) = preProject 
    120     Debug.AspNetCompiler.Debug = "True" 
    121     Release.AspNetCompiler.Debug = "False" 
    122   EndProjectSection 
    123 EndProject 
    124 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}" 
    125   ProjectSection(WebsiteProperties) = preProject 
    126     Debug.AspNetCompiler.Debug = "True" 
    127     Release.AspNetCompiler.Debug = "False" 
    128   EndProjectSection 
    129 EndProject 
    130 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\installer\installer.wixproj", "{A3CF4E23-1D1B-4D93-A16A-48C52D118560}" 
     162    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
     163  EndProjectSection 
     164EndProject 
     165Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}" 
     166  ProjectSection(WebsiteProperties) = preProject 
     167    Debug.AspNetCompiler.Debug = "True" 
     168    Release.AspNetCompiler.Debug = "False" 
     169  EndProjectSection 
    131170  ProjectSection(ProjectDependencies) = postProject 
    132     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} 
    133171    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
    134172    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
    … …  
    140178    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
    141179    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
     180    {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 
    142181    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
    143     {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751} 
    144182    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
    145183    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
    … …  
    149187    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 
    150188  EndProjectSection 
    151   ProjectSection(WebsiteProperties) = preProject 
    152     Debug.AspNetCompiler.Debug = "True" 
    153     Release.AspNetCompiler.Debug = "False" 
    154   EndProjectSection 
    155 EndProject 
    156 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}" 
     189EndProject 
     190Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}" 
     191  ProjectSection(WebsiteProperties) = preProject 
     192    Debug.AspNetCompiler.Debug = "True" 
     193    Release.AspNetCompiler.Debug = "False" 
     194  EndProjectSection 
     195EndProject 
     196Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}" 
     197  ProjectSection(WebsiteProperties) = preProject 
     198    Debug.AspNetCompiler.Debug = "True" 
     199    Release.AspNetCompiler.Debug = "False" 
     200  EndProjectSection 
     201EndProject 
     202Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpSamplePlugin", "modules\CsharpSamplePlugin\CsharpSamplePlugin.csproj", "{1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}" 
     203  ProjectSection(WebsiteProperties) = preProject 
     204    Debug.AspNetCompiler.Debug = "True" 
     205    Release.AspNetCompiler.Debug = "False" 
     206  EndProjectSection 
     207EndProject 
     208Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleManagedPlugin", "modules\SampleManagedPlugin\SampleManagedPlugin.vcproj", "{D367E76D-9485-4DCB-A9D0-3D3C0E190648}" 
     209  ProjectSection(WebsiteProperties) = preProject 
     210    Debug.AspNetCompiler.Debug = "True" 
     211    Release.AspNetCompiler.Debug = "False" 
     212  EndProjectSection 
     213EndProject 
     214Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{BBE9A5E7-A16B-443C-A349-823DED5A9FF3}" 
     215  ProjectSection(WebsiteProperties) = preProject 
     216    Debug.AspNetCompiler.Debug = "True" 
     217    Release.AspNetCompiler.Debug = "False" 
     218  EndProjectSection 
     219EndProject 
     220Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{FC917E21-188A-44EE-9EF2-7C1274C2D719}" 
     221  ProjectSection(WebsiteProperties) = preProject 
     222    Debug.AspNetCompiler.Debug = "True" 
     223    Release.AspNetCompiler.Debug = "False" 
     224  EndProjectSection 
     225EndProject 
     226Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\op5-installer\installer.wixproj", "{10A0052D-542B-47AD-85C3-1A3DD45BF2ED}" 
     227  ProjectSection(WebsiteProperties) = preProject 
     228    Debug.AspNetCompiler.Debug = "True" 
     229    Release.AspNetCompiler.Debug = "False" 
     230  EndProjectSection 
    157231  ProjectSection(ProjectDependencies) = postProject 
     232    {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 
     233    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
     234    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
    158235    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
     236    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 
    159237    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 
    160     {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560} 
    161   EndProjectSection 
    162   ProjectSection(WebsiteProperties) = preProject 
    163     Debug.AspNetCompiler.Debug = "True" 
    164     Release.AspNetCompiler.Debug = "False" 
    165   EndProjectSection 
    166 EndProject 
    167 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}" 
    168   ProjectSection(ProjectDependencies) = postProject 
     238    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
     239    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
     240    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
     241    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
     242    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
     243    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
     244    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
     245    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 
     246    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
     247    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
    169248    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 
    170     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
    171     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
    172     {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 
    173     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
    174     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
    175     {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
    176     {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 
    177     {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
    178     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
    179     {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
    180     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
    181     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
    182     {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 
    183     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 
    184     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
    185     {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
    186   EndProjectSection 
    187   ProjectSection(WebsiteProperties) = preProject 
    188     Debug.AspNetCompiler.Debug = "True" 
    189     Release.AspNetCompiler.Debug = "False" 
    190   EndProjectSection 
    191 EndProject 
    192 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}" 
    193   ProjectSection(WebsiteProperties) = preProject 
    194     Debug.AspNetCompiler.Debug = "True" 
    195     Release.AspNetCompiler.Debug = "False" 
    196   EndProjectSection 
    197 EndProject 
    198 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}" 
    199   ProjectSection(WebsiteProperties) = preProject 
    200     Debug.AspNetCompiler.Debug = "True" 
    201     Release.AspNetCompiler.Debug = "False" 
    202   EndProjectSection 
    203 EndProject 
    204 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpSamplePlugin", "modules\CsharpSamplePlugin\CsharpSamplePlugin.csproj", "{1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D}" 
    205   ProjectSection(WebsiteProperties) = preProject 
    206     Debug.AspNetCompiler.Debug = "True" 
    207     Release.AspNetCompiler.Debug = "False" 
    208   EndProjectSection 
    209 EndProject 
    210 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleManagedPlugin", "modules\SampleManagedPlugin\SampleManagedPlugin.vcproj", "{D367E76D-9485-4DCB-A9D0-3D3C0E190648}" 
    211   ProjectSection(WebsiteProperties) = preProject 
    212     Debug.AspNetCompiler.Debug = "True" 
    213     Release.AspNetCompiler.Debug = "False" 
    214   EndProjectSection 
    215 EndProject 
    216 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{BBE9A5E7-A16B-443C-A349-823DED5A9FF3}" 
    217   ProjectSection(WebsiteProperties) = preProject 
    218     Debug.AspNetCompiler.Debug = "True" 
    219     Release.AspNetCompiler.Debug = "False" 
    220   EndProjectSection 
    221 EndProject 
    222 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom-installers", "custom-installers", "{FC917E21-188A-44EE-9EF2-7C1274C2D719}" 
    223   ProjectSection(WebsiteProperties) = preProject 
    224     Debug.AspNetCompiler.Debug = "True" 
    225     Release.AspNetCompiler.Debug = "False" 
    226   EndProjectSection 
    227 EndProject 
    228 Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "installer", "helpers\op5-installer\installer.wixproj", "{10A0052D-542B-47AD-85C3-1A3DD45BF2ED}" 
    229   ProjectSection(ProjectDependencies) = postProject 
    230     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 
    231     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
    232     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
    233     {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 
    234     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
    235     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
    236     {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
    237     {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
    238     {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
    239     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
    240     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
    241     {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20} 
    242     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 
    243     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
    244     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
    245     {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
    246     {53FB9872-5E74-4E62-892D-AD82C2ED67CE} = {53FB9872-5E74-4E62-892D-AD82C2ED67CE} 
    247   EndProjectSection 
    248   ProjectSection(WebsiteProperties) = preProject 
    249     Debug.AspNetCompiler.Debug = "True" 
    250     Release.AspNetCompiler.Debug = "False" 
    251249  EndProjectSection 
    252250EndProject 
    … …  
    270268EndProject 
    271269Global 
     270  GlobalSection(SubversionScc) = preSolution 
     271    Svn-Managed = True 
     272    Manager = AnkhSVN - Subversion Support for Visual Studio 
     273  EndGlobalSection 
    272274  GlobalSection(SolutionConfigurationPlatforms) = preSolution 
    273275    Debug|Any CPU = Debug|Any CPU 
    … …  
    867869    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|Mixed Platforms.Build.0 = Debug|x64 
    868870    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|Win32.ActiveCfg = Debug|Win32 
    869     {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|Win32.Build.0 = Debug|Win32 
    870871    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|x64.ActiveCfg = Debug|x64 
    871872    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|x64.Build.0 = Debug|x64 
    … …  
    915916    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug|Mixed Platforms.Build.0 = Debug|x64 
    916917    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug|Win32.ActiveCfg = Debug|Win32 
    917     {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug|Win32.Build.0 = Debug|Win32 
    918918    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug|x64.ActiveCfg = Debug|x64 
    919919    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Debug|x64.Build.0 = Debug|x64 
    … …  
    14711471    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug|Itanium.ActiveCfg = Debug|Win32 
    14721472    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 
    1473     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug|Mixed Platforms.Build.0 = Debug|Win32 
    14741473    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug|Win32.ActiveCfg = Debug|Win32 
    14751474    {743B2362-DF6A-4C28-A6C9-0F970D8E1B66}.Debug|x64.ActiveCfg = Debug|x64 
    … …  
    15111510    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug|Itanium.ActiveCfg = Debug|x64 
    15121511    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 
    1513     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug|Mixed Platforms.Build.0 = Debug|x64 
    15141512    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug|Win32.ActiveCfg = Debug|Win32 
    15151513    {DF1DB6FB-0448-46D6-AE82-9901495E5F1A}.Debug|x64.ActiveCfg = Debug|x64 
    … …  
    15841582    {10A0052D-542B-47AD-85C3-1A3DD45BF2ED} = {FC917E21-188A-44EE-9EF2-7C1274C2D719} 
    15851583  EndGlobalSection 
    1586   GlobalSection(SubversionScc) = preSolution 
    1587     Svn-Managed = True 
    1588     Manager = AnkhSVN - Subversion Support for Visual Studio 
    1589   EndGlobalSection 
    15901584  GlobalSection(DPCodeReviewSolutionGUID) = preSolution 
    15911585    DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} 

  • branches/stable/changelog

    r193 r225  
    44 * Add API for rehashing the daemon (or implement it the API is there but does nothing) 
    55 * Improved socket performance (would be nice if we could be used as a "hub") 
    6  * Fixa dependonservice LanManWorkStation (old win) 
     6 * Fix depend onservice LanManWorkStation (old win) 
    77 * Fix RtlStringFromGUID problem on NT4 
     8 
     92009-12-06 MickeM 
     10 + Added != to all string filters 
     11 + Sorted out the alias handling it is now wither what you specify or "files found" (this makes performance data work) 
     12 + Added version to CheckFile2 
     13   CheckFile2 path=D:\tmp pattern=*.exe filter+version=!=1.0 "syntax=%filename%: %version%" MaxWarn=1 
     14   CheckFile2 path=D:\tmp pattern=*.exe filter+version=!=6.0.2900.5512 "syntax=%filename%: %version%" MaxWarn=1 
     15 + Added line count to CheckFile2 to count lines 
     16   CheckFile2 path=D:\tmp pattern=*.txt filter+line-count=!=2 "syntax=%filename%: %line-count%" MaxWarn=1 
     17   CheckFile2 path=D:\tmp pattern=*.txt filter+line-count=ne:3 "syntax=%filename%: %line-count%" MaxWarn=1 
     18 
     192009-xx-x MickeM - 0.3.7 
     20 ! Release the new version 
    821 
    9222009-10-11 MickeM 

  • branches/stable/include/filter_framework.hpp

    r171 r225  
    5353      } 
    5454    }; 
     55    struct not_string_filter { 
     56      static bool filter(std::wstring filter, std::wstring str) { 
     57        std::wcout << str << _T("=") << filter << _T(": ") << (!(bool)(str == filter)) << std::endl; 
     58        return !(str == filter); 
     59      } 
     60    }; 
    5561#ifdef USE_BOOST 
    5662    struct regexp_string_filter { 
    … …  
    225231#endif 
    226232  typedef filter_one<std::wstring, std::wstring, handlers::string_handler, filter::exact_string_filter> exact_string_filter; 
     233  typedef filter_one<std::wstring, std::wstring, handlers::string_handler, filter::not_string_filter> not_string_filter; 
    227234 
    228235  struct filter_all_strings { 
    229236    sub_string_filter sub; 
    230237    exact_string_filter exact; 
     238    not_string_filter not; 
    231239    std::wstring value_; 
    232240#ifdef USE_BOOST 
    … …  
    240248        || regexp.hasFilter()  
    241249#endif 
    242         || exact.hasFilter(); 
     250        || exact.hasFilter() 
     251        || not.hasFilter() 
     252        ; 
    243253    } 
    244254    bool matchFilter(const std::wstring str) const { 
    … …  
    250260#endif 
    251261      else if ((exact.hasFilter())&&(exact.matchFilter(str))) 
     262        return true; 
     263      else if ((not.hasFilter())&&(not.matchFilter(str))) 
    252264        return true; 
    253265      return false; 
    … …  
    270282      } else if (t.first.length() > 1 && t.first[0] == L'=') { 
    271283        exact = t.first.substr(1); 
     284      } else if (t.first.length() > 2 && t.first[0] == L'!' && t.first[1] == L'=') { 
     285        not = t.first.substr(2); 
     286      } else if (t.first.length() > 1 && t.first[0] == L'!') { 
     287        not = t.first.substr(1); 
    272288      } else { 
    273289        exact = t.first; 
    … …  
    365381  }; 
    366382  typedef filter_all_numeric<unsigned long long, checkHolders::time_handler<unsigned long long> > filter_all_times; 
     383  typedef filter_all_numeric<unsigned long, checkHolders::int_handler > filter_all_num_ul; 
    367384 
    368385  template <typename TFilterType, typename TValueType> 

  • branches/stable/modules/CheckDisk/CheckDisk-2005.vcproj

    r170 r225  
    6969      <Tool 
    7070        Name="VCLinkerTool" 
     71        AdditionalDependencies="Version.lib" 
    7172        OutputFile="$(OutDir)\$(ProjectName).dll" 
    7273        LinkIncremental="2" 
    … …  
    151152      <Tool 
    152153        Name="VCLinkerTool" 
     154        AdditionalDependencies="Version.lib" 
    153155        OutputFile="$(OutDir)\$(ProjectName).dll" 
    154156        LinkIncremental="2" 

  • branches/stable/modules/CheckDisk/CheckDisk.cpp

    r183 r225  
    408408 
    409409struct file_info { 
    410   file_info() : ullCreationTime(0) {} 
    411   file_info(const BY_HANDLE_FILE_INFORMATION info, std::wstring filename_) : filename(filename_), ullCreationTime(0) { 
     410  file_info()  
     411    : ullCreationTime(0) 
     412    , cached_version(false, _T(""))  
     413    , cached_count(false, 0) 
     414  {} 
     415  file_info(const BY_HANDLE_FILE_INFORMATION info, std::wstring path_, std::wstring filename_)  
     416    : path(path_) 
     417    , filename(filename_) 
     418    , ullCreationTime(0) 
     419    , cached_version(false, _T(""))  
     420    , cached_count(false, 0) 
     421  { 
    412422    ullSize = ((info.nFileSizeHigh * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.nFileSizeLow); 
    413423    ullCreationTime = ((info.ftCreationTime.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.ftCreationTime.dwLowDateTime); 
    … …  
    422432  unsigned long long ullNow; 
    423433  std::wstring filename; 
     434  std::wstring path; 
     435  std::pair<bool,std::wstring> cached_version; 
     436  std::pair<bool,unsigned long> cached_count; 
    424437 
    425438  std::wstring render(std::wstring syntax) { 
     439    strEx::replace(syntax, _T("%path%"), path); 
    426440    strEx::replace(syntax, _T("%filename%"), filename); 
    427441    strEx::replace(syntax, _T("%creation%"), strEx::format_filetime(ullCreationTime, DATE_FORMAT)); 
    … …  
    429443    strEx::replace(syntax, _T("%write%"), strEx::format_filetime(ullLastWriteTime, DATE_FORMAT)); 
    430444    strEx::replace(syntax, _T("%size%"), strEx::itos_as_BKMG(ullSize)); 
     445    if (cached_version.first) 
     446      strEx::replace(syntax, _T("%version%"), cached_version.second); 
     447    if (cached_count.first) 
     448      strEx::replace(syntax, _T("%line-count%"), strEx::itos(cached_count.second)); 
    431449    return syntax; 
    432450  } 
    433451 
     452  std::wstring get_version() { 
     453    if (cached_version.first) 
     454      return cached_version.second; 
     455    std::wstring fullpath = path+_T("\\")+filename; 
     456 
     457    DWORD dwDummy; 
     458    DWORD dwFVISize = GetFileVersionInfoSize(fullpath.c_str(),&dwDummy); 
     459    LPBYTE lpVersionInfo = new BYTE[dwFVISize+1]; 
     460    GetFileVersionInfo(fullpath.c_str(),0,dwFVISize,lpVersionInfo); 
     461    UINT uLen; 
     462    VS_FIXEDFILEINFO *lpFfi; 
     463    VerQueryValue( lpVersionInfo , _T("\\") , (LPVOID *)&lpFfi , &uLen ); 
     464    DWORD dwFileVersionMS = lpFfi->dwFileVersionMS; 
     465    DWORD dwFileVersionLS = lpFfi->dwFileVersionLS; 
     466    delete [] lpVersionInfo; 
     467    DWORD dwLeftMost = HIWORD(dwFileVersionMS); 
     468    DWORD dwSecondLeft = LOWORD(dwFileVersionMS); 
     469    DWORD dwSecondRight = HIWORD(dwFileVersionLS); 
     470    DWORD dwRightMost = LOWORD(dwFileVersionLS); 
     471    cached_version.second = strEx::itos(dwLeftMost) + _T(".") + 
     472      strEx::itos(dwSecondLeft) + _T(".") + 
     473      strEx::itos(dwSecondRight) + _T(".") + 
     474      strEx::itos(dwRightMost); 
     475    cached_version.first = true; 
     476    return cached_version.second; 
     477  } 
     478 
     479  unsigned long get_line_count() { 
     480    if (cached_count.first) 
     481      return cached_count.second; 
     482 
     483    unsigned long count = 0; 
     484    std::wstring fullpath = path+_T("\\")+filename; 
     485    FILE * pFile = fopen(strEx::wstring_to_string(fullpath).c_str(),"r");; 
     486    if (pFile==NULL)  
     487      return 0; 
     488    char c; 
     489    do { 
     490      c = fgetc (pFile); 
     491      if (c == '\n') count++; 
     492    } while (c != EOF); 
     493    fclose (pFile); 
     494    cached_count.second = count; 
     495    cached_count.first = true; 
     496    return cached_count.second; 
     497  } 
    434498}; 
    435499 
    … …  
    439503  filters::filter_all_times accessed; 
    440504  filters::filter_all_times written; 
     505  filters::filter_all_strings version; 
     506  filters::filter_all_num_ul line_count; 
    441507  static const __int64 MSECS_TO_100NS = 10000; 
    442508 
    … …  
    445511      accessed.hasFilter() || written.hasFilter(); 
    446512  } 
    447   bool matchFilter(const file_info &value) const { 
     513  bool matchFilter(file_info &value) const { 
    448514    if ((size.hasFilter())&&(size.matchFilter(value.ullSize))) 
    449515      return true; 
    … …  
    453519      return true; 
    454520    else if ((written.hasFilter())&&(written.matchFilter((value.ullNow-value.ullLastWriteTime)/MSECS_TO_100NS))) 
     521      return true; 
     522    else if ((version.hasFilter())&&(version.matchFilter(value.get_version()))) 
     523      return true; 
     524    else if ((line_count.hasFilter())&&(line_count.matchFilter(value.get_line_count()))) 
    455525      return true; 
    456526    return false; 
    … …  
    466536    if (written.hasFilter()) 
    467537      return _T("written: ") + written.getValue(); 
     538    if (version.hasFilter()) 
     539      return _T("written: ") + version.getValue(); 
     540    if (line_count.hasFilter()) 
     541      return _T("written: ") + line_count.getValue(); 
    468542    return _T("UNknown..."); 
    469543  } 
    … …  
    491565    GetFileInformationByHandle(hFile, &_info); 
    492566    CloseHandle(hFile); 
    493     info = file_info(_info, ffd.wfd.cFileName); 
     567    info = file_info(_info, ffd.path, ffd.wfd.cFileName); 
    494568    return false; 
    495569  } 
    … …  
    530604    GetFileInformationByHandle(hFile, &_info); 
    531605    CloseHandle(hFile); 
    532     file_info info(_info, ffd.wfd.cFileName); 
     606    file_info info(_info, ffd.path, ffd.wfd.cFileName); 
    533607    info.ullNow = now; 
    534608 
    … …  
    585659  std::wstring message; 
    586660  std::wstring syntax; 
    587   std::wstring alias; 
     661  //std::wstring alias; 
    588662  unsigned long long now; 
    589663  unsigned int hit_count; 
    … …  
    603677    GetFileInformationByHandle(hFile, &_info); 
    604678    CloseHandle(hFile); 
    605     file_info info(_info, ffd.wfd.cFileName); 
     679    file_info info(_info, ffd.path, ffd.wfd.cFileName); 
    606680    info.ullNow = now; 
    607681 
    … …  
    633707    if ((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch)) { 
    634708      strEx::append_list(message, info.render(syntax)); 
     709      /* 
    635710      if (alias.length() < 16) 
    636711        strEx::append_list(alias, info.filename); 
    637712      else 
    638713        strEx::append_list(alias, std::wstring(_T("..."))); 
     714        */ 
    639715      hit_count++; 
    640716    } 
    … …  
    763839} 
    764840 
    765 #define MAP_FILTER(value, obj, filtermode) \ 
    766       else if (p__.first == value) { file_filter filter; filter.obj = p__.second; finder.filter_chain.push_back(filteritem_type(file_filter_function_ex::filtermode, filter)); } 
     841#define MAP_FILTER(value, obj) \ 
     842    else if (p__.first == _T("filter+"##value)) { file_filter filter; filter.obj = p__.second; \ 
     843      finder.filter_chain.push_back(filteritem_type(file_filter_function_ex::filter_plus, filter)); } \ 
     844    else if (p__.first == _T("filter-"##value)) { file_filter filter; filter.obj = p__.second; \ 
     845      finder.filter_chain.push_back(filteritem_type(file_filter_function_ex::filter_minus, filter)); } \ 
     846    else if (p__.first == _T("filter."##value)) { file_filter filter; filter.obj = p__.second; \ 
     847      finder.filter_chain.push_back(filteritem_type(file_filter_function_ex::filter_normal, filter)); } 
    767848 
    768849NSCAPI::nagiosReturn CheckDisk::CheckFile2(const unsigned int argLen, TCHAR **char_args, std::wstring &message, std::wstring &perf) { 
    … …  
    807888      */ 
    808889 
    809       MAP_FILTER(_T("filter+size"), size, filter_plus) 
    810       MAP_FILTER(_T("filter+creation"), creation, filter_plus) 
    811       MAP_FILTER(_T("filter+written"), written, filter_plus) 
    812       MAP_FILTER(_T("filter+accessed"), accessed, filter_plus) 
    813  
     890      MAP_FILTER(_T("size"), size) 
     891      MAP_FILTER(_T("creation"), creation) 
     892      MAP_FILTER(_T("written"), written) 
     893      MAP_FILTER(_T("accessed"), accessed) 
     894      MAP_FILTER(_T("version"), version) 
     895      MAP_FILTER(_T("line-count"), line_count) 
     896/* 
    814897      MAP_FILTER(_T("filter.size"), size, filter_normal) 
    815898      MAP_FILTER(_T("filter.creation"), creation, filter_normal) 
    816899      MAP_FILTER(_T("filter.written"), written, filter_normal) 
    817900      MAP_FILTER(_T("filter.accessed"), accessed, filter_normal) 
     901      MAP_FILTER(_T("filter.version"), version, filter_normal) 
    818902 
    819903      MAP_FILTER(_T("filter-size"), size, filter_minus) 
    … …  
    821905      MAP_FILTER(_T("filter-written"), written, filter_minus) 
    822906      MAP_FILTER(_T("filter-accessed"), accessed, filter_minus) 
    823  
     907      MAP_FILTER(_T("filter-version"), version, filter_minus) 
     908*/ 
    824909      MAP_OPTIONS_MISSING(message, _T("Unknown argument: ")) 
    825910      MAP_OPTIONS_END() 
    … …  
    847932      query.alias = alias; 
    848933    else 
    849       query.alias = finder.alias; 
    850     if (query.alias.empty()) 
    851       query.alias = _T("no files found"); 
     934      query.alias = _T("found files"); 
    852935    query.runCheck(finder.hit_count, returnCode, message, perf); 
    853     if ((truncate > 0) && (message.length() > (truncate-4))) 
     936    if ((truncate > 0) && (message.length() > (truncate-4))) { 
    854937      message = message.substr(0, truncate-4) + _T("..."); 
     938      perf = _T(""); 
     939    } 
    855940    if (message.empty()) 
    856941      message = _T("CheckFile ok"); 

  • branches/stable/modules/CheckDisk/Jamfile

    r172 r225  
    11local target = CheckDisk ; 
    22local source = $(target) ; 
     3 
     4project  
     5  : requirements 
     6  <find-static-library>version 
     7  ; 
    38 
    49lib $(target) 
Note: See TracChangeset for help on using the changeset viewer.