Changeset 5177


Ignore:
Timestamp:
10/27/11 13:32:25 (2 years ago)
Author:
jdsiiro
Message:

Fixing weirdness with NSIS variable definitions

  • removing BUILD_DATE_TYPE (it was never set!)
  • standardizing definition of installer name
Location:
dist/nsis
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • dist/nsis/attributes.nsh

    r4267 r5177  
    55 */ 
    66 
     7!if "${BUILD_TYPE}" != "" 
    78Name "${PRODUCT_NAME} ${PRODUCT_VERSION} ${BUILD_TYPE}" 
     9!else 
     10Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" 
     11!endif 
     12 
    813Caption "${PRODUCT_NAME} Installer" 
    914 
    10 !if "${BUILD_DATE}" != "" 
    11 OutFile "${PRODUCT_NAME}_${PRODUCT_VERSION}_${BUILD_DATE}_setup.exe" 
    12 !else 
    13 OutFile "${PRODUCT_NAME}_${PRODUCT_VERSION}_setup.exe" 
    14 !endif  
     15OutFile "${PRODUCT_INSTALLER}" 
    1516 
    1617; Icon "icons\coopr_inst.ico" 
  • dist/nsis/declarations.nsh

    r4394 r5177  
    1818  !define BUILD_TYPE "" 
    1919!endif 
     20 
    2021!define PRODUCT_NAME "Coopr" 
    2122!define PRODUCT_STRING "Coopr" 
     
    2425!define PRODUCT_WEB_SITE "https://software.sandia.gov/coopr" 
    2526 
    26 !define PRODUCT_INSTALLER "${PRODUCT_NAME}_${PRODUCT_VERSION}${BUILD_DATE_TYPE}_setup.exe" 
     27!if "${BUILD_DATE}" != "" 
     28!define PRODUCT_INSTALLER "${PRODUCT_NAME}_${PRODUCT_VERSION}_${BUILD_DATE}_setup.exe" 
     29!else 
     30!define PRODUCT_INSTALLER "${PRODUCT_NAME}_${PRODUCT_VERSION}_setup.exe" 
     31!endif  
    2732!define PRODUCT_UNINST_ROOT_KEY "HKLM" 
    2833!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME_LOWER_CASE}" 
     34 
    2935 
    3036# ---------------------------------------------------------------------------- 
  • dist/nsis/registry.nsh

    r4399 r5177  
    2525 
    2626  WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${PRODUCT_STRING}" "" "$INSTDIR" 
    27   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name) ${BUILD_DATE_TYPE} (remove only)" 
     27  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name) ${BUILD_DATE} (remove only)" 
    2828  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" 
    2929  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" 
Note: See TracChangeset for help on using the changeset viewer.