Changeset 53473f7 in nscp


Ignore:
Timestamp:
05/04/12 18:47:31 (13 months ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.1, 0.4.2
Children:
9bd40e2
Parents:
fa11893
git-author:
Michael Medin <michael@…> (04/28/12 21:59:51)
git-committer:
Michael Medin <michael@…> (05/04/12 18:47:31)
Message:
  • Changed how files are generated to reduce number of projcts
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    rd9cdcb3 r53473f7  
    55# Generated config 
    66include/config.h 
     7version.hpp 
    78 
    89# Python 

  • build/cmake/functions.cmake

    r441a022 r53473f7  
    2020 
    2121 
    22 MACRO(copy_single_file alias src destDir) 
     22MACRO(copy_single_file src destDir) 
    2323  GET_FILENAME_COMPONENT(TARGET ${src} NAME) 
    2424  SET(source_file ${CMAKE_CURRENT_SOURCE_DIR}/${src}) 
    … …  
    3636    COMMENT Copying ${source_file} to ${target_file} 
    3737    ) 
    38   ADD_CUSTOM_TARGET(${TARGET}_${alias} ALL DEPENDS ${target_file}) 
    39   SET_TARGET_PROPERTIES(${TARGET}_${alias} PROPERTIES FOLDER "files/${alias}") 
    40   INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${destDir} TYPE EXECUTABLE FILES \"${source_file}\")") 
     38  SET(ALL_FILES ${ALL_FILES} ${target_file}) 
    4139ENDMACRO(copy_single_file) 
    4240 

  • changelog

    rfa11893 r53473f7  
    1717 * Fixed issue with missing performance data via NSCA 
    1818 * Fixed issue with hostnames beeing lowercase 
     19 
     202012-04-28 MickeM 
     21 * Changed how files are generated to reduce number of projcts 
    1922 
    20232012-04-12 MickeM 

  • docs/CMakeLists.txt

    r7ec3dd1 r53473f7  
    11cmake_minimum_required(VERSION 2.6) 
    22 
    3 copy_single_file(docs "Nagios Usage Guide.pdf" docs) 
    4 copy_single_file(docs "NSClient++ Reference Manual.pdf" docs) 
     3SET(ALL_FILES) 
     4copy_single_file("Nagios Usage Guide.pdf" docs) 
     5copy_single_file("NSClient++ Reference Manual.pdf" docs) 
     6 
     7ADD_CUSTOM_TARGET(copy_docs ALL DEPENDS ${ALL_FILES}) 
     8SET_TARGET_PROPERTIES(copy_docs PROPERTIES FOLDER "files") 
     9#INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${destDir} TYPE EXECUTABLE FILES \"${source_file}\")") 

  • files/CMakeLists.txt

    r7ec3dd1 r53473f7  
    11cmake_minimum_required(VERSION 2.6) 
    22 
    3 copy_single_file(files license.txt .) 
    4 copy_single_file(files nrpe_dh_512.pem security) 
    5 copy_single_file(files old-settings.map .) 
    6 copy_single_file(files counters.defs .) 
    7 copy_single_file(files ../changelog .) 
     3SET(ALL_FILES) 
     4copy_single_file(license.txt .) 
     5copy_single_file(nrpe_dh_512.pem security) 
     6copy_single_file(old-settings.map .) 
     7copy_single_file(counters.defs .) 
     8copy_single_file(../changelog .) 
     9 
     10ADD_CUSTOM_TARGET(copy_files ALL DEPENDS ${ALL_FILES}) 
     11SET_TARGET_PROPERTIES(copy_files PROPERTIES FOLDER "files") 
     12#INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${destDir} TYPE EXECUTABLE FILES \"${source_file}\")") 

  • scripts/CMakeLists.txt

    r83c2453 r53473f7  
    1313 
    1414SET(script_ALL ${scripts_BAT} ${scripts_VBS} ${scripts_PS1}) 
     15SET(ALL_FILES) 
     16 
     17 
    1518 
    1619FOREACH(file ${script_ALL}) 
    1720  get_filename_component(filename ${file} NAME) 
    1821  #MESSAGE(STATUS " + ${filename} (${file})") 
    19   copy_single_file(scripts ${filename} scripts) 
     22  copy_single_file(${filename} scripts) 
    2023ENDFOREACH(file ${script_ALL}) 
    2124 
    … …  
    2427  get_filename_component(filename ${file} NAME) 
    2528  #MESSAGE(STATUS " + lib - ${filename}") 
    26   copy_single_file("script lib" lib/${filename} scripts/lib) 
     29  copy_single_file(lib/${filename} scripts/lib) 
    2730ENDFOREACH(file ${scripts_LIB}) 
    2831 
    … …  
    3437  STRING(REPLACE "." "_" alias "${alias}") 
    3538  #MESSAGE(STATUS " + python - ${filename} - ${relpath} - ${alias}") 
    36   copy_single_file("python_${alias}" ${relpath}/${filename} scripts/${relpath}) 
     39  copy_single_file(${relpath}/${filename} scripts/${relpath}) 
    3740ENDFOREACH(file ${scripts_PYT}) 
    3841 
    … …  
    4043  get_filename_component(filename ${file} NAME) 
    4144  #MESSAGE(STATUS " + lua - ${filename}") 
    42   copy_single_file("script lua" lua/${filename} scripts/lua) 
     45  copy_single_file(lua/${filename} scripts/lua) 
    4346ENDFOREACH(file ${scripts_LUA}) 
     47 
     48ADD_CUSTOM_TARGET(copy_scripts ALL DEPENDS ${ALL_FILES}) 
     49SET_TARGET_PROPERTIES(copy_scripts PROPERTIES FOLDER "files") 
     50#INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${destDir} TYPE EXECUTABLE FILES \"${source_file}\")") 

  • version.txt

    rfa11893 r53473f7  
    1 version=0.4.0 
    2 build=170 
    3 date=2012-05-03 
     1version=0.4.1 
     2build=0 
     3date=2012-04-23 
Note: See TracChangeset for help on using the changeset viewer.