Changeset 197b263 in nscp


Ignore:
Timestamp:
03/06/11 17:51:47 (2 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2
Children:
7e54a5f
Parents:
47d3b0b
Message:

Finally builds the installer with cmake (so soon we can start doing nightly builds of 0.4.x as well)

Files:
5 added
68 deleted
6 edited
15 moved

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r47d3b0b r197b263  
    7878INCLUDE(${BUILD_CMAKE_FOLDER}/SetMultiThread.cmake) 
    7979INCLUDE(${BUILD_CMAKE_FOLDER}/NSCPPBuffer.cmake) 
     80INCLUDE(${BUILD_CMAKE_FOLDER}/functions.cmake) 
    8081 
    8182SET(VERSION_TXT ${CMAKE_CURRENT_SOURCE_DIR}/version.txt) 
    … …  
    195196    "C:/Program Files/Microsoft SDKs/Windows/v6.1/include" 
    196197  ) 
     198  FIND_PATH(PSDK_2003_INCLUDE_DIRS Windows.h 
     199    ${INC_PSDK_2003} 
     200    ${INC_PSDK_2003}/include 
     201    "C:/Program Files/Microsoft Platform SDK/include" 
     202    "C:/Program Files/Microsoft Platform SDK for Windows Server 2003 R2/include" 
     203  ) 
    197204 
    198205  if(CMAKE_CL_64) 
    … …  
    200207      ${INC_PSDK_61}/lib/x64 
    201208      "C:/Program Files/Microsoft SDKs/Windows/v6.1/lib/x64" 
     209    ) 
     210    FIND_PATH(PSDK_2003_LIBRARY_DIRS WSock32.Lib 
     211      ${INC_PSDK_2003}/lib/AMD64 
     212      "C:/Program Files/Microsoft Platform SDK/lib/AMD64" 
     213      "C:/Program Files/Microsoft Platform SDK for Windows Server 2003 R2/lib/AMD64" 
    202214    ) 
    203215  else(CMAKE_CL_64) 
    … …  
    206218      "C:/Program Files/Microsoft SDKs/Windows/v6.1/lib" 
    207219    ) 
     220    FIND_PATH(PSDK_2003_LIBRARY_DIRS WS2_32.Lib 
     221      ${INC_PSDK_2003}/lib 
     222      "C:/Program Files/Microsoft Platform SDK/lib" 
     223      "C:/Program Files/Microsoft Platform SDK for Windows Server 2003 R2/lib" 
     224    ) 
    208225  endif(CMAKE_CL_64) 
    209226  if(PSDK_61_INCLUDE_DIRS AND PSDK_61_LIBRARY_DIRS) 
    210227    SET(PSDK_61_FOUND TRUE) 
    211     message(STATUS "Found PSDK 6.1 (${CMAKE_SIZEOF_VOID_P}): ${PSDK_61_INCLUDE_DIRS} (${PSDK_61_LIBRARY_DIRS})") 
     228    message(STATUS "Found PSDK 6.1: ${PSDK_61_INCLUDE_DIRS} (${PSDK_61_LIBRARY_DIRS})") 
    212229  else() 
    213230    SET(PSDK_61_FOUND FALSE) 
    214     message(STATUS "PSDK 6.1 NOT FOUND(${CMAKE_SIZEOF_VOID_P}): ${PSDK_61_INCLUDE_DIRS} (${PSDK_61_LIBRARY_DIRS})") 
     231    message(STATUS "PSDK 6.1 NOT FOUND: ${PSDK_61_INCLUDE_DIRS} (${PSDK_61_LIBRARY_DIRS})") 
     232  endif() 
     233  if(PSDK_2003_INCLUDE_DIRS AND PSDK_2003_LIBRARY_DIRS) 
     234    SET(PSDK_2003_FOUND TRUE) 
     235    message(STATUS "Found PSDK 2003: ${PSDK_2003_INCLUDE_DIRS} (${PSDK_2003_LIBRARY_DIRS})") 
     236  else() 
     237    SET(PSDK_2003_FOUND FALSE) 
     238    message(STATUS "PSDK 2003 NOT FOUND: ${PSDK_2003_INCLUDE_DIRS} (${PSDK_2003_LIBRARY_DIRS})") 
    215239  endif() 
    216240endif(WIN32) 
    … …  
    367391ADD_SUBDIRECTORY("scripts") 
    368392 
    369 SET(ALL_MODULE_NAMES) 
    370 FILE(GLOB ALL_MODULES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "modules/*/module.cmake") 
    371 foreach(CURRENT_MODULE ${ALL_MODULES}) 
    372   get_filename_component(CURRENT_MODULE_PATH ${CURRENT_MODULE} PATH) 
    373   get_filename_component(CURRENT_MODULE_NAME ${CURRENT_MODULE_PATH} NAME) 
    374   SET (BUILD_MODULE 0) 
    375   SET(BUILD_MODULE_SKIP_REASON "") 
    376   include(${CURRENT_MODULE}) 
    377   IF(BUILD_MODULE) 
    378     message(STATUS "+ Module ${CURRENT_MODULE_NAME}: Added") 
    379     ADD_SUBDIRECTORY("${CURRENT_MODULE_PATH}") 
    380     SET(ALL_MODULE_NAMES ${ALL_MODULE_NAMES} ${CURRENT_MODULE_NAME}) 
    381   ELSE(BUILD_MODULE) 
    382     message(STATUS "- Module ${CURRENT_MODULE_NAME}: Skipped ${BUILD_MODULE_SKIP_REASON}") 
    383   ENDIF(BUILD_MODULE) 
    384 endforeach(CURRENT_MODULE ${ALL_MODULES}) 
    385  
    386 SET(ALL_TOOL_NAMES) 
    387 FILE(GLOB ALL_TOOLS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "tools/*/module.cmake") 
    388 foreach(CURRENT_MODULE ${ALL_TOOLS}) 
    389   get_filename_component(CURRENT_MODULE_PATH ${CURRENT_MODULE} PATH) 
    390   get_filename_component(CURRENT_MODULE_NAME ${CURRENT_MODULE_PATH} NAME) 
    391   SET (BUILD_MODULE 0) 
    392   SET(BUILD_MODULE_SKIP_REASON "") 
    393   include(${CURRENT_MODULE}) 
    394   IF(BUILD_MODULE) 
    395     message(STATUS "+ Tool ${CURRENT_MODULE_NAME}: Added") 
    396     ADD_SUBDIRECTORY("${CURRENT_MODULE_PATH}") 
    397     SET(ALL_TOOL_NAMES ${ALL_TOOL_NAMES} ${CURRENT_MODULE_NAME}) 
    398   ELSE(BUILD_MODULE) 
    399     message(STATUS "- Tool ${CURRENT_MODULE_NAME}: Skipped ${BUILD_MODULE_SKIP_REASON}") 
    400   ENDIF(BUILD_MODULE) 
    401 endforeach(CURRENT_MODULE ${ALL_TOOLS}) 
    402  
    403 SET(ALL_INSTALLERS_NAMES) 
    404 FILE(GLOB ALL_INSTALLERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "helpers/installers/*/module.cmake") 
    405 foreach(CURRENT_MODULE ${ALL_INSTALLERS}) 
    406   get_filename_component(CURRENT_MODULE_PATH ${CURRENT_MODULE} PATH) 
    407   get_filename_component(CURRENT_MODULE_NAME ${CURRENT_MODULE_PATH} NAME) 
    408   SET(BUILD_MODULE 0) 
    409   SET(BUILD_MODULE_SKIP_REASON "") 
    410   include(${CURRENT_MODULE}) 
    411   IF(BUILD_MODULE) 
    412     message(STATUS "+ Installer ${CURRENT_MODULE_NAME}: Added") 
    413     ADD_SUBDIRECTORY("${CURRENT_MODULE_PATH}") 
    414     SET(ALL_INSTALLERS_NAMES ${ALL_INSTALLERS_NAMES} ${CURRENT_MODULE_NAME}) 
    415   ELSE(BUILD_MODULE) 
    416     message(STATUS "- Installer ${CURRENT_MODULE_NAME}: Skipped ${BUILD_MODULE_SKIP_REASON}") 
    417   ENDIF(BUILD_MODULE) 
    418 endforeach(CURRENT_MODULE ${ALL_MODULES}) 
    419  
     393LOAD_SECTIONS(ALL_MODULE_NAMES "modules/*/module.cmake" "Modules") 
     394LOAD_SECTIONS(ALL_TOOL_NAMES "tools/*/module.cmake" "Tools") 
     395LOAD_SECTIONS(ALL_INSTALLERS_DLLS_NAMES "helpers/installer-dlls/*/module.cmake" "Installer DLLs") 
     396 
     397LOAD_SECTIONS(ALL_INSTALLERS_NAMES "helpers/installers/*/module.cmake" "Installers") 
    420398 
    421399SET_TARGET_PROPERTIES(${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} PROPERTIES  
    … …  
    426404) 
    427405 
     406SET_TARGET_PROPERTIES(${ALL_INSTALLERS_DLLS_NAMES} PROPERTIES  
     407        RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}" 
     408    LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/installer-dlls" 
     409        MODULE_OUTPUT_DIRECTORY  "${PROJECT_BINARY_DIR}/installer-dlls" 
     410        COMPILE_DEFINITIONS_DEBUG _DEBUG 
     411) 
     412 
    428413if (MSVC_IDE) 
    429414    # hack to get around the "Debug" and "Release" directories cmake tries to add on Windows 
    430     set_target_properties(${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} PROPERTIES PREFIX "../") 
     415    set_target_properties(${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} ${ALL_INSTALLERS_DLLS_NAMES} PROPERTIES PREFIX "../") 
    431416endif() 
    432417 

  • build.cmake

    r4c18192 r197b263  
    66  SET(INC_NSCP_INCLUDEDIR D:/source/include) 
    77  SET(INC_PSDK_61 "C:/Program Files/Microsoft SDKs/Windows/v6.1/") 
     8  SET(INC_PSDK_2003 "C:/Program Files/Microsoft Platform SDK/") 
    89 
    910  if(CMAKE_CL_64) 

  • build/cmake/wix.cmake

    r47d3b0b r197b263  
    1616if (WIN32) 
    1717    MACRO(DBG_MSG _MSG) 
    18         MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):\r\n ${_MSG}") 
     18        #MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):\r\n ${_MSG}") 
    1919    ENDMACRO(DBG_MSG) 
    2020 
    … …  
    196196    WIX_COMPILE("${_sources}" WIX_OBJ_LIST "${_dependencies}") 
    197197    WIX_LINK(${_target}.msi WIX_OBJ_LIST "${_loc_files}") 
    198     ADD_CUSTOM_TARGET(${_target} DEPENDS ${_target}.msi) 
     198    ADD_CUSTOM_TARGET(${_target}  
     199      DEPENDS ${_target}.msi 
     200      SOURCES ${_sources} 
     201      ) 
    199202    ENDMACRO(ADD_WIX_INSTALLER) 
    200203 

  • files/boot.dist

    r9567d4b r197b263  
    11[settings] 
    2 ;type=old 
    3 type=ini 
     2location=old 
     3;location=old 
     4location=ini 
    45;type=registry 
    56 

  • helpers/installer-dlls/fw_dll/firewall.cpp

    r8170e81 r197b263  
    1818 
    1919#include "precomp.h" 
    20 #include "../installer_dll/installer_helper.hpp" 
     20#include "../main_dll/installer_helper.hpp" 
    2121#include <atlbase.h> 
    2222 

  • helpers/installer-dlls/fw_dll/precomp.h

    r2e8b33f r197b263  
    2222#include <msiquery.h> 
    2323//#include <strsafe.h> 
    24 #ifdef USE_PSDK 
    2524#include <netfw.h> 
    26 #endif 
    2725 
    2826//#include "wcautil.h" 

  • helpers/installer-dlls/main_dll/main_dll.cpp

    r1fc246c r197b263  
    33#include <msiquery.h> 
    44#include <error.hpp> 
    5 #include <Settings.h> 
     5//#include <Settings.h> 
    66#include <config.h> 
    77#include <ServiceCmd.h> 
    … …  
    185185    std::wstring custom = h.getPropery(_T("CUSTOM_CONFIGURATION_FILE")); 
    186186 
    187     h.setupMyProperty(_T("ALLOWED_HOSTS"), MAIN_ALLOWED_HOSTS_DEFAULT); 
    188     h.setupMyProperty(_T("NSCLIENT_PWD"), MAIN_SETTINGS_PWD_DEFAULT); 
     187//    h.setupMyProperty(_T("ALLOWED_HOSTS"), MAIN_ALLOWED_HOSTS_DEFAULT); 
     188//    h.setupMyProperty(_T("NSCLIENT_PWD"), MAIN_SETTINGS_PWD_DEFAULT); 
    189189    h.setupMyProperty(_T("CONF_NRPE"), _T("")); 
    190190    h.setupMyProperty(_T("CONF_NSCLIENT"), _T("")); 
    … …  
    201201    } 
    202202 
    203     Settings::getInstance()->setFile(target, main); 
    204     if (Settings::getInstance()->getActiveType() == _T("INI-file")) { 
    205       h.setProperty(_T("CONF_CAN_WRITE"), _T("1")); 
    206       CopyFile(filename.c_str(), (h.getTempPath() + _T("\\old_nsc.ini")).c_str(), FALSE); 
    207     } else 
    208       h.setProperty(_T("CONF_CAN_WRITE"), _T("0")); 
    209  
    210  
    211  
    212  
    213     std::wstring allowed_hosts = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS, MAIN_ALLOWED_HOSTS_DEFAULT); 
    214     h.setMyProperty(_T("ALLOWED_HOSTS"), allowed_hosts); 
    215  
    216     std::wstring password = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT); 
    217     h.setMyProperty(_T("NSCLIENT_PWD"), password); 
     203//    Settings::getInstance()->setFile(target, main); 
     204//    if (Settings::getInstance()->getActiveType() == _T("INI-file")) { 
     205//      h.setProperty(_T("CONF_CAN_WRITE"), _T("1")); 
     206//      CopyFile(filename.c_str(), (h.getTempPath() + _T("\\old_nsc.ini")).c_str(), FALSE); 
     207//    } else 
     208//      h.setProperty(_T("CONF_CAN_WRITE"), _T("0")); 
     209 
     210 
     211 
     212 
     213//    std::wstring allowed_hosts = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS, MAIN_ALLOWED_HOSTS_DEFAULT); 
     214//    h.setMyProperty(_T("ALLOWED_HOSTS"), allowed_hosts); 
     215//  
     216//    std::wstring password = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT); 
     217//    h.setMyProperty(_T("NSCLIENT_PWD"), password); 
    218218 
    219219    int found_common_checks = 0; 
    220     settings_base::sectionList list = Settings::getInstance()->getSection(_T("modules")); 
    221     for (settings_base::sectionList::const_iterator cit=list.begin(); cit!=list.end();++cit) { 
    222       if (*cit == _T("NRPEListener.dll")) { 
    223         h.setMyProperty(_T("CONF_NRPE"), _T("1")); 
    224       } 
    225       if (*cit == _T("NSClientListener.dll")) { 
    226         h.setMyProperty(_T("CONF_NSCLIENT"), _T("1")); 
    227       } 
    228       if (*cit == _T("NSCAAgent.dll")) { 
    229         h.setMyProperty(_T("CONF_NSCA"), _T("1")); 
    230       } 
    231       if (*cit == _T("CheckWMI.dll")) { 
    232         h.setMyProperty(_T("CONF_WMI"), _T("1")); 
    233       } 
    234       if ( 
    235         (*cit == _T("FileLogger.dll")) || 
    236         (*cit == _T("CheckSystem.dll")) || 
    237         (*cit == _T("CheckDisk.dll")) || 
    238         (*cit == _T("CheckEventLog.dll")) || 
    239         (*cit == _T("CheckHelpers.dll")) 
    240         ) { 
    241         found_common_checks++; 
    242       } 
    243     } 
    244     if (found_common_checks == 5) { 
    245       h.setMyProperty(_T("CONF_CHECKS"), _T("1")); 
    246       h.setProperty(_T("CONF_CHECKS_GRAY"), _T("")); 
    247     } else if (found_common_checks == 0) { 
    248       h.setMyProperty(_T("CONF_CHECKS"), _T("")); 
    249       h.setProperty(_T("CONF_CHECKS_GRAY"), _T("")); 
    250     } else { 
    251       h.setMyProperty(_T("CONF_CHECKS"), _T("1")); 
    252       h.setProperty(_T("CONF_CHECKS_GRAY"), _T("1")); 
    253     } 
    254     Settings::destroyInstance(); 
     220//    settings_base::sectionList list = Settings::getInstance()->getSection(_T("modules")); 
     221//    for (settings_base::sectionList::const_iterator cit=list.begin(); cit!=list.end();++cit) { 
     222//      if (*cit == _T("NRPEListener.dll")) { 
     223//        h.setMyProperty(_T("CONF_NRPE"), _T("1")); 
     224//      } 
     225//      if (*cit == _T("NSClientListener.dll")) { 
     226//        h.setMyProperty(_T("CONF_NSCLIENT"), _T("1")); 
     227//      } 
     228//      if (*cit == _T("NSCAAgent.dll")) { 
     229//        h.setMyProperty(_T("CONF_NSCA"), _T("1")); 
     230//      } 
     231//      if (*cit == _T("CheckWMI.dll")) { 
     232//        h.setMyProperty(_T("CONF_WMI"), _T("1")); 
     233//      } 
     234//      if ( 
     235//        (*cit == _T("FileLogger.dll")) || 
     236//        (*cit == _T("CheckSystem.dll")) || 
     237//        (*cit == _T("CheckDisk.dll")) || 
     238//        (*cit == _T("CheckEventLog.dll")) || 
     239//        (*cit == _T("CheckHelpers.dll")) 
     240//        ) { 
     241//        found_common_checks++; 
     242//      } 
     243//    } 
     244//    if (found_common_checks == 5) { 
     245//      h.setMyProperty(_T("CONF_CHECKS"), _T("1")); 
     246//      h.setProperty(_T("CONF_CHECKS_GRAY"), _T("")); 
     247//    } else if (found_common_checks == 0) { 
     248//      h.setMyProperty(_T("CONF_CHECKS"), _T("")); 
     249//      h.setProperty(_T("CONF_CHECKS_GRAY"), _T("")); 
     250//    } else { 
     251//      h.setMyProperty(_T("CONF_CHECKS"), _T("1")); 
     252//      h.setProperty(_T("CONF_CHECKS_GRAY"), _T("1")); 
     253//    } 
     254//    Settings::destroyInstance(); 
    255255    h.setProperty(_T("CONF_OLD_NOT_FOUND"), _T("0")); 
    256256  } catch (installer_exception e) { 
    … …  
    259259    h.setProperty(_T("CONF_CAN_WRITE"), _T("0")); 
    260260    return ERROR_INSTALL_FAILURE; 
    261   } catch (SettingsException e) { 
    262     h.errorMessage(_T("Failed to read old configuration file: ") + e.getMessage()); 
    263     h.setProperty(_T("INSCON_CONFIGURE"),_T("0")); 
    264     h.setProperty(_T("CONF_CAN_WRITE"), _T("0")); 
    265     return ERROR_SUCCESS; 
     261// } catch (SettingsException e) { 
     262//    h.errorMessage(_T("Failed to read old configuration file: ") + e.getMessage()); 
     263//    h.setProperty(_T("INSCON_CONFIGURE"),_T("0")); 
     264//    h.setProperty(_T("CONF_CAN_WRITE"), _T("0")); 
     265//    return ERROR_SUCCESS; 
    266266  } catch (...) { 
    267267    h.errorMessage(_T("Failed to read old configuration file: <UNKNOWN EXCEPTION>")); 
    … …  
    361361    std::wstring path = data.get_next_string(); 
    362362    std::wstring file = data.get_next_string(); 
    363     Settings::getInstance()->setFile(path, file, true); 
     363//    Settings::getInstance()->setFile(path, file, true); 
    364364 
    365365    while (data.has_more()) { 
    … …  
    371371        std::wstring prop = data.get_next_string(); 
    372372        h.logMessage(_T("Writing to config file: ") + path + _T("/") + key + _T(" = ") + prop); 
    373         Settings::getInstance()->setString(path, key, prop); 
     373//        Settings::getInstance()->setString(path, key, prop); 
    374374        //TODO write config 
    375375      } else if (mode == 2) { 
    376376        std::list<std::wstring> list = data.get_next_list(); 
    377377        h.logMessage(_T("Writing modules section: ") + strEx::itos(list.size())); 
    378         Settings::getInstance()->writeSection(_T("modules"), list); 
     378//        Settings::getInstance()->writeSection(_T("modules"), list); 
    379379      } else { 
    380380        h.errorMessage(_T("Unknown mode in CA data: ") + strEx::itos(mode) + _T(": ") + data.to_string()); 
    … …  
    382382      } 
    383383    } 
    384     Settings::getInstance()->write(); 
    385   } catch (SettingsException e) { 
    386     h.errorMessage(_T("Failed to write configuration file: ") + e.getMessage()); 
    387     return ERROR_SUCCESS; 
     384//    Settings::getInstance()->write(); 
     385// } catch (SettingsException e) { 
     386//    h.errorMessage(_T("Failed to write configuration file: ") + e.getMessage()); 
     387//    return ERROR_SUCCESS; 
    388388  } catch (installer_exception e) { 
    389389    h.errorMessage(_T("Failed to install service: ") + e.what()); 
    … …  
    419419 
    420420  //Settings::getInstance()->setFile(path, file, true); 
    421   write_string_item_if_changed(h, data, _T("ALLOWED_HOSTS"), MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS); 
    422   write_string_item_if_changed(h, data, _T("NSCLIENT_PWD"), MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD); 
    423  
    424   settings_base::sectionList list; 
    425   if (h.isChangedProperyAndOld(_T("CONF_NRPE"))) 
    426     list.push_back(_T("NRPEListener.dll")); 
    427   if (h.isChangedProperyAndOld(_T("CONF_NSCLIENT"))) 
    428     list.push_back(_T("NSClientListener.dll")); 
    429   if (h.isChangedProperyAndOld(_T("CONF_NSCA"))) 
    430     list.push_back(_T("NSCAAgent.dll")); 
    431   if (h.isChangedProperyAndOld(_T("CONF_WMI"))) 
    432     list.push_back(_T("CheckWMI.dll")); 
    433   if (h.isChangedProperyAndOld(_T("CONF_CHECKS"))) { 
    434     list.push_back(_T("FileLogger.dll")); 
    435     list.push_back(_T("CheckSystem.dll")); 
    436     list.push_back(_T("CheckDisk.dll")); 
    437     list.push_back(_T("CheckEventLog.dll")); 
    438     list.push_back(_T("CheckHelpers.dll")); 
    439   } 
    440   if (list.size() > 0) { 
    441     data.write_int(2); 
    442     data.write_list(list); 
    443   } 
     421// write_string_item_if_changed(h, data, _T("ALLOWED_HOSTS"), MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS); 
     422// write_string_item_if_changed(h, data, _T("NSCLIENT_PWD"), MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD); 
     423 
     424// settings_base::sectionList list; 
     425// if (h.isChangedProperyAndOld(_T("CONF_NRPE"))) 
     426//    list.push_back(_T("NRPEListener.dll")); 
     427// if (h.isChangedProperyAndOld(_T("CONF_NSCLIENT"))) 
     428//    list.push_back(_T("NSClientListener.dll")); 
     429// if (h.isChangedProperyAndOld(_T("CONF_NSCA"))) 
     430//    list.push_back(_T("NSCAAgent.dll")); 
     431// if (h.isChangedProperyAndOld(_T("CONF_WMI"))) 
     432//    list.push_back(_T("CheckWMI.dll")); 
     433// if (h.isChangedProperyAndOld(_T("CONF_CHECKS"))) { 
     434//    list.push_back(_T("FileLogger.dll")); 
     435//    list.push_back(_T("CheckSystem.dll")); 
     436//    list.push_back(_T("CheckDisk.dll")); 
     437//    list.push_back(_T("CheckEventLog.dll")); 
     438//    list.push_back(_T("CheckHelpers.dll")); 
     439// } 
     440// if (list.size() > 0) { 
     441//    data.write_int(2); 
     442//    data.write_list(list); 
     443// } 
    444444  if (data.has_data()) { 
    445445    h.logMessage(_T("Scheduling (ExecWriteConfig): ") + data.to_string()); 

  • helpers/installers/installer/CMakeLists.txt

    r47d3b0b r197b263  
    2525#SET (WIX_DEST ${TARGET}.msi) 
    2626 
    27 SET(WIX_CANDLE_FLAGS -dboost=true -darch=Win32 -dVersion.Major=1 -dVersion.Minor=1 -dVersion.Revision=1 -dVersion.Build=1 -dvar.Source=${NSCP_PROJECT_BINARY_DIR}) 
     27SET(ARCH Win32) 
     28IF(CMAKE_CL_64) 
     29  SET(ARCH x64) 
     30ENDIF(CMAKE_CL_64) 
     31 
     32 
     33SET(WIX_CANDLE_FLAGS -dboost=true -darch=${ARCH} -dVersion.Major=1 -dVersion.Minor=1 -dVersion.Revision=1 -dVersion.Build=1  
     34  -dSource=${NSCP_PROJECT_BINARY_DIR} -dHelpers=${NSCP_PROJECT_BINARY_DIR}/installer-dlls 
     35  ) 
    2836SOURCE_GROUP(Generated FILES ${SRCS}) 
    2937#set_source_files_properties(${WIXOBJ_LIST} ${WIX_DEST} PROPERTIES GENERATED 1) 
    … …  
    3240ADD_WIX_INSTALLER(${TARGET} "${SRCS}" "${DEPENDENCIES}" "${LOCALIZATIONS}") 
    3341 
    34 MESSAGE(STATUS "====> ${NSCP_PROJECT_BINARY_DIR}") 
    35  
    36 #ADD_DEPENDENCIES(${TARGET}_WiXInstall ${MAIN_NSCP_TARGET}) 
     42ADD_DEPENDENCIES(${TARGET} ${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} ${ALL_INSTALLERS_DLLS_NAMES}) 

  • helpers/installers/installer/Product.wxs

    r47d3b0b r197b263  
    4646    <?define Source = "../../$(var.PlatForm)/$(var.Mode)/" ?> 
    4747  <?endif?> 
     48  <!-- 
    4849  <?ifndef var.Helpers ?> 
    4950    <?define Helpers = "../../$(var.PlatForm)/$(var.Mode)-helpers/" ?> 
    5051  <?endif?> 
     52     --> 
    5153 
    5254  <?define Version.String = "$(var.Version.Major).$(var.Version.Minor).$(var.Version.Revision).$(var.Version.Build)" ?> 
    … …  
    316318 
    317319 
    318     <Binary Id='InstallerHelper' SourceFile='$(var.Helpers)/installer_dll.dll' /> 
    319     <Binary Id='WixFirewallCA' SourceFile='$(var.Helpers)/installer_dll_fw.dll' /> 
     320    <Binary Id='InstallerHelper' SourceFile='$(var.Helpers)/main_dll.dll' /> 
     321    <Binary Id='WixFirewallCA' SourceFile='$(var.Helpers)/fw_dll.dll' /> 
    320322 
    321323    <InstallExecuteSequence> 
    … …  
    347349 
    348350    <!-- ### Icons --> 
    349     <Icon Id="nsclient.exe" SourceFile="$(var.Source)/nscp.exe" /> 
     351    <Icon Id="nscp.exe" SourceFile="$(var.Source)/nscp.exe" /> 
    350352    <!-- 
    351353    <Icon Id="nstray.exe" SourceFile="$(var.Source)/nstray.exe" /> 

  • libs/protobuf/log.proto.h

    r4c18192 r197b263  
    11#pragma once 
    22 
    3 #include "D:/source/nscp/build-w32/libs/protobuf/log.pb.h" 
     3#include "D:/source/nscp/build/libs/protobuf/log.pb.h" 
    44 
Note: See TracChangeset for help on using the changeset viewer.