Changeset 18004 in osm

Timestamp:

2009-10-07T09:58:57+02:00 (15 years ago)

Author:

stoecker

Message:

build fixes

Location:

applications/editors/josm/nsis

Files:

• josm-setup-unix.sh (modified) (4 diffs)
• josm.nsi (modified) (2 diffs)
• launch4j.xml (modified) (1 diff)

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

@@ -44 +44 @@
   export JOSM_BUILD="no"
   export WEBKIT_DOWNLAD="no"
+  export JOSM_FILE="/var/www/josm.openstreetmap.de/download/josm-tested.jar"
 else
   svncorerevision=`svnversion ../core`
@@ -52 +53 @@
   export JOSM_BUILD="yes"
   export WEBKIT_DOWNLOAD="yes"
+  export JOSM_FILE="..\core\dist\josm-custom.jar"
 fi
 
@@ -87 +89 @@
 fi
 
+/bin/cp $JOSM_FILE josm-tested.jar
 echo 
 echo "##################################################################"
@@ -110 +113 @@
 # keep the intermediate file, for debugging
 /bin/rm josm-intermediate.exe 2>/dev/null >/dev/null
+/bin/rm -f josm-tested.jar 2>/dev/null >/dev/null
 /bin/mv josm.exe josm-intermediate.exe 2>/dev/null >/dev/null

applications/editors/josm/nsis/josm.nsi

@@ -288 +288 @@
 SetOutPath $INSTDIR
 File "josm.exe"
-File "..\core\dist\josm-custom.jar"
+File "josm-tested.jar"
 
 ; XXX - should be provided/done by josm.jar itself and not here!
@@ -428 +428 @@
 SetShellVarContext current
 
-Delete "$INSTDIR\josm-custom.jar"
+Delete "$INSTDIR\josm-tested.jar"
 IfErrors 0 NoJOSMErrorMsg
         MessageBox MB_OK $(un.JOSM_IN_USE_ERROR) IDOK 0 ;skipped if josm.jar removed

applications/editors/josm/nsis/launch4j.xml

@@ -2 +2 @@
   <dontWrapJar>true</dontWrapJar>
   <headerType>0</headerType>
-  <jar>josm-custom.jar</jar>
+  <jar>josm-tested.jar</jar>
   <outfile>josm.exe</outfile>
   <errTitle></errTitle>