Changeset 7ec3dd1 in nscp for helpers

Timestamp:

06/16/11 23:00:44 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

e11d494

Parents:

3bdaf18

Message:

various fixes and changes here and there
Mainly build related (been trying to fix symbol dumper problems) as well as tweaks for the up-coming "nightly release")

Location:

helpers/installers/installer

Files:

• CMakeLists.txt (modified) (4 diffs)
• Product.wxs (modified) (2 diffs)

helpers/installers/installer/CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required(VERSION 2.6)
 
-SET(TARGET nsclient_installer)
+SET(ALIAS NSCP)
+SET(TARGET ${ALIAS}_installer)
   
 PROJECT(${TARGET})
@@ -17 +18 @@
   nscp
   main_dll
+  
+  check_60s.bat_scripts
+  check_battery.vbs_scripts
+  check_files.vbs_scripts
+  check_long.bat_scripts
+  check_no_rdp.bat_scripts
+  check_ok.bat_scripts
+  check_ping.bat_scripts
+  check_printer.vbs_scripts
+  check_test.bat_scripts
+  check_test.ps1_scripts
+  check_test.vbs_scripts
+  check_updates.vbs_scripts
+  powershell.ps1_scripts
+  
+  "NagiosPlugins.vbs_script lib"
+  "wrapper.vbs_script lib"
+  
+  counters.defs_files
+  license.txt_files
+  nrpe_dh_512.pem_files
+  old-settings.map_files
+  changelog_files
+  
+  "Nagios Usage Guide.pdf_docs"
+  "NSClient++ Reference Manual.pdf_docs"
 )
 #GET_FILENAME_COMPONENT(_tmp_FILE WixUI_en-us.wxl ABSOLUTE)
@@ -24 +51 @@
 )
 
-#MESSAGE(STATUS "Wix source: ${SRCS}")
-#WIX_COMPILE(SRCS WIX_OBJS WixUI_en-us.wxl)
-#MESSAGE(STATUS "Wix obj: ${WIX_OBJS}")
-
-#SET (WIX_FULLOBJLIST ${WIXOBJ_LIST} )
-#SET (WIX_DEST ${TARGET}.msi)
-
-SET(ARCH Win32)
-IF(CMAKE_CL_64)
-  SET(ARCH x64)
-ENDIF(CMAKE_CL_64)
-
-
-SET(WIX_CANDLE_FLAGS -dboost=true -darch=${ARCH} -dVersion.Major=1 -dVersion.Minor=1 -dVersion.Revision=1 -dVersion.Build=1 
+SET(WIX_CANDLE_FLAGS -dboost=true -darch=${VERSION_ARCH} 
+  -dVersion.Major=${VERSION_SERIES} -dVersion.Minor=${VERSION_MAJOR} -dVersion.Revision=${VERSION_MINOR} -dVersion.Build=${VERSION_BUILD} 
   -dSource=${NSCP_PROJECT_BINARY_DIR} -dHelpers=${NSCP_PROJECT_BINARY_DIR}/installer-dlls
   )
@@ -44 +59 @@
   
 SOURCE_GROUP(Sources FILES ${SRCS})
-ADD_WIX_INSTALLER(${TARGET} "${SRCS}" "${DEPENDENCIES}" "${LOCALIZATIONS}")
+ADD_WIX_INSTALLER(${ALIAS} "${SRCS}" "${DEPENDENCIES}" "${LOCALIZATIONS}")
 
 ADD_DEPENDENCIES(${TARGET} ${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} ${ALL_INSTALLERS_DLLS_NAMES})

helpers/installers/installer/Product.wxs

@@ -11 +11 @@
     <?define ProgramFiles = "ProgramFilesFolder" ?>
     <?define Win64 = "no" ?>
-    <?define Plattform = "Intel" ?>
+    <?define Plattform = "x86" ?>
   <?endif?>
 
@@ -240 +240 @@
     <!-- ### Icons -->
     <Icon Id="nscp.exe" SourceFile="$(var.Source)/nscp.exe" />
-    <Icon Id="doc.ico" SourceFile="$(var.Source)/res/help.ico"/>
+    <Icon Id="doc.ico" SourceFile="../../../resources/help.ico"/>
   </Product>
 </Wix>