You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/12/22 11:39:57 UTC
[32/50] [abbrv] ignite git commit: IGNITE-2184: Updated .NET/CPP
version update procedure.
IGNITE-2184: Updated .NET/CPP version update procedure.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/359bf214
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/359bf214
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/359bf214
Branch: refs/heads/ignite-gg-10837
Commit: 359bf2142627b1dbe26e00da1fb1ac071d71b4ce
Parents: 6edeccd
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Mon Dec 21 15:33:43 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 21 15:33:43 2015 +0300
----------------------------------------------------------------------
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Apache.Ignite/Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
.../Properties/AssemblyInfo.cs | 1 +
pom.xml | 42 ++++++++++----------
8 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
index 384f61c..f250841 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
index c7b9898..97941e1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
@@ -47,3 +47,4 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index 0c74e95..7e0ba0b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 3512810..4e22fb7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
[assembly: CLSCompliant(true)]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
index f6257f9..aa2297d 100644
--- a/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
index fa82d17..0d5ce64 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
index e1748ec..9fb948b 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@ using System.Reflection;
[assembly: AssemblyVersion("1.5.0.10000")]
[assembly: AssemblyFileVersion("1.5.0.10000")]
+[assembly: AssemblyInformationalVersion("1.5.0-final-SNAPSHOT")]
http://git-wip-us.apache.org/repos/asf/ignite/blob/359bf214/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7bc9492..c728f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -779,27 +779,18 @@
function setClientVersion(ggVer, clientVer) {
var p = project.getProperty(ggVer);
- var pos = p.search("-");
+ var digitVer = /\d+\.\d+\.\d+/.exec(p);
- if (pos > 0)
+ if (digitVer != null)
{
- var suffix = p.substring(pos);
+ // Date of the last major release
+ var startDate = new Date(2015,1,1);
- var ver = 0;
+ // Number of hours since the last major release
+ var buildNum = Math.round((new Date() - startDate)/(3600*1000));
+ var ver = digitVer[0] + "." + buildNum;
- var beta = /-b([0-9]+)/.exec(suffix);
- if (beta !== null)
- ver += parseInt(beta[1]);
-
- var patch = /-p([0-9]+)/.exec(suffix);
- if (patch !== null)
- ver += parseInt(patch[1]) * 100;
-
- if (suffix.search("final") > 0)
- ver += 10000;
-
- var resVer = p.substring(0, pos) +"." + ver;
- project.setProperty(clientVer, resVer);
+ project.setProperty(clientVer, ver);
}
else
project.setProperty(clientVer, p);
@@ -820,7 +811,7 @@
<echo message="${new.client.version}" />
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(\[assembly:\s*Assembly\w*Version\w*\(")\d.\d.\d(.\d)?("\)\])" />
+ <regexp pattern="(\[assembly:\s*Assembly\w*Version\w*\(")\d+\.\d+\.\d+(\.\d+)?("\)\])" />
<substitution expression="\1${new.client.version}\3" />
<fileset dir="${basedir}/">
<include name="**/AssemblyInfo.cs" />
@@ -828,9 +819,18 @@
</fileset>
</replaceregexp>
+ <replaceregexp byline="true" encoding="UTF-8">
+ <regexp pattern="(\[assembly:\s*AssemblyInformationalVersion\w*\(").*?("\)\])" />
+ <substitution expression="\1${new.ignite.version}\2" />
+ <fileset dir="${basedir}/">
+ <include name="**/AssemblyInfo.cs" />
+ <include name="**/AssemblyInfo.cpp" />
+ </fileset>
+ </replaceregexp>
+
<echo message="Update ignite.version in cpp client" />
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(AC_INIT.+\[)\d.\d.\d.*?(\].+)" />
+ <regexp pattern="(AC_INIT.+\[)\d+\.\d+\.\d+.*?(\].+)" />
<substitution expression="\1${new.client.version}\2" />
<fileset dir="${basedir}/">
<include name="**/configure.ac" />
@@ -838,7 +838,7 @@
</replaceregexp>
<replaceregexp byline="true" encoding="UTF-8">
- <regexp pattern="(define GG_VERSION_STR_WIN ")\d.\d.\d(.\d)?(")" />
+ <regexp pattern="(define GG_VERSION_STR_WIN ")\d+\.\d+\.\d+(\.\d+)?(")" />
<substitution expression="\1${new.client.version}\3" />
<fileset dir="${basedir}/">
<include name="**/resource.h" />
@@ -846,7 +846,7 @@
</replaceregexp>
<replaceregexp byline="true" encoding="UTF-16">
- <regexp pattern="(Version", ")\d.\d.\d.\d(")" />
+ <regexp pattern="(Version", ")\d+\.\d+\.\d+\.\d+(")" />
<substitution expression="\1${new.client.version}\2" />
<fileset dir="${basedir}/">
<include name="**/Resource.rc" />