Changeset 14189 in osm for applications/editors/josm

Timestamp:

2009-03-21T13:58:03+01:00 (16 years ago)

Author:

ulf

Message:

further unify files, add download/unzip of webkit stuff

Location:

applications/editors/josm/nsis

Files:

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

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

@@ -14 +14 @@
 
 ## settings ##
-LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
-MAKENSIS=makensis
+
+if [ -s /cygdrive/c/Programme/Launch4j/launch4jc.exe ]; then
+        echo Using paths: "C:\Programme\..."
+        LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
+        MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
+elif [ -s josm.exe ]; then
+        echo Using UNIX-like paths
+        LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
+        MAKENSIS=makensis
+fi
+
 
 svncorerevision=`svnversion ../core`
@@ -26 +35 @@
 echo "Creating Windows Installer for josm-$VERSION"
 
-##################################################################
-### Build the Complete josm + Plugin Stuff
+echo 
+echo "##################################################################"
+echo "### Download and unzip the webkit stuff"
+wget -nc http://josm.openstreetmap.de/download/windows/webkit-image.zip
+mkdir -p webkit-image
+cd webkit-image
+unzip -o ../webkit-image.zip
+cd ..
+
+echo 
+echo "##################################################################"
+echo "### Build the Complete josm + Plugin Stuff"
 if true; then
     (

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

@@ -14 +14 @@
 
 ## settings ##
-LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
-MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
+
+if [ -s /cygdrive/c/Programme/Launch4j/launch4jc.exe ]; then
+        echo Using paths: "C:\Programme\..."
+        LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
+        MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
+elif [ -s josm.exe ]; then
+        echo Using UNIX-like paths
+        LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
+        MAKENSIS=makensis
+fi
+
 
 svncorerevision=`svnversion ../core`
@@ -26 +35 @@
 echo "Creating Windows Installer for josm-$VERSION"
 
-##################################################################
-### Build the Complete josm + Plugin Stuff
+echo 
+echo "##################################################################"
+echo "### Download and unzip the webkit stuff"
+wget -nc http://josm.openstreetmap.de/download/windows/webkit-image.zip
+mkdir -p webkit-image
+cd webkit-image
+unzip -o ../webkit-image.zip
+cd ..
+
+echo 
+echo "##################################################################"
+echo "### Build the Complete josm + Plugin Stuff"
 if true; then
     (

applications/editors/josm/nsis/josm.nsi

@@ -361 +361 @@
 SetOutPath $APPDATA\JOSM\plugins
 File "..\dist\wmsplugin.jar"
+SetOutPath $INSTDIR\webkit-image\imageformats
+File "webkit-image\imageformats\qjpeg4.dll"
+SetOutPath $INSTDIR\webkit-image
+File "webkit-image\mingwm10.dll"
+File "webkit-image\QtCore4.dll"
+File "webkit-image\QtGui4.dll"
+File "webkit-image\QtNetwork4.dll"
+File "webkit-image\QtWebKit4.dll"
+File "webkit-image\webkit-image.exe"
 SectionEnd