From f7f79afbcd3387eec1c200956b0c7f788d865324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Wed, 17 Jan 2018 22:06:47 +0100
Subject: [PATCH] new version release fix

---
 build.xml                  | 30 +++++-------------------------
 libsrc/ffdec_lib/build.xml |  2 +-
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/build.xml b/build.xml
index d5fe66aba..5bd68316b 100644
--- a/build.xml
+++ b/build.xml
@@ -48,7 +48,7 @@
     <target name="-loadversion" depends="-loadversion-prop,-loadversion-private">
         
     </target>
-    <target name="-loadversion-private" unless="newversion.type">
+    <target name="-loadversion-private" unless="new.version">
         <property name="version.major" value="0" />
         <property name="version.minor" value="0" />
         <property name="version.release" value="0" />
@@ -61,7 +61,7 @@
         <property name="version.number" value="${version.major}.${version.minor}.${version.release}.${version.build}" />  
         <property name="private" value="true" />        
     </target>
-    <target name="-loadversion-prop" if="newversion.type">
+    <target name="-loadversion-prop" if="new.version">
         <loadproperties srcfile="${version_info}" prefix="version"/> 
         <property name="version" value="${version.major}.${version.minor}.${version.release}" />
         <property name="version.number" value="${version.major}.${version.minor}.${version.release}.${version.build}" />  
@@ -474,11 +474,7 @@
          
     <target name="all" depends="clean,build,test,javadoc,release">    
         
-    </target>                    
-    
-    <target name="-set-none-newversion" unless="newversion.type">
-        <property name="newversion.type" value="none"/>
-    </target>    
+    </target>                         
         
     <target name="dist" depends="build,exe">
         <copy todir="${dist.dir}">
@@ -746,23 +742,7 @@
     <target name="-loadoldversion">
         <loadproperties srcfile="${version_info}" prefix="oldversion" />
     </target>
-    
-    <target name="-inc-major">
-        <property name="newversion.type" value="major"/>
-    </target>
-    
-    <target name="-inc-minor">
-        <property name="newversion.type" value="minor"/>
-    </target>
-    
-    <target name="-inc-release">
-        <property name="newversion.type" value="release"/> 
-    </target>
-    
-    <target name="-inc-nightlybuild">
-        <property name="newversion.type" value="nightly"/>
-    </target>   
-    
+        
     <target name="-save-version-info-file">        
         <propertyfile file="${version_info}"
                       comment="DO NOT MODIFY - it is updated automatically with the build script">                               
@@ -782,7 +762,7 @@
         <property name="new.version" value="1" />
     </target>
     
-    <target name="new-version" depends="-new-version-set,-set-none-newversion,all">
+    <target name="new-version" depends="-new-version-set,all">
         
     </target>          
     
diff --git a/libsrc/ffdec_lib/build.xml b/libsrc/ffdec_lib/build.xml
index 0e7324370..48e3f6ee9 100644
--- a/libsrc/ffdec_lib/build.xml
+++ b/libsrc/ffdec_lib/build.xml
@@ -207,7 +207,7 @@
         <property name="version.number" value="${version.major}.${version.minor}.${version.release}.${version.build}" />  
         <script language="javascript">
             
-            if(project.getProperty("version.build")=="0") {
+            if(project.getProperty("version.major")=="0") {
                 project.setProperty("private",true);                
             } else if(project.getProperty("version.debug")=="true") {
                 project.setProperty("nightly",true);