Changeset 5214 in osm


Ignore:
Timestamp:
2007-10-28T15:50:35+01:00 (17 years ago)
Author:
ulf
Message:

remove the need for a downloads dir, as we download nothing and get all files from the subversion directory directly

Location:
applications/editors/josm/nsis
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r5204 r5214  
    2020
    2121#export VERSION=latest
    22 export VERSION=custom-${svnrevision}
     22export VERSION=custom-${svnrevision}                                         
    2323
    2424echo "Creating Windows Installer for josm-$VERSION"
    … …  
    4343fi
    4444
    45 
    46 echo
    47 echo "##################################################################"
    48 echo "### Copy the required Stuff into the download Directory"
    49 mkdir -p downloads
    50 (
    51     cd downloads
    52    
    53     # get latest josm version (and license)
    54     cp ../../core/LICENSE LICENSE
    55     cp ../../core/dist/josm-custom.jar josm-latest.jar
    56    
    57     # Get all plugins
    58     cp ../../plugins/dist/*.jar .
    59 )
    60 
    6145echo
    6246echo "##################################################################"
    … …  
    7862# apt-get install nsis
    7963makensis -V2 -DVERSION=$VERSION josm.nsi
     64
     65# delete the intermediate file, just to avoid confusion
     66rm josm.exe

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

    r5206 r5214  
    99LAUNCH4J_XML="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\svn.openstreetmap.org\applications\editors\josm\nsis\launch4j.xml"
    1010
    11 
    12 ### download required files ###
    13 mkdir -p downloads
    14 cd downloads
    15 
    16 # get latest josm version (and license)
    17 wget -N http://josm.openstreetmap.de/download/josm-latest.jar
    18 wget -N http://josm.openstreetmap.de/browser/trunk/LICENSE?format=raw
    19 cp LICENSE?format=raw LICENSE
    20 
    21 # get latest plugin (and supporting files) versions
    22 #cp ../../plugins/annotation-tester/annotation-tester.jar .
    23 #wget -N http://josm.openstreetmap.de/download/plugins/tagging-preset-tester.jar
    24 cp ../../plugins/dist/mappaint.jar .
    25 # wget -N http://svn.openstreetmap.org/applications/editors/josm/plugins/mappaint/mappaint.jar
    26 cp ../../plugins/dist/namefinder.jar .
    27 # wget --N http://svn.openstreetmap.org/applications/editors/josm/plugins/namefinder/namefinder.jar
    28 #cp ../../plugins/osmarender/osmarender.jar .
    29 #wget -N http://josm.openstreetmap.de/download/plugins/osmarender.jar
    30 cp ../../plugins/dist/validator.jar .
    31 #wget -N http://personales.ya.com/osmfrsantos/validator/latest/validator.jar
    32 cp ../../plugins/dist/wmsplugin.jar .
    33 #wget -N http://chippy2005.googlepages.com/wmsplugin.jar
    34 
    35 cd ..
    3611
    3712### convert jar to exe ###
    … …  
    4823# NSIS - http://nsis.sourceforge.net/Main_Page
    4924"$PROGRAM_FILES/nsis/makensis.exe" /DVERSION=$VERSION josm.nsi
     25
     26# delete the intermediate file, just to avoid confusion
     27rm josm.exe

  • applications/editors/josm/nsis/josm.nsi

    r5122 r5214  
    8383
    8484!insertmacro MUI_PAGE_WELCOME
    85 !insertmacro MUI_PAGE_LICENSE "downloads\LICENSE"
     85!insertmacro MUI_PAGE_LICENSE "..\core\LICENSE"
    8686!insertmacro MUI_PAGE_COMPONENTS
    8787;Page custom DisplayAdditionalTasksPage
    … …  
    321321SetShellVarContext all
    322322SetOutPath $APPDATA\JOSM\plugins
    323 File "downloads\mappaint.jar"
     323File "..\plugins\dist\mappaint.jar"
    324324SectionEnd
    325325
    … …  
    342342SetShellVarContext all
    343343SetOutPath $APPDATA\JOSM\plugins
    344 File "downloads\wmsplugin.jar"
     344File "..\plugins\dist\wmsplugin.jar"
    345345SectionEnd
    346346
    … …  
    350350SetShellVarContext all
    351351SetOutPath $APPDATA\JOSM\plugins
    352 File "downloads\namefinder.jar"
     352File "..\plugins\dist\namefinder.jar"
    353353SectionEnd
    354354
    … …  
    358358SetShellVarContext all
    359359SetOutPath $APPDATA\JOSM\plugins
    360 File "downloads\validator.jar"
     360File "..\plugins\dist\validator.jar"
    361361SectionEnd
    362362

  • applications/editors/josm/nsis/launch4j.xml

    r5159 r5214  
    22  <dontWrapJar>false</dontWrapJar>
    33  <headerType>0</headerType>
    4   <jar>downloads/josm-latest.jar</jar>
     4  <jar>../core/dist/josm-custom.jar</jar>
    55  <outfile>josm.exe</outfile>
    66  <errTitle></errTitle>
Note: See TracChangeset for help on using the changeset viewer.