move some version stuff to version.properties

This commit is contained in:
Doug MacEachern 2006-07-13 21:54:52 +00:00
parent 8d2efbb3c1
commit 0af92b17f9
2 changed files with 11 additions and 8 deletions

View File

@ -4,12 +4,10 @@
<project name="Sigar" default="build" basedir="."> <project name="Sigar" default="build" basedir=".">
<property name="copyright.year" value="2004-2006"/> <property file="version.properties"/>
<property name="version.major" value="1"/>
<property name="version.minor" value="2"/>
<property name="version.maint" value="0"/>
<property name="sigar.version" <property name="sigar.version"
value="${version.major}.${version.minor}.${version.maint}"/> value="${version.major}.${version.minor}.${version.maint}.${version.build}"/>
<property file="${user.home}/.sigar-build.properties"/> <property file="${user.home}/.sigar-build.properties"/>
<property name="project.name" value="sigar"/> <property name="project.name" value="sigar"/>
@ -107,6 +105,7 @@
<replacefilter token="@@VERSION_MAJOR@@" value="${version.major}"/> <replacefilter token="@@VERSION_MAJOR@@" value="${version.major}"/>
<replacefilter token="@@VERSION_MINOR@@" value="${version.minor}"/> <replacefilter token="@@VERSION_MINOR@@" value="${version.minor}"/>
<replacefilter token="@@VERSION_MAINT@@" value="${version.maint}"/> <replacefilter token="@@VERSION_MAINT@@" value="${version.maint}"/>
<replacefilter token="@@VERSION_BUILD@@" value="${version.build}"/>
<replacefilter token="@@COPYRIGHT_YEAR@@" value="${copyright.year}"/> <replacefilter token="@@COPYRIGHT_YEAR@@" value="${copyright.year}"/>
</replace> </replace>
</target> </target>
@ -124,8 +123,6 @@
<antcall target="version-file"> <antcall target="version-file">
<param name="version.file.srcdir" <param name="version.file.srcdir"
value="../.."/> value="../.."/>
<param name="version.file.dstdir"
value="${jni.libarch}"/>
<param name="version.file" <param name="version.file"
value="src/sigar_version.c"/> value="src/sigar_version.c"/>
</antcall> </antcall>
@ -160,7 +157,7 @@
<include name="bindings/java/src/jni/*.c"/> <include name="bindings/java/src/jni/*.c"/>
<include name="bindings/java/src/${win32.jni}/*.cpp"/> <include name="bindings/java/src/${win32.jni}/*.cpp"/>
<include name="bindings/java/src/${win32.jni}/*.c"/> <include name="bindings/java/src/${win32.jni}/*.c"/>
<include name="bindings/java/build/${jni.libarch}/src/*.c"/> <include name="bindings/java/build/src/sigar_version.c"/>
</patternset> </patternset>
<path id="jni.include.dirs"> <path id="jni.include.dirs">

View File

@ -0,0 +1,6 @@
copyright.year=2004-2006
version.major=1
version.minor=2
version.maint=0
version.build=0