Changeset 14191 in osm


Ignore:
Timestamp:
2009-03-21T14:44:26+01:00 (15 years ago)
Author:
ulf
Message:

automatically detect the right settings for launch4j and makensis - now both files are equal

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

Legend:

Unmodified
Added
Removed

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

    r14189 r14191  
    1515## settings ##
    1616
     17# trying to find launch4j
    1718if [ -s /cygdrive/c/Programme/Launch4j/launch4jc.exe ]; then
    18         echo Using paths: "C:\Programme\..."
    19         LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
    20         MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
    21 elif [ -s josm.exe ]; then
    22         echo Using UNIX-like paths
    23         LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
    24         MAKENSIS=makensis
     19    # Windows under cygwin
     20    LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
     21elif [ -s /usr/share/launch4j/launch4j.jar ]; then
     22    # as described above
     23    LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
     24else
     25    # launch4j installed locally under this nsis folder
     26    LAUNCH4J="java -jar ./launch4j/launch4j.jar"
    2527fi
     28echo Using launch4j: $LAUNCH4J
    2629
     30# trying to find makensis
     31if [ -s /cygdrive/c/Programme/nsis/makensis.exe ]; then
     32    # Windows under cygwin
     33    MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
     34else
     35    # UNIX like
     36    MAKENSIS=makensis
     37fi
     38echo Using NSIS: $MAKENSIS
    2739
    2840svncorerevision=`svnversion ../core`

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

    r14189 r14191  
    1515## settings ##
    1616
     17# trying to find launch4j
    1718if [ -s /cygdrive/c/Programme/Launch4j/launch4jc.exe ]; then
    18         echo Using paths: "C:\Programme\..."
    19         LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
    20         MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
    21 elif [ -s josm.exe ]; then
    22         echo Using UNIX-like paths
    23         LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
    24         MAKENSIS=makensis
     19    # Windows under cygwin
     20    LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
     21elif [ -s /usr/share/launch4j/launch4j.jar ]; then
     22    # as described above
     23    LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
     24else
     25    # launch4j installed locally under this nsis folder
     26    LAUNCH4J="java -jar ./launch4j/launch4j.jar"
    2527fi
     28echo Using launch4j: $LAUNCH4J
    2629
     30# trying to find makensis
     31if [ -s /cygdrive/c/Programme/nsis/makensis.exe ]; then
     32    # Windows under cygwin
     33    MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
     34else
     35    # UNIX like
     36    MAKENSIS=makensis
     37fi
     38echo Using NSIS: $MAKENSIS
    2739
    2840svncorerevision=`svnversion ../core`
Note: See TracChangeset for help on using the changeset viewer.