From 96e3a7ccc699ad58dd430ae65c42b360e20e3602 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Wed, 21 Sep 2016 14:16:45 +0200
Subject: [PATCH] Update buildjar.

---
 buildjar.xml => build-libjar.xml | 98 ++++++++++++++++++--------------
 build.xml                        | 10 +++-
 buildandgit.xml                  |  8 ++-
 3 files changed, 66 insertions(+), 50 deletions(-)
 rename buildjar.xml => build-libjar.xml (65%)

diff --git a/buildjar.xml b/build-libjar.xml
similarity index 65%
rename from buildjar.xml
rename to build-libjar.xml
index d0303c1..616711f 100644
--- a/buildjar.xml
+++ b/build-libjar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<project default="dist" name="jarbuild">
+<project default="dist" name="Build-libjar">
 	<!--ANT 1.7 is required -->
-	<property name="buildjar.version" value="1.4" />
+	<property name="buildjar.version" value="1.5" />
 	<property file="build.properties" />
 	<property name="build.dir" value="${basedir}/build" />
 	<property name="build.src" value="${basedir}/src" />
@@ -25,23 +25,31 @@
 		<pathelement path="${test.classes}" />
 	</path>
 
-
 	<!-- ***** Help ***** -->
 	<target name="help" description="Display detailed usage information">
 		<echo>Type ant -p</echo>
 	</target>
 
+	<!-- ***** Clear ***** -->
+	<target name="clear" description="Clean temporary directories before work">
+		<delete dir="${build.dir}" />
+	</target>
+
 	<!-- ***** Clean ***** -->
-	<target name="clean" description="Clean temporary directories">
+	<target name="clean" description="Clean temporary directories afeter work">
 		<delete dir="${build.dir}" />
 	</target>
 
 	<!-- ***** Compile ***** -->
 	<target name="compile" description="Compile main code">
-		<mkdir dir="${build.dir}/classes" />
+		<delete dir="${build.classes}" />
+		<mkdir dir="${build.classes}" />
 		<javac srcdir="${build.src}" destdir="${build.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
-			<classpath refid="test.classpath.compile" />
+			<classpath refid="build.classpath" />
 		</javac>
+		<copy todir="${build.classes}">
+			<fileset dir="${build.src}" excludes="**/*.java" />
+		</copy>
 	</target>
 
 	<!-- ***** Compile test ***** -->
@@ -50,11 +58,13 @@
 		<javac srcdir="${test.src}" destdir="${test.classes}" debug="${debug}" deprecation="on" includeantruntime="false">
 			<classpath refid="test.classpath.compile" />
 		</javac>
+		<copy todir="${test.classes}">
+			<fileset dir="${test.src}" excludes="**/*.java" />
+		</copy>
 	</target>
 
-
 	<!-- ***** Test ***** -->
-	<target name="test" description="Run unit tests" depends="clean,compile,compile-test">
+	<target name="test" description="Run unit tests" depends="clear,compile,compile-test">
 		<mkdir dir="${build.dir}/test-reports" />
 		<junit printsummary="yes" haltonfailure="no">
 			<classpath refid="test.classpath.run" />
@@ -77,25 +87,23 @@
 	</target>
 
 	<!-- ***** Dist ***** -->
-	<target name="dist" description="Build distribution" depends="clean,compile,javadoc">
-		<!-- -->
-		<buildnumber file="build.num" description="Id of the build" />
+	<target name="dist" description="Build distribution" depends="clear,compile,javadoc">
 		<!-- AUTOMATIC MANAGEMENT -->
+		<buildnumber file="build.num" description="Id of the build" />
 		<property name="dist.version" value="${product.revision.major}.${product.revision.minor}.${build.number}" />
 		<property name="dist.name" value="${product.name}-${dist.version}" />
 		<property name="dist.dir" value="${basedir}/dist/${dist.name}" />
 
 		<!-- -->
-		<mkdir dir="${dist.dir}" />
-
-		<!-- -->
-		<copy file="LICENSE" todir="${dist.dir}/" overwrite="true" />
+		<copy file="LICENSE" todir="${dist.dir}/" overwrite="true" failonerror="false" />
+		<copy file="README" todir="${dist.dir}/" overwrite="true" failonerror="false" />
+		<copy file="README.md" todir="${dist.dir}/" overwrite="true" failonerror="false" />
 
 		<!-- Package main -->
 		<property name="dist.jar" value="${dist.dir}/${dist.name}.jar" />
 		<tstamp>
-			<format property="dist.time" pattern="dd/MM/yyyy HH:mm:ss" />
 			<!-- TODAY -->
+			<format property="dist.time" pattern="dd/MM/yyyy HH:mm:ss" />
 		</tstamp>
 		<jar destfile="${dist.jar}">
 			<manifest>
@@ -103,7 +111,6 @@
 				<attribute name="Built-Date" value="${dist.time}" />
 			</manifest>
 			<fileset dir="${build.classes}" />
-			<zipfileset dir="${basedir}/" includes="LICENSE" />
 		</jar>
 
 		<!-- Package sources -->
@@ -115,37 +122,40 @@
 
 		<!-- Package Javadoc -->
 		<property name="dist.javadoc.zip" value="${dist.dir}/${dist.name}-javadoc.zip" />
-		<zip destfile="${dist.javadoc.zip}" update="true" preserve0permissions="true">
+		<zip destfile="${dist.javadoc.zip}" update="true">
 			<fileset dir="${build.javadoc}" />
 			<zipfileset dir="${basedir}/" includes="LICENSE" />
 		</zip>
 
-		<!-- Package lib -->
-		<copy todir="${dist.dir}/lib" overwrite="true">
-			<fileset dir="lib" excludes="hamcrest-core*,junit*" />
-		</copy>
-	</target>
-	
-	<!-- ***** Dist ***** -->
-	<target name="buildandgit" depends="dist">
-		<!-- GIT actions-->
-        <echo message="Commit build.num"/>
-        <exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
-                <arg line="commit -m 'Build ${dist.version}' build.num"/>
-        </exec>
-		<echo message="${git.commit.out}" />
-		
-        <echo message="Tag"/>
-        <exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
-                <arg line="tag -a ${dist.version} -m 'Build ${dist.version}'"/>
-        </exec>
-		<echo message="${git.tag.out}" />
-		
-        <echo message="Push"/>
-        <exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
-                <arg line="push --follow-tags"/>
-        </exec>
-		<echo message="${git.push.out}" />
+		<!-- Zip package -->
+		<property name="dist.zip" value="${basedir}/dist/${dist.name}.zip" />
+		<!--
+        <property name="dist.zip" value="${basedir}/dist/${dist.name}.zip" />
+        <zip destfile="${dist.zip}" update="true">
+            <fileset dir="${dist.dir}" />
+            <zipfileset filemode="755" dir="${dist.dir}/" includes="*.sh *.command" />
+        </zip>
+        -->
 	</target>
 
+	<!-- ***** Build and GIT ***** -->
+	<target name="buildandgit" depends="dist,clean">
+		<echo message="Commit build.num" />
+		<exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
+			<arg line="commit -m 'Build ${dist.version}' build.num" />
+		</exec>
+		<echo message="${git.commit.out}" />
+
+		<echo message="Tag" />
+		<exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
+			<arg line="tag -a ${dist.version} -m 'Build ${dist.version}'" />
+		</exec>
+		<echo message="${git.tag.out}" />
+
+		<echo message="Push" />
+		<exec executable="git" outputproperty="git.push.out" failifexecutionfails="true">
+			<arg line="push --follow-tags" />
+		</exec>
+		<echo message="${git.push.out}" />
+	</target>
 </project>
diff --git a/build.xml b/build.xml
index 5c38a85..00319d5 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<project default="dist" name="devinsy-utils">
-	<!-- -->
-	<import file="buildjar.xml" />
+<project default="main" name="Build">
+	<!-- ***** Import ***** -->
+	<import file="build-libjar.xml" />
+
+	<!-- ***** Main ***** -->
+	<target name="main" description="" depends="dist,clean" />
+
 </project>
diff --git a/buildandgit.xml b/buildandgit.xml
index 3a67b80..c3fff70 100644
--- a/buildandgit.xml
+++ b/buildandgit.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<project default="buildandgit" name="devinsy-utils">
-	<!-- -->
-	<import file="buildjar.xml" />
+<project default="main" name="Buildandgit">
+    <!-- -->
+    <import file="build.xml" />
+    
+    <target name="main" description="" depends="buildandgit,clean"/>
 </project>