Changeset 3771 in osm

Timestamp:

2007-07-27T02:22:07+02:00 (17 years ago)

Author:

ulf

Message:

update files according to the recent dir move

Location:

applications/editors/josm/nsis

Files:

• josm-setup.sh (moved) (moved from applications/editors/josm/nsis/openstreetmap-setup.sh ) (3 diffs)
• josm.nsi (moved) (moved from applications/editors/josm/nsis/openstreetmap.nsi ) (10 diffs)
• openstreetmap-setup-0.0.8.exe (deleted)

applications/editors/josm/nsis/josm-setup.sh

@@ -3 +3 @@
 ## settings ##
 
-VERSION=0.0.8
+VERSION=0.0.9
 
 PROGRAM_FILES="/cygdrive/c/Program Files"
 
-LAUNCH4J_XML="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\proj\gps\osm\svn.openstreetmap.org\applications\nsis\launch4j.xml"
+LAUNCH4J_XML="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\svn.openstreetmap.org\applications\editors\josm\nsis\launch4j.xml"
 
 
@@ -20 +20 @@
 
 # get latest plugin (and supporting files) versions
-cp ../../editors/josm/plugins/mappaint/mappaint.jar .
-cp ../../editors/josm/plugins/namefinder/namefinder.jar .
-#cp ../../editors/josm/plugins/osmarender/osmarender.jar .
-#cp ../../editors/josm/plugins/annotation-tester/annotation-tester.jar .
-#cp ../../editors/josm/plugins/wmsplugin/wmsplugin.jar .
+cp ../../plugins/mappaint/mappaint.jar .
+cp ../../plugins/namefinder/namefinder.jar .
+#cp ../../plugins/osmarender/osmarender.jar .
+#cp ../../plugins/annotation-tester/annotation-tester.jar .
+#cp ../../plugins/wmsplugin/wmsplugin.jar .
 
 # wget -nc http://svn.openstreetmap.org/applications/editors/josm/plugins/mappaint/mappaint.jar
@@ -43 +43 @@
 ### create the installer exe ###
 # NSIS - http://nsis.sourceforge.net/Main_Page
-"$PROGRAM_FILES/nsis/makensis.exe" /DVERSION=$VERSION openstreetmap.nsi
+"$PROGRAM_FILES/nsis/makensis.exe" /DVERSION=$VERSION josm.nsi

applications/editors/josm/nsis/josm.nsi

@@ -1 +1 @@
 ;
-; openstreetmap.nsi
+; josm.nsi
 ;
 
@@ -14 +14 @@
 !include "INIStrNS.nsh"
 
-!define DEST "openstreetmap"
-
-InstType "OpenStreetMap (full install)"
+!define DEST "josm"
+
+InstType "JOSM (full install)"
 
 InstType "un.Default (keep Personal Settings and plugins)"
@@ -32 +32 @@
 ; ============================================================================
 ; The name of the installer
-!define PROGRAM_NAME "OpenStreetMap"
+!define PROGRAM_NAME "JOSM"
 
 Name "${PROGRAM_NAME} ${VERSION}"
@@ -40 +40 @@
 
 ; Uninstall stuff (NSIS 2.08: "\r\n" don't work here)
-!define MUI_UNCONFIRMPAGE_TEXT_TOP "The following OpenStreetMap installation will be uninstalled. Click 'Next' to continue."
+!define MUI_UNCONFIRMPAGE_TEXT_TOP "The following JAVA OpenStreetMap editor (JOSM) installation will be uninstalled. Click 'Next' to continue."
 
 XPStyle on
@@ -60 +60 @@
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenStreetMap.\r\n\r\nBefore starting the installation, make sure any OpenStreetMap applications are not running.\r\n\r\nClick 'Next' to continue."
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of the JAVA OpenStreetMap editor (JOSM).\r\n\r\nBefore starting the installation, make sure any JOSM applications are not running.\r\n\r\nClick 'Next' to continue."
 ;!define MUI_FINISHPAGE_LINK "Install WinPcap to be able to capture packets from a network!"
 ;!define MUI_FINISHPAGE_LINK_LOCATION "http://www.winpcap.org"
@@ -157 +157 @@
 
 ; The default installation directory
-InstallDir $PROGRAMFILES\OpenStreetMap\
+InstallDir $PROGRAMFILES\JOSM\
 
 ; See if this is an upgrade; if so, use the old InstallDir as default
-InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\OpenStreetMap "InstallDir"
+InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\JOSM "InstallDir"
 
 
@@ -194 +194 @@
         Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE}
 UpdateIcons.error2_${UPDATEICONS_UNIQUE}:
-        MessageBox MB_OK|MB_ICONINFORMATION "You should install the free 'Microsoft Layer for Unicode' to update OpenStreetMap file icons"
+        MessageBox MB_OK|MB_ICONINFORMATION "You should install the free 'Microsoft Layer for Unicode' to update JOSM file icons"
         Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE}
 UpdateIcons.quit_${UPDATEICONS_UNIQUE}:
@@ -206 +206 @@
 ; associate a file extension to an icon
 Function Associate
-        ; $R0 should contain the prefix to associate to OpenStreetMap
+        ; $R0 should contain the prefix to associate to JOSM
         Push $R1
 
@@ -228 +228 @@
         Goto un.unlink.end
 un.unlink.doUnlink:
-        ; The extension is associated with OpenStreetMap so, we must destroy this!
+        ; The extension is associated with JOSM so, we must destroy this!
         DeleteRegKey HKCR $R0
 un.unlink.end:
@@ -261 +261 @@
 ; Write the uninstall keys for Windows
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "DisplayVersion" "${VERSION}"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "DisplayName" "OpenStreetMap ${VERSION}"
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "DisplayName" "JOSM ${VERSION}"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "UninstallString" '"$INSTDIR\uninstall.exe"'
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "Publisher" "The OpenStreetMap developer community, http://www.openstreetmap.org/"