devinsy/buildjar
1
0
Fork 0
Code Issues Pull requests Releases Activity

Version 1.3: add buildandgit.xml script.

Browse source
This commit is contained in:
Christian P. MOMON 2014-02-08 16:34:51 +01:00
parent 9ff3bcb11a
commit 4cc6cd97f7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
buildandgit.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<project default="buildandgit" name="sikevadb">
<!-- -->
<import file="buildjar.xml" />
</project>

11
buildjar.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?> <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<project default="dist" name="jarbuild"> <project default="dist" name="jarbuild">
<!--ANT 1.7 is required --> <!--ANT 1.7 is required -->
<property name="buildjar.version" value="1.2" /> <property name="buildjar.version" value="1.3" />
<property file="build.properties" /> <property file="build.properties" />
<property name="build.dir" value="${basedir}/build" /> <property name="build.dir" value="${basedir}/build" />
<property name="build.src" value="${basedir}/src" /> <property name="build.src" value="${basedir}/src" />
@ -77,11 +77,7 @@
</target> </target>
<!-- ***** Dist ***** --> <!-- ***** Dist ***** -->
<target name="dist" description="Build distribution" depends="build,git"> <target name="dist" description="Build distribution" depends="clean,compile,javadoc">
</target>
<!-- ***** Build ***** -->
<target name="build" description="Build distribution" depends="clean,compile,javadoc">
<!-- --> <!-- -->
<buildnumber file="build.num" description="Id of the build" /> <buildnumber file="build.num" description="Id of the build" />
<!-- AUTOMATIC MANAGEMENT --> <!-- AUTOMATIC MANAGEMENT -->
@ -131,7 +127,7 @@
</target> </target>
<!-- ***** Dist ***** --> <!-- ***** Dist ***** -->
<target name="git"> <target name="buildandgit" depends="dist">
<!-- GIT actions--> <!-- GIT actions-->
<echo message="Commit build.num"/> <echo message="Commit build.num"/>
<exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true"> <exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">
@ -139,7 +135,6 @@
</exec> </exec>
<echo message="${git.commit.out}" /> <echo message="${git.commit.out}" />
<echo message="Tag"/> <echo message="Tag"/>
<exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true"> <exec executable="git" outputproperty="git.tag.out" failifexecutionfails="true">
<arg line="tag -a ${dist.version} -m 'Build ${dist.version}'"/> <arg line="tag -a ${dist.version} -m 'Build ${dist.version}'"/>