Ignore:
Timestamp:
2014-08-11T02:02:24+02:00 (12 years ago)
Author:
donvip
Message:

[josm_nsis] see #josm5302 - prepare ground for 64-bit binaries

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/nsis/josm.nsi

    r30517 r30580  
    66; If you get an error here, please update to at least NSIS 2.07!
    77SetCompressor /SOLID lzma
    8 
    9 !define DEST "josm"
    108
    119; Used to refresh the display of file association
    … …  
    4745!define MUI_WELCOMEPAGE_TEXT $(JOSM_WELCOME_TEXT)
    4846
    49 !define MUI_FINISHPAGE_RUN "$INSTDIR\josm.exe"
     47!define MUI_FINISHPAGE_RUN "$INSTDIR\${DEST}.exe"
    5048
    5149
    … …  
    267265WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "DisplayName" "JOSM ${VERSION}"
    268266WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "UninstallString" '"$INSTDIR\uninstall.exe"'
    269 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "Publisher" "The OpenStreetMap developer community, http://www.openstreetmap.org/"
    270 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "HelpLink" "mailto:newbies@openstreetmap.org."
    271 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "URLInfoAbout" "http://www.openstreetmap.org/"
    272 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "URLUpdateInfo" "http://wiki.openstreetmap.org/index.php/JOSM"
     267WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "Publisher" "The OpenStreetMap JOSM developers team, https://josm.openstreetmap.de"
     268WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "HelpLink" "mailto:josm-dev@openstreetmap.org."
     269WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "URLInfoAbout" "https://josm.openstreetmap.de"
     270WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "URLUpdateInfo" "https://josm.openstreetmap.de"
    273271WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "NoModify" 1
    274272WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "NoRepair" 1
    … …  
    276274
    277275; Write an entry for ShellExecute
    278 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\josm.exe" "" '$INSTDIR\josm.exe'
    279 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\josm.exe" "Path" '$INSTDIR'
     276WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${DEST}.exe" "" '$INSTDIR\${DEST}.exe'
     277WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${DEST}.exe" "Path" '$INSTDIR'
    280278
    281279SectionEnd ; "Required"
    … …  
    286284SectionIn 1
    287285SetOutPath $INSTDIR
    288 File "josm.exe"
     286File "${DEST}.exe"
    289287File "josm-tested.jar"
    290288
    … …  
    328326; To quote "http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwue/html/ch11d.asp":
    329327; "Do not include Readme, Help, or Uninstall entries on the Programs menu."
    330 CreateShortCut "$SMPROGRAMS\JOSM.lnk" "$INSTDIR\josm.exe" "" "$INSTDIR\josm.exe" 0 "" "" $(JOSM_LINK_TEXT)
     328CreateShortCut "$SMPROGRAMS\JOSM.lnk" "$INSTDIR\${DEST}.exe" "" "$INSTDIR\${DEST}.exe" 0 "" "" $(JOSM_LINK_TEXT)
    331329SectionEnd
    332330
    … …  
    335333; Create desktop icon
    336334; Desktop icon for a program should not be installed as default!
    337 CreateShortCut "$DESKTOP\JOSM.lnk" "$INSTDIR\josm.exe" "" "$INSTDIR\josm.exe" 0 "" "" $(JOSM_LINK_TEXT)
     335CreateShortCut "$DESKTOP\JOSM.lnk" "$INSTDIR\${DEST}.exe" "" "$INSTDIR\${DEST}.exe" 0 "" "" $(JOSM_LINK_TEXT)
    338336SectionEnd
    339337
    … …  
    342340; Create quick launch icon. Does not really exist as of Windows 7/8 but still advanced users use it.
    343341; Only disable it by default, see #10241
    344 CreateShortCut "$QUICKLAUNCH\JOSM.lnk" "$INSTDIR\josm.exe" "" "$INSTDIR\josm.exe" 0 "" "" $(JOSM_LINK_TEXT)
     342CreateShortCut "$QUICKLAUNCH\JOSM.lnk" "$INSTDIR\${DEST}.exe" "" "$INSTDIR\${DEST}.exe" 0 "" "" $(JOSM_LINK_TEXT)
    345343SectionEnd
    346344
    … …  
    350348; Create File Extensions
    351349WriteRegStr HKCR ${OSM_ASSOC} "" "OpenStreetMap data"
    352 WriteRegStr HKCR "${OSM_ASSOC}\Shell\open\command" "" '"$INSTDIR\josm.exe" "%1"'
    353 WriteRegStr HKCR "${OSM_ASSOC}\DefaultIcon" "" '"$INSTDIR\josm.exe",0'
     350WriteRegStr HKCR "${OSM_ASSOC}\Shell\open\command" "" '"$INSTDIR\${DEST}.exe" "%1"'
     351WriteRegStr HKCR "${OSM_ASSOC}\DefaultIcon" "" '"$INSTDIR\${DEST}.exe",0'
    354352push $R0
    355353        StrCpy $R0 ".osm"
    … …  
    394392        Abort $(un.JOSM_IN_USE_ERROR)
    395393NoJOSMErrorMsg:
    396 Delete "$INSTDIR\josm.exe"
     394Delete "$INSTDIR\${DEST}.exe"
    397395Delete "$INSTDIR\imageformats\qjpeg4.dll"
    398396RMDir "$INSTDIR\imageformats"
    … …  
    406404
    407405DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM"
    408 DeleteRegKey HKEY_LOCAL_MACHINE "Software\josm.exe"
    409 DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\josm.exe"
     406DeleteRegKey HKEY_LOCAL_MACHINE "Software\${DEST}.exe"
     407DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${DEST}.exe"
    410408
    411409; Remove Language preference info
Note: See TracChangeset for help on using the changeset viewer.