[Cmake-commits] [cmake-commits] david.cole committed CPack.cmake 1.43 1.44 NSIS.template.in 1.36 1.37

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv15338

Modified Files:
	CPack.cmake NSIS.template.in 
Log Message:
BUG: Re-fix issue #8682. Use new variable CPACK_NSIS_PACKAGE_NAME in appropriate places rather than CPACK_NSIS_DISPLAY_NAME. CPACK_NSIS_DISPLAY_NAME is the Add/Remove control panel's description string for the installed package. Using it as the "Name" of the NSIS installer package made the CMake installer itself use really long strings in the installer GUI. This fix still allows for the original intent of the first fix for #8682 -- the ability to separate the installer name from the default install directory, but it uses a new/different variable to achieve the separation.


Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** NSIS.template.in	7 Apr 2009 19:31:51 -0000	1.36
--- NSIS.template.in	16 Jul 2009 15:48:30 -0000	1.37
***************
*** 32,36 ****
  
    ;Name and file
!   Name "@CPACK_NSIS_DISPLAY_NAME@"
    OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
  
--- 32,36 ----
  
    ;Name and file
!   Name "@CPACK_NSIS_PACKAGE_NAME@"
    OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
  
***************
*** 702,706 ****
  ; Create custom pages
  Function InstallOptionsPage
!   !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_DISPLAY_NAME@"
    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
  
--- 702,706 ----
  ; Create custom pages
  Function InstallOptionsPage
!   !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@"
    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
  

Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** CPack.cmake	5 Mar 2009 15:08:03 -0000	1.43
--- CPack.cmake	16 Jul 2009 15:48:30 -0000	1.44
***************
*** 137,141 ****
  #   variable.
  #
! #   CPACK_NSIS_DISPLAY_NAME - The title displayed at the top of the
  #   installer.
  #
--- 137,144 ----
  #   variable.
  #
! #   CPACK_NSIS_DISPLAY_NAME - The display name string that appears in
! #   the Windows Add/Remove Program control panel
! #
! #   CPACK_NSIS_PACKAGE_NAME - The title displayed at the top of the
  #   installer.
  #
***************
*** 780,783 ****
--- 783,787 ----
  
  cpack_set_if_not_set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
+ cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
  
  cpack_set_if_not_set(CPACK_OUTPUT_CONFIG_FILE