Changeset b1ac2fa in nscp for Jamroot

Timestamp:

05/03/09 15:24:24 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

b39c1f3

Parents:

1d53fe0

Message:

2009-05-03 MickeM

• Fixed another quite serious memory leak! And this was a hard one, took me hours and hours and hours (read weeks) to track down, but here we are!
• A lot of other fixes as I have been through much of the code looking for the memmory leak above.

2009-03-30 MickeM

+ Added new option to NSCA module for specifying report options.

report=all (report=warning,critical) etc etc to specify which kind of return datat to get default value is all.

+ Added so password and host ate stored in the installer (if changed)

2009-03-29 MickeM

• Fixed a lot of issues with the installer and added a start on exit (and donate) on the finnish dialog.

2009-03-15 MickeM

• New service name (displayname)
• New service description

2009-03-14 MickeM

• Rebuilt installer UI (still missing write config function)
• Added debug entry to log filename used by debug log metrics.
• Fixed so alias will not require the allow_nasty_metachars option set under external sripts module.

2009-03-02 MickeM

• Added catch handlers and error logging to NSCA Thread
• Fixed issue with CheckProcState and administrator login! + Added debug module to installer + Added option max-dir-depth to CheckFile and CheckFile2 like so: CheckFile "file=c:\test\*.txt" filter-size=<24g "syntax=%filename%: %size%" MaxCrit=1 max-dir-depth=0 Will only find files on the "first level" where as max-dir-depth=1 would find all parents and children etc. (-1 is the default and means find all)
• Fixed issue with finding sub-folders and *.txt now it will always look for subfolders if they are present

2009-02-26 MickeM

• Fixed issue with debug logging (not it can be disabled again)

2009-02-23 MickeM

• Fixed build issues so NSCA now has all cryuptos avalible (verify with nsclient++ /about)

File:

• Jamroot (modified) (10 diffs)

Jamroot

@@ -9 +9 @@
 include user-config.jam ;
 
+feature character-set : unicode ansi multibyte : composite ;
+feature.compose <character-set>unicode : <define>_UNICODE <define>UNICODE ;
+feature.compose <character-set>multibyte : <define>_MBCS ;
+
+
 local toolset = [ MATCH "^--toolset=(.*)" : [ modules.peek : ARGV ] ] ;
 toolset ?= msvc ;
@@ -15 +20 @@
   import bjam/openssl ;
   import bjam/boost ;
+  import bjam/cryptopp ;
 }
 import toolset : flags ;
@@ -46 +52 @@
   using bjam/boost : : $(TOP)/lib-source/boost_1_35_0 $(TOP)/lib ;
   using bjam/lua : : $(TOP)/lib-source/LUA/src/lua-5.1.2 ;
+  using bjam/cryptopp : : $(TOP)/lib-source/"Crypto++"/src ;
 
   if [ bjam/lua.isEnabled ] = true {
@@ -66 +73 @@
   } else {
     echo "boost not avaliable! some features DISABLED (for instance regular expressions) (enable with --with-boost)" ; 
+  }
+
+  if [ bjam/cryptopp.isEnabled ] = true {
+    echo "Crypto++ found (disable with --without-cryptopp)" ; 
+    bjam/cryptopp.printEnv ;
+  } else {
+    echo "cryptopp not avaliable! encryption (NSCA) DISABLED (enable with --with-cryptopp)" ; 
   }
   
@@ -93 +107 @@
   ;
 
-feature character-set : unicode ansi multibyte : composite ;
-feature.compose <character-set>unicode : <define>_UNICODE <define>UNICODE ;
-feature.compose <character-set>multibyte : <define>_MBCS ;
-
 make $(target).exe.manifest : NSClient++.manifest : common.copy ;
 explicit $(target).manifest ;
@@ -147 +157 @@
     [ MATCH .*modules/(.*)/.* : [ glob modules/*/Jamfile ] ]
     ;
+
+# all-modules = NSCAAgent ;
 
 all-scripts =
@@ -189 +201 @@
 
 all-installers =
-    [ MATCH .*helpers/(.*)/.* : [ glob helpers/*installer/Jamfile ] ]
+    [ MATCH .*helpers/(.*)/.* : [ glob helpers/installer/Jamfile ] ]
     ;
 for local l in $(all-installers)
@@ -207 +219 @@
   explicit $(l) ;
 }
+
+alias installer_dll : helpers/installer_dll ;
+explicit installer_dll ;
+
+all-helpers = installer_dll ;
+alias all-helpers-targets : $(all-helpers) ;
+explicit all-helpers-targets ;
 
 alias all-root-targets : $(target) $(target-config) $(target-readme) $(target-license) $(target-changelog) $(target-counters) helpers/systray_helper ;
@@ -231 +250 @@
   return <location>$(BOOST_STAGE_LOCATE)/$(tag)/binaries ;
 }
+rule generate-helper-location ( properties * )
+{
+  local tag = [ get-root-prefix $(properties) ] ;
+  return <location>$(BOOST_STAGE_LOCATE)/$(tag)/helpers ;
+}
 rule generate-module-location ( properties * )
 {
@@ -243 +267 @@
 explicit dist-modules ;
 
-alias build-binaries : dist dist-modules ;
+install dist-helpers : all-helpers-targets : <conditional>@generate-helper-location ;
+explicit dist-helpers ;
+
+alias build-binaries : dist dist-modules dist-helpers ;
 explicit build-binaries ;