From c43c89fab3742e1d7d9849078e12d6e721baeda5 Mon Sep 17 00:00:00 2001
From: "honfika@gmail.com" <honfika@gmail.com>
Date: Tue, 11 Nov 2014 21:36:32 +0100
Subject: [PATCH] merge

---
 .gitignore                                    |   1 +
 build.xml                                     |   2 +-
 build_common.xml                              | 166 +++++++++++-------
 .../src/com/jpexs/uploader/Uploader.java      |   2 +-
 uploader.jar                                  | Bin 10220 -> 10202 bytes
 version.properties                            |   7 -
 6 files changed, 102 insertions(+), 76 deletions(-)
 delete mode 100644 version.properties

diff --git a/.gitignore b/.gitignore
index 4dc1238a2..59f9e7f03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,5 +50,6 @@ hs_err_pid*.log
 /libsrc/uploader/build/
 /libsrc/uploader/dist/
 /jpexs_website.properties
+/version.properties
 /tools.properties
 /nbproject/private/
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 2211a147a..0d04047d8 100644
--- a/build.xml
+++ b/build.xml
@@ -59,7 +59,7 @@
     <property name="RUNPARAMS" value=""/>
     
     <property name="website.upload.url" value="https://www.free-decompiler.com/flash/release.html?action=release" />
-            
+    <property name="website.version.url" value="https://www.free-decompiler.com/flash/release.html?action=versionid" />        
     
     <import file="${basedir}/build_common.xml"/>
 </project>
diff --git a/build_common.xml b/build_common.xml
index 2e472a8f8..378e077b4 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -29,7 +29,23 @@
     </path>
     <taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
 
-    <target name="-loadversion">
+    <target name="-loadversion" depends="-loadversion-prop,-loadversion-private">
+        
+    </target>
+    <target name="-loadversion-private" unless="newversion.type">
+        <property name="version.major" value="0" />
+        <property name="version.minor" value="0" />
+        <property name="version.release" value="0" />
+        <property name="version.major" value="0" />
+        <property name="version.build" value="0" />
+        <!-- <property name="version.revision" value="" /> -->
+        <property name="version.debug" value="true" />
+        
+        <property name="VERSION" value="${version.major}.${version.minor}.${version.release}" />
+        <property name="VERSIONNUMBER" value="${version.major}.${version.minor}.${version.release}.${version.build}" />  
+        <property name="PRIVATE" value="true" />        
+    </target>
+    <target name="-loadversion-prop" if="newversion.type">
         <loadproperties srcfile="version.properties" prefix="version"/> 
         <property name="VERSION" value="${version.major}.${version.minor}.${version.release}" />
         <property name="VERSIONNUMBER" value="${version.major}.${version.minor}.${version.release}.${version.build}" />  
@@ -38,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">
@@ -267,6 +284,40 @@
         <fail message="Cannot upload - Website properties file missing. Create file named jpexs_website.properties and put username=xxx, password=yyy lines in there" />             
     </target>
     
+    <target name="-set-none-newversion" unless="newversion.type">
+        <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: ${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}" />                
+
+            <arg value="-field" />
+            <arg value="mode" />
+            <arg value="commandline" />
+            
+            <arg value="-field" />
+            <arg value="set_username" />
+            <arg value="${website.username}" />
+
+            <arg value="-field" />
+            <arg value="set_password" />            
+            <arg value="${website.password}" />  
+            
+            <arg value="-field" />
+            <arg value="revision" />            
+            <arg value="${GITTAG}" />
+            
+            <arg value="-field" />
+            <arg value="new" />            
+            <arg value="${newversion.type}" />
+            
+        </java>        
+        <echo file="version.properties" message="${newversion.prop}" force=""/>
+    </target>
+    
     <target name="-upload-do" if="upload.config.exists">
         <loadproperties srcfile="jpexs_website.properties" prefix="website"/>
         <echo level="info">Uploading...</echo>
@@ -365,33 +416,22 @@
         <property name="VERSIONSUFFIX" value="_nightly${version.build}"/>         
     </target>
     
-    <target name="-nonightly-suffix" unless="NIGHTLY">
+    <target name="-no-suffix" unless="VERSIONSUFFIX">
         <property name="VERSIONSUFFIX" value=""/>         
     </target>
     
-    <target name="-timestamp" depends="-loadversion">
+    <target name="-private-suffix" if="PRIVATE">
+        <property name="VERSIONSUFFIX" value="_private_${GITSHORTTAG}"/>         
+    </target>
+    
+    <target name="-suffix" depends="-nightly-suffix,-private-suffix,-no-suffix">
+       
+    </target>
+    <target name="-timestamp" depends="-loadversion,git-tag">
         <tstamp>
             <format property="BUILTAT" pattern="MM/dd/yyyy hh:mm aa" timezone="CET"/>
             <format property="VERDATE" pattern="yyyyddMM_hhmm" timezone="CET"/>
-        </tstamp>
-        <exec executable="git" outputproperty="GITTAG" failonerror="true">
-            <arg value="rev-parse"/>
-            <arg value="HEAD"/>
-        </exec>  
-        <echo level="info" message="${GITTAG}" file="${REVFILE}"/>
-        
-        
-        <loadfile srcfile="${REVFILE}" property="GITSHORTTAG">
-            <filterchain>
-               <headfilter lines="1" skip="0"/>
-               <tokenfilter>
-                  <replaceregex pattern="[0-9a-f]{33}$" replace="" flags="gi"/>
-               </tokenfilter>
-               <striplinebreaks/>
-            </filterchain>
-        </loadfile>
-        <echo level="info" message="Git tag:${GITTAG}"/>
-        <echo level="info" message="Git shorttag:${GITSHORTTAG}"/>
+        </tstamp>        
         <echo level="info" message="Version: ${VERSION}"/>
     </target>
     
@@ -410,7 +450,28 @@
         <ant antfile="${CORELIBSCRIPT}" target="test" inheritAll="false" usenativebasedir="true" />
     </target>
     
-    <target name="build" depends="-loadversion,build_lib,-timestamp,-nightly-suffix,-nonightly-suffix,compile">        
+    <target name="git-tag">
+       <exec executable="git" outputproperty="GITTAG" failonerror="true">
+            <arg value="rev-parse"/>
+            <arg value="HEAD"/>
+        </exec>  
+        <echo level="info" message="${GITTAG}" file="${REVFILE}"/>
+        
+        
+        <loadfile srcfile="${REVFILE}" property="GITSHORTTAG">
+            <filterchain>
+               <headfilter lines="1" skip="0"/>
+               <tokenfilter>
+                  <replaceregex pattern="[0-9a-f]{33}$" replace="" flags="gi"/>
+               </tokenfilter>
+               <striplinebreaks/>
+            </filterchain>
+        </loadfile>
+        <echo level="info" message="Git tag:${GITTAG}"/>
+        <echo level="info" message="Git shorttag:${GITSHORTTAG}"/>
+    </target>
+    
+    <target name="build" depends="-loadversion,build_lib,-timestamp,-suffix,compile">        
         <mkdir dir="${DISTRIBUTIONDIR}"/>
         <!-- <delete dir="${DISTLIBRARIESFULLDIR}"/> -->
         <mkdir dir="${DISTLIBRARIESFULLDIR}"/>
@@ -523,8 +584,7 @@
     </target>
     
     <target name="git-push">
-        <!-- TODO -->
-        <echo>WARNING: Changes need to be PUSHed to the GIT repository.</echo>
+        <!-- NOTHING -->       
     </target>
     
     <target name="-git-commit-versioninfo">        
@@ -543,48 +603,20 @@
         <loadproperties srcfile="version.properties" prefix="oldversion" />
     </target>
     
-    <target name="-inc-major" depends="-loadoldversion">
-        <script language="javascript"><![CDATA[
-            project.setNewProperty("newversion.major",parseInt(project.getProperty("oldversion.major"))+1);
-            project.setNewProperty("newversion.minor",0);
-            project.setNewProperty("newversion.release",0);
-            project.setNewProperty("newversion.build",parseInt(project.getProperty("oldversion.build"))+1);
-            project.setNewProperty("newversion.debug","false");
-            ]]>
-        </script>
+    <target name="-inc-major">
+        <property name="newversion.type" value="major"/>
     </target>
     
-    <target name="-inc-minor" depends="-loadoldversion">
-        <script language="javascript"><![CDATA[
-            project.setNewProperty("newversion.major",project.getProperty("oldversion.major"));
-            project.setNewProperty("newversion.minor",parseInt(project.getProperty("oldversion.minor"))+1);
-            project.setNewProperty("newversion.release",0);
-            project.setNewProperty("newversion.build",parseInt(project.getProperty("oldversion.build"))+1);
-            project.setNewProperty("newversion.debug","false");
-            ]]>
-        </script>
+    <target name="-inc-minor">
+       <property name="newversion.type" value="minor"/>
     </target>
     
-    <target name="-inc-release" depends="-loadoldversion">
-        <script language="javascript"><![CDATA[
-            project.setNewProperty("newversion.major",project.getProperty("oldversion.major"));
-            project.setNewProperty("newversion.minor",project.getProperty("oldversion.minor"));
-            project.setNewProperty("newversion.release",parseInt(project.getProperty("oldversion.release"))+1);
-            project.setNewProperty("newversion.build",parseInt(project.getProperty("oldversion.build"))+1);
-            project.setNewProperty("newversion.debug","false");
-            ]]>
-        </script>
+    <target name="-inc-release">
+       <property name="newversion.type" value="releasr"/> 
     </target>
     
-    <target name="-inc-nightlybuild" depends="-loadoldversion">
-        <script language="javascript"><![CDATA[
-            project.setNewProperty("newversion.major",project.getProperty("oldversion.major"));
-            project.setNewProperty("newversion.minor",project.getProperty("oldversion.minor"));
-            project.setNewProperty("newversion.release",project.getProperty("oldversion.release"));
-            project.setNewProperty("newversion.build",parseInt(project.getProperty("oldversion.build"))+1);
-            project.setNewProperty("newversion.debug","true");
-            ]]>
-        </script>
+    <target name="-inc-nightlybuild">
+        <property name="newversion.type" value="nightly"/>
     </target>   
     
     <target name="-save-version-info-file">        
@@ -602,25 +634,25 @@
         
     </target>
     
-    <target name="new-version-major" depends="git-pull,-inc-major,-save-version-info,all,-upload,git-push">
+    <target name="new-version-major" depends="git-pull,-inc-major,-check-version-online,all,-upload,git-push">
         
     </target>
     
-    <target name="new-version-minor" depends="git-pull,-inc-minor,-save-version-info,all,-upload,git-push">
+    <target name="new-version-minor" depends="git-pull,-inc-minor,-check-version-online,all,-upload,git-push">
         
     </target>
     
-    <target name="new-version-release" depends="git-pull,-inc-release,-save-version-info,all,-upload,git-push">
+    <target name="new-version-release" depends="git-pull,-inc-release,-check-version-online,all,-upload,git-push">
        
     </target>
        
         
-    <target name="new-version-nightlybuild" depends="git-pull,-inc-nightlybuild,-save-version-info,all,-upload,git-push">
-        
+    <target name="new-version-nightlybuild" depends="git-pull,-inc-nightlybuild,-check-version-online,all,-upload,git-push">
+
     </target>
     
     
     <target name="upload-last" depends="all,-upload">
         
     </target>
-</project>
+</project>
\ No newline at end of file
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

diff --git a/version.properties b/version.properties
deleted file mode 100644
index daf19dd4d..000000000
--- a/version.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#DO NOT MODIFY - it is updated automatically with the build script
-#Tue, 11 Nov 2014 00:20:06 +0100
-major=4
-minor=0
-release=0
-build=319
-debug=true