Changeset 7839 in josm

Timestamp:

2014-12-19T21:15:28+01:00 (9 years ago)

Author:

Don-vip

Message:

update Windows installer build script + make new target in build.xml

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• windows/josm-setup-unix.sh (modified) (3 diffs)

trunk/build.xml

@@ -177 +177 @@
             <param name="bundle.jar" value="dist/josm-custom.jar"/>
         </antcall>
+    </target>
+    <!-- Windows target -->
+    <target name="distwin" depends="dist">
+        <exec dir="windows" executable="josm-setup-unix.sh">
+            <arg value="${version.entry.commit.revision}"/>
+            <arg value="../dist/josm-custom.jar"/>
+        </exec>
     </target>
     <target name="javacc" depends="init" unless="javacc.notRequired">

trunk/windows/josm-setup-unix.sh

@@ -10 +10 @@
 #
 # Then download launch4j from http://launch4j.sourceforge.net/ 
-# wget http://softlayer-ams.dl.sourceforge.net/project/launch4j/launch4j-3/3.4/launch4j-3.4-linux.tgz
+# wget http://softlayer-ams.dl.sourceforge.net/project/launch4j/launch4j-3/3.5/launch4j-3.5-linux.tgz
 # and unpack it to /usr/share/launch4j
 
@@ -42 +42 @@
 echo Using NSIS: $MAKENSIS
 
-if [ -n "$1" ]; then
+if [ -n "$2" ]; then
+  # 2 arguments: for Ant build.xml and Jenkins CI
+  export VERSION=$1
+  export JOSM_BUILD="no"
+  export WEBKIT_DOWNLAD="yes"
+  export JOSM_FILE=$2
+elif [ -n "$1" ]; then
+  # 1 argument: for official JOSM server
   export VERSION=$1
   export JOSM_BUILD="no"
@@ -48 +55 @@
   export JOSM_FILE="/home/josm/www/download/josm-tested.jar"
 else
-  svncorerevision=`svnversion -n ../core`
-  #svnpluginsrevision=`svnversion -n ../plugins`
+  # no argument: for everyone else
+  svncorerevision=`svnversion -n ..`
+  #svnpluginsrevision=`svnversion -n ../../plugins`
   #svnrevision="$svncorerevision-$svnpluginsrevision"