Changeset 16239 in josm


Ignore:
Timestamp:
2020-04-06T02:17:07+02:00 (2 months ago)
Author:
Don-vip
Message:

see #18845 - adapt relative paths in Windows installer scripts

Location:
trunk/native/windows
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/native/windows/josm-setup-unix.sh

    r13722 r16239  
    5959else
    6060  # no argument: for everyone else
    61   svncorerevision=`svnversion -n ..`
    62   #svnpluginsrevision=`svnversion -n ../../plugins`
     61  svncorerevision=`svnversion -n ../..`
     62  #svnpluginsrevision=`svnversion -n ../../../plugins`
    6363  #svnrevision="$svncorerevision-$svnpluginsrevision"
    6464
     
    6666  export VERSION=`echo ${svncorerevision} | sed -e 's/M//g' -e 's/S//g' -e 's/P//g'`
    6767  export JOSM_BUILD="yes"
    68   export JOSM_FILE="..\dist\josm-custom.jar"
     68  export JOSM_FILE="..\..\dist\josm-custom.jar"
    6969fi
    7070
     
    7777    (
    7878        echo "Build the Complete josm Stuff"
    79        
     79
    8080        echo "Compile Josm"
    81         cd ../core
     81        cd ../..
    8282        ant -q clean
    8383        ant -q compile || exit -1
    8484        cd ..
    85        
     85
    8686        echo "Compile Josm Plugins"
    8787        cd plugins
  • trunk/native/windows/josm.nsi

    r15915 r16239  
    6464
    6565!insertmacro MUI_PAGE_WELCOME
    66 !insertmacro MUI_PAGE_LICENSE "..\LICENSE"
     66!insertmacro MUI_PAGE_LICENSE "..\..\LICENSE"
    6767!insertmacro MUI_PAGE_COMPONENTS
    6868!insertmacro MUI_PAGE_DIRECTORY
     
    297297SetShellVarContext current
    298298SetOutPath $APPDATA\JOSM\plugins
    299 File "../../dist/imagery_offset_db.jar"
     299File "../../../dist/imagery_offset_db.jar"
    300300StrCpy $plugins "$plugins<entry value='imagery_offset_db'/>"
    301301SectionEnd
     
    306306SetShellVarContext current
    307307SetOutPath $APPDATA\JOSM\plugins
    308 File "../../dist/turnrestrictions.jar"
     308File "../../../dist/turnrestrictions.jar"
    309309StrCpy $plugins "$plugins<entry value='turnrestrictions'/>"
    310310SectionEnd
Note: See TracChangeset for help on using the changeset viewer.