Changeset 16239 in josm

Timestamp:

2020-04-06T02:17:07+02:00 (5 years ago)

Author:

Don-vip

Message:

see #18845 - adapt relative paths in Windows installer scripts

Location:

trunk/native/windows

Files:

• josm-setup-unix.sh (modified) (3 diffs)
• josm.nsi (modified) (3 diffs)

trunk/native/windows/josm-setup-unix.sh

@@ -59 +59 @@
 else
   # no argument: for everyone else
-  svncorerevision=`svnversion -n ..`
-  #svnpluginsrevision=`svnversion -n ../../plugins`
+  svncorerevision=`svnversion -n ../..`
+  #svnpluginsrevision=`svnversion -n ../../../plugins`
   #svnrevision="$svncorerevision-$svnpluginsrevision"
 
@@ -66 +66 @@
   export VERSION=`echo ${svncorerevision} | sed -e 's/M//g' -e 's/S//g' -e 's/P//g'`
   export JOSM_BUILD="yes"
-  export JOSM_FILE="..\dist\josm-custom.jar"
+  export JOSM_FILE="..\..\dist\josm-custom.jar"
 fi
 
@@ -77 +77 @@
     (
         echo "Build the Complete josm Stuff"
-        
+
         echo "Compile Josm"
-        cd ../core
+        cd ../..
         ant -q clean
         ant -q compile || exit -1
         cd ..
-        
+
         echo "Compile Josm Plugins"
         cd plugins

trunk/native/windows/josm.nsi

@@ -64 +64 @@
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
+!insertmacro MUI_PAGE_LICENSE "..\..\LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
@@ -297 +297 @@
 SetShellVarContext current
 SetOutPath $APPDATA\JOSM\plugins
-File "../../dist/imagery_offset_db.jar"
+File "../../../dist/imagery_offset_db.jar"
 StrCpy $plugins "$plugins<entry value='imagery_offset_db'/>"
 SectionEnd
@@ -306 +306 @@
 SetShellVarContext current
 SetOutPath $APPDATA\JOSM\plugins
-File "../../dist/turnrestrictions.jar"
+File "../../../dist/turnrestrictions.jar"
 StrCpy $plugins "$plugins<entry value='turnrestrictions'/>"
 SectionEnd