Changeset 7844 in josm for trunk

Timestamp:

2014-12-20T02:08:35+01:00 (9 years ago)

Author:

Don-vip

Message:

fix windows installer script

Location:

trunk/windows

Files:

• josm-setup-unix.sh (modified) (2 diffs)
• josm.nsi (modified) (1 diff)

trunk/windows/josm-setup-unix.sh

@@ -12 +12 @@
 # wget http://softlayer-ams.dl.sourceforge.net/project/launch4j/launch4j-3/3.5/launch4j-3.5-linux.tgz
 # and unpack it to /usr/share/launch4j
+#
+# On Debian/Ubuntu 64bits, follow then this procedure
+# http://sourceforge.net/p/launch4j/feature-requests/74/#2051
+# if you get this error: launch4j: net.sf.launch4j.ExecException: java.io.IOException: 
+#   Cannot run program "/usr/share/launch4j/bin/windres": error=2, No such file or directory
 
 ## settings ##
@@ -79 +84 @@
     fi
 fi
-#mkdir -p webkit-image
-#cd webkit-image
 unzip -o webkit-image.zip
-#cd ..
 
 echo 

trunk/windows/josm.nsi

@@ -297 +297 @@
 SetShellVarContext current
 SetOutPath $APPDATA\JOSM\plugins
-File "..\dist\turnrestrictions.jar"
+File "..\..\dist\turnrestrictions.jar"
 StrCpy $plugins "$plugins<entry value='turnrestrictions'/>"
 SectionEnd