From 60bbcc563dbb0f95bc37da8fdd830feb5fbe69b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 18 Sep 2016 23:37:02 +0200
Subject: [PATCH] Library released in ZIP file

---
 build.properties                  |  2 ++
 build.xml                         | 22 ++++++++++++++++++----
 libsrc/ffdec_lib/build.properties |  6 +++++-
 libsrc/ffdec_lib/build.xml        |  9 +++++++++
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/build.properties b/build.properties
index b697920923..37465ed903 100644
--- a/build.properties
+++ b/build.properties
@@ -87,6 +87,8 @@ coverage.dir = coverage
 compile.test.dir = build/test
 lib.dir = lib
 releases.dir = releases
+lib.releases.dir = libsrc/ffdec_lib/releases
+lib.prefix.filename = ffdec_lib
 dist.lib.dirname = lib
 javadoc.dir = javadoc
         
diff --git a/build.xml b/build.xml
index 877264d160..0b6b8483f3 100644
--- a/build.xml
+++ b/build.xml
@@ -181,9 +181,9 @@
         <echo level="info" message="Setup created in ${exe.file}"/>
     </target>
     
-    <target name="library" depends="-loadversion,build_lib">
+    <target name="library" depends="-loadversion,release_lib,-copy-lib">
         <mkdir dir="${releases.dir}"/>
-        <copy file="${core.lib.path}" tofile="${releases.dir}/${prefix.filename}_${version}${version.suffix}_lib.jar"/>
+        <copy file="${lib.file}" todir="${releases.dir}" />
     </target>
     
     <target name="archive" depends="-loadversion,dist">
@@ -461,7 +461,7 @@
 
     </target>
 
-    <target name="release" depends="library,archive,deb,osx-app-archive,installer,osx-app-installer,locales">        
+    <target name="release" depends="library,archive,deb,osx-app-archive,installer,osx-app-installer,locales">
 
     </target>
          
@@ -557,6 +557,11 @@
             <arg value="-file" />
             <arg value="fileLang" />
             <arg value="${lang.file}" />
+            
+            <arg value="-file" />
+            <arg value="fileLib" />
+            <arg value="${lib.file}" />
+            
         </java>
     </target>
     
@@ -663,10 +668,19 @@
         <echo level="info" message="Version: ${version}"/>
     </target>
     
+    <target name="release_lib" depends="-loadversion,-save-version-info">
+        <copy file="${version_info}" tofile="${core.lib.version_info}" />        
+        <ant antfile="${core.lib.script}" target="release" inheritAll="false" usenativebasedir="true"/>
+        <property  name="lib.file" value="${lib.releases.dir}/${lib.prefix.filename}_${version}${version.suffix}.zip" />
+    </target>
+    
     <target name="build_lib" depends="-loadversion,-save-version-info">
         <copy file="${version_info}" tofile="${core.lib.version_info}" />
         <ant antfile="${core.lib.script}" target="build" inheritAll="false" usenativebasedir="true"/>
-        <copy file="${core.lib.path}" todir="${lib.dir}" />
+    </target>
+    
+    <target name="-copy-lib">
+        <copy file="${core.lib.path}" todir="${lib.dir}" />    
     </target>
     
     <target name="clean_lib">
diff --git a/libsrc/ffdec_lib/build.properties b/libsrc/ffdec_lib/build.properties
index 909b5dc0b1..ab0ee1a8d9 100644
--- a/libsrc/ffdec_lib/build.properties
+++ b/libsrc/ffdec_lib/build.properties
@@ -15,10 +15,14 @@ compile.dir = build/classes
 coverage.dir = coverage
 compile.test.dir = build/test
 lib.dir = ../../lib
+releases.dir = releases
 properties.name = project.properties
 dist.lib.dirname = lib
 javadoc.dir = javadoc
 lexers.dir = lexers
 ant.lib.dir = antlib
 
-version_info = version.properties
\ No newline at end of file
+version_info = version.properties
+changelog.file = CHANGELOG.md
+license.file = license.txt
+gui.changelog.file = ../../CHANGELOG.md
diff --git a/libsrc/ffdec_lib/build.xml b/libsrc/ffdec_lib/build.xml
index 2317d9bf8e..ea5bcfbe41 100644
--- a/libsrc/ffdec_lib/build.xml
+++ b/libsrc/ffdec_lib/build.xml
@@ -227,6 +227,15 @@
         </jar>
     </target>
     
+    <target name="release" depends="build">
+        <zip destfile="${releases.dir}/${prefix.filename}_${version}${version.suffix}.zip">
+            <zipfileset file="${dist.dir}/${jar.filename}.jar" filemode="755" fullpath="${jar.filename}.jar"></zipfileset>
+            <zipfileset file="${gui.changelog.file}" fullpath="${changelog.file}"></zipfileset>
+            <zipfileset file="${license.file}" fullpath="${license.file}"></zipfileset>
+        </zip>
+    </target>
+    
+    
     <target name="javadoc">
         <mkdir dir="${javadoc.dir}"/>
         <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}" windowtitle="${project.name}"