Changeset 14186 in osm for applications/editors

Timestamp:

2009-03-21T11:48:31+01:00 (16 years ago)

Author:

ulf

Message:

unify setup script

Location:

applications/editors/josm/nsis

Files:

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

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

@@ -15 +15 @@
 ## settings ##
 LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
+MAKENSIS=makensis
 
 svncorerevision=`svnversion ../core`
@@ -51 +52 @@
 # delete old exe file first
 rm -f josm.exe
-$LAUNCH4J ./launch4j.xml
+$LAUNCH4J "launch4j.xml"
 
 if ! [ -s josm.exe ]; then
@@ -63 +64 @@
 # NSIS - http://nsis.sourceforge.net/Main_Page
 # apt-get install nsis
-makensis -V2 -DVERSION=$VERSION josm.nsi
+$MAKENSIS -V2 -DVERSION=$VERSION josm.nsi
 
-# delete the intermediate file, just to avoid confusion
-rm josm-intermediate.exe
+# keep the intermediate file, for debugging
+rm -f josm-intermediate.exe
 mv josm.exe josm-intermediate.exe

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

@@ -14 +14 @@
 
 ## settings ##
-LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
+LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
+MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
 
 svncorerevision=`svnversion ../core`
@@ -20 +21 @@
 svnrevision="$svncorerevision-$svnpluginsrevision"
 
-export VERSION=latest
-#export VERSION=custom-${svnrevision}                                         
-
-LAUNCH4J_XML="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\osm\svn.josm\nsis\launch4j.xml"
+#export VERSION=latest
+export VERSION=custom-${svnrevision}                                         
 
 echo "Creating Windows Installer for josm-$VERSION"
@@ -51 +50 @@
 # (an exe file makes attaching to file extensions a lot easier)
 # launch4j - http://launch4j.sourceforge.net/
+# delete old exe file first
+rm -f josm.exe
+$LAUNCH4J "launch4j.xml"
 
-# delete old exe file first
-rm josm.exe
-"/cygdrive/c/Programme/Launch4j/launch4jc.exe" "$LAUNCH4J_XML"
-# using a relative path still doesn't work with launch4j 3.0.0-pre2
-#"/cygdrive/c/Program Files/Launch4j/launch4jc.exe" ./launch4j.xml
 if ! [ -s josm.exe ]; then
     echo "NO Josm File Created"
@@ -64 +61 @@
 echo 
 echo "##################################################################"
-echo "### create the installer exe with makensis"
+echo "### create the josm-installer-${VERSION}.exe with makensis"
 # NSIS - http://nsis.sourceforge.net/Main_Page
-"/cygdrive/c/Programme/nsis/makensis.exe" /DVERSION=$VERSION josm.nsi
+# apt-get install nsis
+$MAKENSIS -V2 -DVERSION=$VERSION josm.nsi
 
-# delete the intermediate file, just to avoid confusion
-rm josm.exe
+# keep the intermediate file, for debugging
+rm -f josm-intermediate.exe
+mv josm.exe josm-intermediate.exe