From 4cc6cd97f7ba87013dc1141e79b3fc79d35a04d5 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Sat, 8 Feb 2014 16:34:51 +0100
Subject: [PATCH] Version 1.3: add buildandgit.xml script.

---
 buildandgit.xml |  5 +++++
 buildjar.xml    | 13 ++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 buildandgit.xml

diff --git a/buildandgit.xml b/buildandgit.xml
new file mode 100644
index 0000000..61de64f
--- /dev/null
+++ b/buildandgit.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<project default="buildandgit" name="sikevadb">
+	<!-- -->
+	<import file="buildjar.xml" />
+</project>
diff --git a/buildjar.xml b/buildjar.xml
index fb2502d..4c4b5c1 100644
--- a/buildjar.xml
+++ b/buildjar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <project default="dist" name="jarbuild">
 	<!--ANT 1.7 is required -->
-	<property name="buildjar.version" value="1.2" />
+	<property name="buildjar.version" value="1.3" />
 	<property file="build.properties" />
 	<property name="build.dir" value="${basedir}/build" />
 	<property name="build.src" value="${basedir}/src" />
@@ -77,11 +77,7 @@
 	</target>
 
 	<!-- ***** Dist ***** -->
-	<target name="dist" description="Build distribution" depends="build,git">
-	</target>
-	
-	<!-- ***** Build ***** -->
-	<target name="build" description="Build distribution" depends="clean,compile,javadoc">
+	<target name="dist" description="Build distribution" depends="clean,compile,javadoc">
 		<!-- -->
 		<buildnumber file="build.num" description="Id of the build" />
 		<!-- AUTOMATIC MANAGEMENT -->
@@ -131,7 +127,7 @@
 	</target>
 	
 	<!-- ***** Dist ***** -->
-	<target name="git">
+	<target name="buildandgit" depends="dist">
 		<!-- GIT actions-->
         <echo message="Commit build.num"/>
         <exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
@@ -139,13 +135,12 @@
         </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"/>