Changeset 14186 in osm for applications/editors


Ignore:
Timestamp:
2009-03-21T11:48:31+01:00 (16 years ago)
Author:
ulf
Message:

unify setup script

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

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/nsis/josm-setup-unix.sh

    r11594 r14186  
    1515## settings ##
    1616LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
     17MAKENSIS=makensis
    1718
    1819svncorerevision=`svnversion ../core`
     
    5152# delete old exe file first
    5253rm -f josm.exe
    53 $LAUNCH4J ./launch4j.xml
     54$LAUNCH4J "launch4j.xml"
    5455
    5556if ! [ -s josm.exe ]; then
     
    6364# NSIS - http://nsis.sourceforge.net/Main_Page
    6465# apt-get install nsis
    65 makensis -V2 -DVERSION=$VERSION josm.nsi
     66$MAKENSIS -V2 -DVERSION=$VERSION josm.nsi
    6667
    67 # delete the intermediate file, just to avoid confusion
    68 rm josm-intermediate.exe
     68# keep the intermediate file, for debugging
     69rm -f josm-intermediate.exe
    6970mv josm.exe josm-intermediate.exe
  • applications/editors/josm/nsis/josm-setup.sh

    r10636 r14186  
    1414
    1515## settings ##
    16 LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
     16LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
     17MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
    1718
    1819svncorerevision=`svnversion ../core`
     
    2021svnrevision="$svncorerevision-$svnpluginsrevision"
    2122
    22 export VERSION=latest
    23 #export VERSION=custom-${svnrevision}                                         
    24 
    25 LAUNCH4J_XML="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\osm\svn.josm\nsis\launch4j.xml"
     23#export VERSION=latest
     24export VERSION=custom-${svnrevision}                                         
    2625
    2726echo "Creating Windows Installer for josm-$VERSION"
     
    5150# (an exe file makes attaching to file extensions a lot easier)
    5251# launch4j - http://launch4j.sourceforge.net/
     52# delete old exe file first
     53rm -f josm.exe
     54$LAUNCH4J "launch4j.xml"
    5355
    54 # delete old exe file first
    55 rm josm.exe
    56 "/cygdrive/c/Programme/Launch4j/launch4jc.exe" "$LAUNCH4J_XML"
    57 # using a relative path still doesn't work with launch4j 3.0.0-pre2
    58 #"/cygdrive/c/Program Files/Launch4j/launch4jc.exe" ./launch4j.xml
    5956if ! [ -s josm.exe ]; then
    6057    echo "NO Josm File Created"
     
    6461echo
    6562echo "##################################################################"
    66 echo "### create the installer exe with makensis"
     63echo "### create the josm-installer-${VERSION}.exe with makensis"
    6764# NSIS - http://nsis.sourceforge.net/Main_Page
    68 "/cygdrive/c/Programme/nsis/makensis.exe" /DVERSION=$VERSION josm.nsi
     65# apt-get install nsis
     66$MAKENSIS -V2 -DVERSION=$VERSION josm.nsi
    6967
    70 # delete the intermediate file, just to avoid confusion
    71 rm josm.exe
     68# keep the intermediate file, for debugging
     69rm -f josm-intermediate.exe
     70mv josm.exe josm-intermediate.exe
Note: See TracChangeset for help on using the changeset viewer.