Changeset 17700 in osm

Timestamp:

2009-09-19T23:59:00+02:00 (15 years ago)

Author:

ulf

Message:

As there were some discussion about the windows installer:
Instead of integrating the josm jar file into the josm.exe file, install it as a separate file.
This way it might be easier for others to understand what the installer is doing.

Location:

applications/editors/josm/nsis

Files:

• josm.nsi (modified) (2 diffs)
• launch4j.xml (modified) (1 diff)
• locale/english.nsh (modified) (1 diff)
• locale/german.nsh (modified) (1 diff)

applications/editors/josm/nsis/josm.nsi

@@ -288 +288 @@
 SetOutPath $INSTDIR
 File "josm.exe"
+File "..\core\dist\josm-custom.jar"
 
 ; XXX - should be provided/done by josm.jar itself and not here!
@@ -427 +428 @@
 SetShellVarContext current
 
-Delete "$INSTDIR\josm.exe"
+Delete "$INSTDIR\josm-custom.jar"
 IfErrors 0 NoJOSMErrorMsg
-        MessageBox MB_OK $(un.JOSM_IN_USE_ERROR) IDOK 0 ;skipped if josm.exe removed
+        MessageBox MB_OK $(un.JOSM_IN_USE_ERROR) IDOK 0 ;skipped if josm.jar removed
         Abort $(un.JOSM_IN_USE_ERROR)
 NoJOSMErrorMsg:
+Delete "$INSTDIR\josm.exe"
 Delete "$INSTDIR\imageformats\qjpeg4.dll"
 RMDir "$INSTDIR\imageformats"

applications/editors/josm/nsis/launch4j.xml

@@ -1 +1 @@
 <launch4jConfig>
-  <dontWrapJar>false</dontWrapJar>
+  <dontWrapJar>true</dontWrapJar>
   <headerType>0</headerType>
-  <jar>../core/dist/josm-custom.jar</jar>
+  <jar>josm-custom.jar</jar>
   <outfile>josm.exe</outfile>
   <errTitle></errTitle>

applications/editors/josm/nsis/locale/english.nsh

@@ -48 +48 @@
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_FULL_UNINSTALL "All (remove all)"
 
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Please note: josm.exe could not be removed, it's probably in use!"
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Please note: josm could not be removed, it's probably in use!"
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_INSTDIR_ERROR "Please note: The directory $INSTDIR could not be removed!"
 

applications/editors/josm/nsis/locale/german.nsh

@@ -45 +45 @@
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_FULL_UNINSTALL "Alles (alles entfernen)"
 
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Achtung: josm.exe konnte nicht entfernt werden, möglicherweise wird es noch benutzt!"
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Achtung: josm konnte nicht entfernt werden, möglicherweise wird es noch benutzt!"
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_INSTDIR_ERROR "Achtung: Das Verzeichnis $INSTDIR konnte nicht entfernt werden!"