From baac7dd608ba91ba636c8a55877c96d858eb284c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 11 Nov 2014 10:21:01 +0100
Subject: [PATCH] ant uploader fix versioning fix

---
 build_common.xml                              |   9 +++++----
 .../src/com/jpexs/uploader/Uploader.java      |   2 +-
 uploader.jar                                  | Bin 10220 -> 10202 bytes
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build_common.xml b/build_common.xml
index 4dc495efd..03ce5e641 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -54,6 +54,7 @@
                 project.setProperty("NIGHTLY",true);
             }
         </script>
+        <echo level="info" message="Loaded Version:${version.major}.${version.minor}.${version.release}.${version.build}"/>
     </target>
     
     <target name="coverage.instrumentation">
@@ -287,8 +288,8 @@
         <property name="newversion.type" value="none"/>
     </target>
     <target name="-check-version-online" depends="-set-none-newversion,git-tag">      
-            <loadproperties srcfile="jpexs_website.properties" prefix="website"/>
-        <echo level="info">Checking version online...</echo>
+        <loadproperties srcfile="jpexs_website.properties" prefix="website"/>
+        <echo level="info">Checking version online: ${newversion.type}...</echo>
         <!-- Note: You must have developer account to upload to JPEXS website -->
         <java jar="uploader.jar" fork="true" failonerror="true" outputproperty="newversion.prop">    
             <arg value="${website.version.url}" />                
@@ -313,8 +314,8 @@
             <arg value="new" />            
             <arg value="${newversion.type}" />
             
-        </java>
-        <echo file="version.properties" message="${newversion.prop}" />
+        </java>        
+        <echo file="version.properties" message="${newversion.prop}" force=""/>
     </target>
     
     <target name="-upload-do" if="upload.config.exists">
diff --git a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java
index b20d84abf..256df0c80 100644
--- a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java
+++ b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java
@@ -141,7 +141,7 @@ public class Uploader {
          */
         public boolean finish(List<String> response) throws IOException {
             response.clear();
-            writer.append(LINE_FEED).flush();
+            //writer.append(LINE_FEED).flush();
             writer.append("--" + boundary + "--").append(LINE_FEED);
             writer.close();
 
diff --git a/uploader.jar b/uploader.jar
index d012a93f77cb43b02e3e4cf42ec496b12a175f76..13650dece1ef4c018d5abce0888f6f2a590926ff 100644
GIT binary patch
delta 514
zcmY+A%S%E*6vn^tg;bh)OBWKoP@~9D6N+ka3&{vl6l@zs7FlH3Lues^xe1cnkiBWs
zu1(;oMbI`1X({~&LH-NUxoW~a!!R@F`<*kK?>F=vGKA;VnifD0OhyutVZbmENd&6e
z+)o)mS(;v8UP%(P!^<9@S9&TqhzgL>3=Q2@wzozUeR!NX)I{<#<~GO`RsMDqHv{qF
zI}4iH2ce|}WQShhW8fvDjn7z;886x>n}-e(+&G6H7nni;bGSqlSBT*nOSr)%?vTVi
z4)K5xRgBiVAxxAUS?pjJjB00*!WvYR_h1kEP*V>#4j@89)u8`agHMCCVx1l)XsU>D
zQ4r-3iYG$OQk%u-98;RZqfUQKId$4?e(F>AfvGywO-K2w(>}h~&^D5*=@dDoAQWy2
z^nX1}sE8SEcJ*~D{38#&{|KFr$IrxA`Ddq|CtdwLGMi6-+y*Uxyn7XFT;L_v#lKuu
IUBw|Qe|(;6$N&HU

delta 538
zcmZ9JO-n*S6o%jHR}qPNZ{$L-QoKfzrfHe0ZXgvw3eloXf)z;=S(X_DB|&Why$#v-
z$D&QNvk>|X{R4kP{e!U1)e>%J7-r6#=e)zbQ;mJZjPWV0t_^4foQ0HZ>@_+Hsi;1E
zH&6vomB*&Jpeze5i9o17=?}|KB^Pl~sx?DLyM^^NpGt`>axN{A?1b}Lln&=XzLvEB
z$_%i)U}y7gYguD5+al1@0E(VB407mug`Ia)&|QJZ?ELZm5R6nUz<?rn$cW$+63#G*
z5@vCZ1TK)oC022T9B#0OTO8sZG3p97lo7`aWpoENunCTO$C1G@G}P_K7Pg@!4KK2!
ztiukG?L^gi6Nz$2QDTO!h9vU|lJc^bjBv!)pZMhpt6gJ~7^+uxMVob)bQ<<>nhtH#
zYW6JJM&^ENE9s?Nh742@Dw74ezY%79N_jTw?)3cURTlr@v_9s`#7kYuHxzR3*AqOT
R%pMh!V-N12;oGGg{s5APZ3+MY