# Allow to build from source package
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bbf0117 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bbf0117 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bbf0117 Branch: refs/heads/ignite-437-sqltests Commit: 0bbf011716b8032140ff63c71d65a82de843b4cc Parents: 676a568 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Mar 26 15:35:51 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Mar 26 15:35:51 2015 -0700 ---------------------------------------------------------------------- modules/core/pom.xml | 14 ++++++++++++-- .../org/apache/ignite/lang/IgniteProductVersion.java | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bbf0117/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 369ae27..29c5226 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -245,12 +245,12 @@ <configuration> <target> <exec executable="${git.exec}" outputproperty="ignite.build" - failonerror="yes"> + failonerror="no"> <arg line="log -1 --format=%ct"/> </exec> <exec executable="${git.exec}" outputproperty="ignite.revision" - failonerror="yes"> + failonerror="no"> <arg line="log -1 --format=%H"/> </exec> @@ -286,6 +286,16 @@ <substitution expression="ignite.update.status.params=ver=${ignite.version}"/> </replaceregexp> + + <replaceregexp file="${props.file}" byline="true"> + <regexp pattern="ignite.build=fatal:.*" /> + <substitution expression="ignite.build=0" /> + </replaceregexp> + + <replaceregexp file="${props.file}" byline="true"> + <regexp pattern="ignite.revision=fatal:.*" /> + <substitution expression="ignite.revision=n/a" /> + </replaceregexp> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bbf0117/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java index 034fb85..afdf06d 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java @@ -257,7 +257,7 @@ public class IgniteProductVersion implements Comparable<IgniteProductVersion>, E public static IgniteProductVersion fromString(String verStr) { assert verStr != null; - if (verStr.endsWith("-DEV")) // Development version, just cut it out. + if (verStr.endsWith("-DEV") || verStr.endsWith("-n/a")) // Development or built from source ZIP. verStr = verStr.substring(0, verStr.length() - 4); Matcher match = VER_PATTERN.matcher(verStr);
