You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/10/27 14:55:15 UTC
svn commit: r830187 - in /felix/trunk/sigil/bldcommon: build.properties
common.xml
Author: dsavage
Date: Tue Oct 27 13:55:15 2009
New Revision: 830187
URL: http://svn.apache.org/viewvc?rev=830187&view=rev
Log:
build up version using $buildQualifer vs expecting full version to be parsed in by cli
Modified:
felix/trunk/sigil/bldcommon/build.properties
felix/trunk/sigil/bldcommon/common.xml
Modified: felix/trunk/sigil/bldcommon/build.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/build.properties?rev=830187&r1=830186&r2=830187&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/build.properties (original)
+++ felix/trunk/sigil/bldcommon/build.properties Tue Oct 27 13:55:15 2009
@@ -1,6 +1,10 @@
# common properties
# easier to set here than in xml file
+buildRelease = 0.9.0
+buildQualifier = SNAPSHOT
+buildVersion = ${buildRelease}.${buildQualifier}
+
# set common.dir when used without ant (e.g. IvyDE)
common.dir = ${ivy.settings.dir}
@@ -35,8 +39,5 @@
resolve.log = download-only
-# over-ridden by hudson
-buildVersion = 0.9.0.SNAPSHOT
-
# end
Modified: felix/trunk/sigil/bldcommon/common.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/common.xml?rev=830187&r1=830186&r2=830187&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/common.xml (original)
+++ felix/trunk/sigil/bldcommon/common.xml Tue Oct 27 13:55:15 2009
@@ -22,11 +22,8 @@
xmlns:groovy="antlib:org.codehaus.groovy">
<dirname property="common.dir" file="${ant.file.bldcommon}"/>
- <property file="${common.dir}/sigil-defaults.properties" prefix="default."/>
<property file="${common.dir}/build.properties"/>
- <echo>cache=${cache.dir}</echo>
- <echo>buildVersion=${buildVersion}</echo>
<!-- =====================================================
stuff intended to be over-ridden is prefixed with my.
=====================================================-->