Update buildjar to version 1.3.
This commit is contained in:
parent
6494251be8
commit
c8028369fe
2 changed files with 9 additions and 9 deletions
5
buildandgit.xml
Normal file
5
buildandgit.xml
Normal file
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<project default="buildandgit" name="sikevadb">
|
||||
<!-- -->
|
||||
<import file="buildjar.xml" />
|
||||
</project>
|
13
buildjar.xml
13
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"/>
|
||||
|
|
Loading…
Reference in a new issue