Mac Installer Tweaks

Improved display messages. Fixed "usage" size information. Generalised known executable list. Add version information to client tools install folder. Only fixes rpath for "make install" and "make package" Signed-off-by: Gordon Smith <[email protected]>
afishbeck · Jun 22, 2012 · 2ceb50a · 2ceb50a
1 parent 38ae22c
commit 2ceb50a
Show file tree

Hide file tree

Showing 75 changed files with 152 additions and 125 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,6 +121,7 @@ if ( NOT MAKE_DOCS_ONLY )
     HPCC_ADD_SUBDIRECTORY (thorlcr "PLATFORM")
 endif()
 HPCC_ADD_SUBDIRECTORY (docs "PLATFORM")
+HPCC_ADD_SUBDIRECTORY (lib2)
 
 ###
 ## CPack install and packaging setup.
@@ -279,6 +280,18 @@ else()
     message("WARNING: CMAKE 2.8.1 or later required to create RPMs from this project")
 endif()
 
+if (APPLE)
+    set ( CPACK_MONOLITHIC_INSTALL TRUE )
+    set ( CPACK_PACKAGE_VENDOR "HPCC Systems" )
+    file(WRITE "${PROJECT_BINARY_DIR}/welcome.txt" 
+        "HPCC Systems - Client Tools\r"
+        "===========================\r\r"
+        "This installer will install the HPCC Systems Client Tools.")
+    set ( CPACK_RESOURCE_FILE_README "${PROJECT_BINARY_DIR}/welcome.txt" )
+    set ( CPACK_RESOURCE_FILE_LICENSE "${HPCC_SOURCE_DIR}/${LICENSE_FILE}" )
+    set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HPCC Systems Client Tools." )
+endif()
+
 ###
 ## Below are the non-compile based install scripts required for
 ## the hpcc platform.

diff --git a/cmake_modules/commonSetup.cmake b/cmake_modules/commonSetup.cmake
@@ -171,6 +171,11 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     endif ()
   endif ()
 
+  macro(HPCC_ADD_EXECUTABLE target)
+    add_executable(${target} ${ARGN})
+    set (executables ${executables} ${target} CACHE INTERNAL "")
+  endmacro(HPCC_ADD_EXECUTABLE target)
+
   macro(HPCC_ADD_LIBRARY target)
     add_library(${target} ${ARGN})
   endmacro(HPCC_ADD_LIBRARY target)
@@ -473,68 +478,23 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   ###
   ## The following sets the install directories and names.
   ###
-  set ( OSSDIR "${DIR_NAME}" )
+  if ( PLATFORM )
+    set ( OSSDIR "${DIR_NAME}" )
+  else()
+    set ( OSSDIR "${DIR_NAME}/${version}/clienttools" )
+  endif()
   set ( CPACK_INSTALL_PREFIX "${PREFIX}" )
   set ( CPACK_PACKAGING_INSTALL_PREFIX "${PREFIX}" )
   set ( CMAKE_INSTALL_PREFIX "${PREFIX}" )
   SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
   SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OSSDIR}/lib")
   SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-  MACRO (FIXUP_MACPORTS apps dylibs)
-	foreach(dylib ${dylibs})
-		get_filename_component(dylib_path ${dylib} REALPATH)
-		install(PROGRAMS "${dylib_path}" DESTINATION "${OSSDIR}/lib2")
-	endforeach(dylib)
-	foreach(dylib ${dylibs})
-		get_filename_component(dylib_path ${dylib} REALPATH)
-		get_filename_component(dylib_name_ext ${dylib_path} NAME)
-		install(CODE "
-				execute_process(COMMAND install_name_tool -id \"@loader_path/../lib2/${dylib_name_ext}\" ${CMAKE_INSTALL_PREFIX}/${OSSDIR}/lib2/${dylib_name_ext})
-		" ) 
-		foreach(app ${apps})
-			#HACK HACK - Could be done generically with some REGEX?
-			string(REPLACE ".28.0.dylib" ".28.dylib" dylib_28_path "${dylib_path}")
-			string(REPLACE ".48.1.dylib" ".48.dylib" dylib_48_path "${dylib_path}")
-			install(CODE "
-				execute_process(COMMAND install_name_tool -change \"${dylib_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" ${EXECUTABLE_OUTPUT_PATH}/${app})
-				execute_process(COMMAND install_name_tool -change \"${dylib_28_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" ${EXECUTABLE_OUTPUT_PATH}/${app})
-				execute_process(COMMAND install_name_tool -change \"${dylib_48_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" ${EXECUTABLE_OUTPUT_PATH}/${app})
-			" ) 
-		endforeach(app)
-	endforeach(dylib)
-  ENDMACRO()
-
   if (APPLE)
-    SET(CMAKE_INSTALL_RPATH "@loader_path/../lib")
+    set(CMAKE_INSTALL_RPATH "@loader_path/../lib")
     set(CMAKE_INSTALL_NAME_DIR "@loader_path/../lib") 
-    set(APPS
-      "dafilesrv"
-      "dfuplus"
-      "ecl"
-      "ecl-package"
-      "ecl-queries"
-      "eclcc"
-      "eclplus"
-      "wuget"
-    )
-    set(DYLIBS)
-    if (USE_ICU)
-      set(DYLIBS ${DYLIBS} ${ICU_LIBRARIES})
-    endif ()
-    if (USE_BOOST_REGEX)
-      set(DYLIBS ${DYLIBS} ${BOOST_REGEX_LIBRARIES})
-    endif ()
-    if (USE_XALAN)
-      set(DYLIBS ${DYLIBS} ${XALAN_LIBRARIES})
-    endif ()
-    if (USE_XERCES)
-      set(DYLIBS ${DYLIBS} ${XERCES_LIBRARIES})
-    endif ()
-    FIXUP_MACPORTS("${APPS}" "${DYLIBS}")
   endif()
-  
+
   MACRO (FETCH_GIT_TAG workdir edition result)
       execute_process(COMMAND "${GIT_COMMAND}" describe --tags --dirty --abbrev=6 --match ${edition}*
         WORKING_DIRECTORY "${workdir}"

diff --git a/common/fileview2/CMakeLists.txt b/common/fileview2/CMakeLists.txt
@@ -107,7 +107,7 @@ set (    SRCS
 ADD_DEFINITIONS ( -D_CONSOLE )
 
 if( PLATFORM )
-    add_executable ( fvserver ${SRCS} )
+    HPCC_ADD_EXECUTABLE ( fvserver ${SRCS} )
     set_target_properties(fvserver PROPERTIES 
         COMPILE_FLAGS -D_CONSOLE
     )

diff --git a/common/monitoring/prosysinfo/CMakeLists.txt b/common/monitoring/prosysinfo/CMakeLists.txt
@@ -29,5 +29,5 @@ set (    SRCS
          main.cpp 
     )
 
-add_executable ( prosysinfo ${SRCS} )
+HPCC_ADD_EXECUTABLE ( prosysinfo ${SRCS} )
 install ( TARGETS prosysinfo DESTINATION ${OSSDIR}/bin )
diff --git a/dali/dafilesrv/dafilesrv.cmake b/dali/dafilesrv/dafilesrv.cmake
@@ -39,7 +39,7 @@ if (WIN32)
     set (CMAKE_EXE_LINKER_FLAGS "/STACK:65536 ${CMAKE_EXE_LINKER_FLAGS}")
 endif()
 
-add_executable ( dafilesrv ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dafilesrv ${SRCS} )
 set_target_properties (dafilesrv PROPERTIES COMPILE_FLAGS -D_CONSOLE)
 install ( TARGETS dafilesrv DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( dafilesrv

diff --git a/dali/dafilesrv/dafscontrol.cmake b/dali/dafilesrv/dafscontrol.cmake
@@ -40,7 +40,7 @@ include_directories (
          ./../../common/environment 
     )
 
-add_executable ( dafscontrol ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dafscontrol ${SRCS} )
 set_target_properties (dafscontrol PROPERTIES COMPILE_FLAGS -D_CONSOLE)
 install ( TARGETS dafscontrol DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( dafscontrol  

diff --git a/dali/daliadmin/CMakeLists.txt b/dali/daliadmin/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( daliadmin ${SRCS} )
+HPCC_ADD_EXECUTABLE ( daliadmin ${SRCS} )
 install ( TARGETS daliadmin DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( daliadmin  
          jlib

diff --git a/dali/dalidiag/CMakeLists.txt b/dali/dalidiag/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( dalidiag ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dalidiag ${SRCS} )
 install ( TARGETS dalidiag DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( dalidiag 
          jlib

diff --git a/dali/dalistop/CMakeLists.txt b/dali/dalistop/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( dalistop ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dalistop ${SRCS} )
 install ( TARGETS dalistop DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( dalistop 
          jlib

diff --git a/dali/datest/datest.cmake b/dali/datest/datest.cmake
@@ -37,7 +37,7 @@ include_directories (
          ./../../system/jlib 
     )
 
-add_executable ( datest ${SRCS} )
+HPCC_ADD_EXECUTABLE ( datest ${SRCS} )
 set_target_properties (datest PROPERTIES COMPILE_FLAGS -D_CONSOLE)
 target_link_libraries ( datest 
          jlib

diff --git a/dali/datest/dfuwutest.cmake b/dali/datest/dfuwutest.cmake
@@ -41,7 +41,7 @@ include_directories (
          ../../common/environment 
     )
 
-add_executable ( dfuwutest ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dfuwutest ${SRCS} )
 set_target_properties (dfuwutest PROPERTIES COMPILE_FLAGS -D_CONSOLE)
 target_link_libraries ( dfuwutest
          workunit

diff --git a/dali/daunittest/CMakeLists.txt b/dali/daunittest/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( daunittest ${SRCS} )
+HPCC_ADD_EXECUTABLE ( daunittest ${SRCS} )
 target_link_libraries ( daunittest
          jlib
          mp 

diff --git a/dali/dfu/dfuserver.cmake b/dali/dfu/dfuserver.cmake
@@ -48,7 +48,7 @@ include_directories (
          ./../../common/workunit 
     )
 
-add_executable ( dfuserver ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dfuserver ${SRCS} )
 set_target_properties ( dfuserver PROPERTIES 
         COMPILE_FLAGS "-D_CONSOLE -D_DFUSERVER"
         )

diff --git a/dali/dfuplus/CMakeLists.txt b/dali/dfuplus/CMakeLists.txt
@@ -57,7 +57,7 @@ set_source_files_properties (dfuplus.cpp PROPERTIES COMPILE_FLAGS -DDAFILESRV_LO
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( dfuplus ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dfuplus ${SRCS} )
 add_dependencies ( dfuplus espscm )
 install ( TARGETS dfuplus DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( dfuplus

diff --git a/dali/dfuxref/CMakeLists.txt b/dali/dfuxref/CMakeLists.txt
@@ -44,7 +44,7 @@ include_directories (
 
 ADD_DEFINITIONS ( -D_CONSOLE -DMAIN_DFUXREF )
 
-add_executable ( dfuxref ${SRCS} )
+HPCC_ADD_EXECUTABLE ( dfuxref ${SRCS} )
 install ( TARGETS dfuxref DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( dfuxref 
          jlib

diff --git a/dali/ft/ftslave.cmake b/dali/ft/ftslave.cmake
@@ -37,7 +37,7 @@ include_directories (
          ./../../system/jlib 
     )
 
-add_executable ( ftslave ${SRCS} )
+HPCC_ADD_EXECUTABLE ( ftslave ${SRCS} )
 set_target_properties (ftslave PROPERTIES COMPILE_FLAGS -D_CONSOLE)
 install ( TARGETS ftslave DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( ftslave

diff --git a/dali/hellodali/CMakeLists.txt b/dali/hellodali/CMakeLists.txt
@@ -41,7 +41,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( hellodali ${SRCS} )
+HPCC_ADD_EXECUTABLE ( hellodali ${SRCS} )
 install ( TARGETS hellodali DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( hellodali
          jlib

diff --git a/dali/regress/CMakeLists.txt b/dali/regress/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( daregress ${SRCS} )
+HPCC_ADD_EXECUTABLE ( daregress ${SRCS} )
 install ( TARGETS daregress DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( daregress  
          jlib

diff --git a/dali/sasha/CMakeLists.txt b/dali/sasha/CMakeLists.txt
@@ -68,7 +68,7 @@ if (WIN32)
     endif ()
 endif()
 
-add_executable ( saserver ${SRCS} )
+HPCC_ADD_EXECUTABLE ( saserver ${SRCS} )
 install ( TARGETS saserver DESTINATION ${OSSDIR}/bin)
 
 
@@ -103,7 +103,7 @@ include_directories (
 
 ADD_DEFINITIONS ( -D_CONSOLE )
 
-add_executable ( sasha ${SRCS} )
+HPCC_ADD_EXECUTABLE ( sasha ${SRCS} )
 install ( TARGETS sasha DESTINATION ${OSSDIR}/bin)
 
 target_link_libraries ( sasha 

diff --git a/dali/server/CMakeLists.txt b/dali/server/CMakeLists.txt
@@ -53,7 +53,7 @@ if (WIN32)
     endif ()
 endif()
 
-add_executable ( daserver ${SRCS} )
+HPCC_ADD_EXECUTABLE ( daserver ${SRCS} )
 install ( TARGETS daserver DESTINATION ${OSSDIR}/bin)
 target_link_libraries ( daserver 
          jlib

diff --git a/dali/treeview/CMakeLists.txt b/dali/treeview/CMakeLists.txt
@@ -45,7 +45,7 @@ if (WIN32)
         )
 
     add_definitions("-D_AFXDLL")
-    add_executable ( treeview WIN32 ${SRCS} )
+    HPCC_ADD_EXECUTABLE ( treeview WIN32 ${SRCS} )
     install ( TARGETS treeview DESTINATION ${OSSDIR}/bin )
     target_link_libraries ( treeview
              jlib

diff --git a/dali/updtdalienv/CMakeLists.txt b/dali/updtdalienv/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( updtdalienv ${SRCS} )
+HPCC_ADD_EXECUTABLE ( updtdalienv ${SRCS} )
 install ( TARGETS updtdalienv DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( updtdalienv  
          jlib

diff --git a/deployment/configgen/CMakeLists.txt b/deployment/configgen/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories (
 
 ADD_DEFINITIONS ( -D_CONSOLE )
 
-add_executable ( configgen ${SRCS} )
+HPCC_ADD_EXECUTABLE ( configgen ${SRCS} )
 install ( TARGETS configgen DESTINATION ${OSSDIR}/sbin )
 target_link_libraries ( configgen 
         deploy 

diff --git a/deployment/envgen/CMakeLists.txt b/deployment/envgen/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories (
 
 ADD_DEFINITIONS ( -D_CONSOLE )
 
-add_executable ( envgen ${SRCS} )
+HPCC_ADD_EXECUTABLE ( envgen ${SRCS} )
 install ( TARGETS envgen DESTINATION ${OSSDIR}/sbin )
 target_link_libraries ( envgen 
         deploy

diff --git a/ecl/agentexec/CMakeLists.txt b/ecl/agentexec/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( agentexec ${SRCS} )
+HPCC_ADD_EXECUTABLE ( agentexec ${SRCS} )
 install ( TARGETS agentexec DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( agentexec
          jlib 

diff --git a/ecl/agentexec/agentexec.cmake b/ecl/agentexec/agentexec.cmake
@@ -44,7 +44,7 @@ include_directories (
 
 ADD_DEFINITIONS ( -D_CONSOLE )
 
-add_executable ( agentexec ${SRCS} )
+HPCC_ADD_EXECUTABLE ( agentexec ${SRCS} )
 install ( TARGETS agentexec DESTINATION ${OSSDIR}/bin )
 
 target_link_libraries ( agentexec

diff --git a/ecl/ecl-package/CMakeLists.txt b/ecl/ecl-package/CMakeLists.txt
@@ -41,7 +41,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( ecl-package ${SRCS} )
+HPCC_ADD_EXECUTABLE ( ecl-package ${SRCS} )
 add_dependencies ( ecl-package espscm ws_packageprocess )
 install ( TARGETS ecl-package DESTINATION ${DIR_NAME}/bin )
 target_link_libraries ( ecl-package

diff --git a/ecl/eclagent/CMakeLists.txt b/ecl/eclagent/CMakeLists.txt
@@ -41,7 +41,7 @@ include_directories (
 
 ADD_DEFINITIONS( -DNO_SYBASE -D_CONSOLE )
 
-add_executable ( eclagent ${SRCS} )
+HPCC_ADD_EXECUTABLE ( eclagent ${SRCS} )
 install ( TARGETS eclagent DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( eclagent
       hthor           

diff --git a/ecl/eclcc/CMakeLists.txt b/ecl/eclcc/CMakeLists.txt
@@ -51,7 +51,7 @@ if (WIN32)
     set (CMAKE_EXE_LINKER_FLAGS "/STACK:10000000 ${CMAKE_EXE_LINKER_FLAGS}")
 endif()
 
-add_executable ( eclcc ${SRCS} )
+HPCC_ADD_EXECUTABLE ( eclcc ${SRCS} )
 install ( TARGETS eclcc DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( eclcc 
          jlib

diff --git a/ecl/eclccserver/CMakeLists.txt b/ecl/eclccserver/CMakeLists.txt
@@ -45,7 +45,7 @@ include_directories (
          ./../../system/jlib 
     )
 
-add_executable ( eclccserver ${SRCS} ${INCLUDES} )
+HPCC_ADD_EXECUTABLE ( eclccserver ${SRCS} ${INCLUDES} )
 install ( TARGETS eclccserver DESTINATION ${OSSDIR}/bin )
 
 target_link_libraries ( eclccserver 

diff --git a/ecl/eclcmd/CMakeLists.txt b/ecl/eclcmd/CMakeLists.txt
@@ -65,7 +65,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( ecl ${SRCS} )
+HPCC_ADD_EXECUTABLE ( ecl ${SRCS} )
 add_dependencies ( ecl espscm workunit ws_workunits )
 install ( TARGETS ecl DESTINATION ${OSSDIR}/bin )
 target_link_libraries ( ecl

diff --git a/ecl/eclcmd/queries/CMakeLists.txt b/ecl/eclcmd/queries/CMakeLists.txt
@@ -41,7 +41,7 @@ include_directories (
 
 ADD_DEFINITIONS( -D_CONSOLE )
 
-add_executable ( ecl-queries ${SRCS} )
+HPCC_ADD_EXECUTABLE ( ecl-queries ${SRCS} )
 add_dependencies ( ecl-queries espscm ws_workunits )
 install ( TARGETS ecl-queries DESTINATION ${DIR_NAME}/bin )
 target_link_libraries ( ecl-queries