From be3ed8e646aa475259a44d401b8fe86668da7683 Mon Sep 17 00:00:00 2001
From: balaskoa <jeno.balasko@ericsson.com>
Date: Wed, 12 Oct 2016 17:11:47 +0200
Subject: [PATCH] Version number update to CRL113200/6 R1A
Signed-off-by: balaskoa <jeno.balasko@ericsson.com>
---
common/version.h | 10 +++++-----
function_test/Semantic_Analyser/ver/high_titan_SE.ttcn | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/version.h b/common/version.h
index 69a4b8930..fec337518 100644
--- a/common/version.h
+++ b/common/version.h
@@ -22,10 +22,10 @@
#define VERSION_H
/* Version numbers */
-#define TTCN3_MAJOR 5
-#define TTCN3_MINOR 5
-#define TTCN3_PATCHLEVEL 1 //0-> x=A, 1-> x=B, ...
-#define TTCN3_BUILDNUMBER 1 //0=R5x, 1=R5x01, 2=R5x02, ...
+#define TTCN3_MAJOR 6
+#define TTCN3_MINOR 1
+#define TTCN3_PATCHLEVEL 0 //0-> x=A, 1-> x=B, ...
+#define TTCN3_BUILDNUMBER 0 //0=R5x, 1=R5x01, 2=R5x02, ...
/* The aggregated version number must be set manually since some stupid
* 'makedepend' programs cannot calculate arithmetic expressions.
@@ -35,7 +35,7 @@
* TTCN3_VERSION = TTCN3_MAJOR * 1000000 + TTCN3_MINOR * 10000 +
* TTCN3_PATCHLEVEL * 100 + TTCN3_BUILDNUMBER
*/
-#define TTCN3_VERSION 5050101
+#define TTCN3_VERSION 6010000
/* A monotonically increasing version number.
* An official release is deemed to have the highest possible build number (99)
diff --git a/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn b/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn
index a137b6f23..ae17f9126 100644
--- a/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn
+++ b/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn
@@ -24,8 +24,8 @@ with {
// check for the more general /R\d[A-HJ-NS-VX-Z](\d{1,2})?/
/* Test needs to be adjusted for every release !!!!!!! */
- extension "requiresTITAN CRL 113 200/5 R5A"; /* This one must just pass, the next one must just fail */
- extension "requiresTITAN CRL 113 200/5 R6A01"; //^error: This module needs to be compiled with TITAN version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? or higher; version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? detected//
+ extension "requiresTITAN CRL 113 200/6 R1A"; /* This one must just pass, the next one must just fail */
+ extension "requiresTITAN CRL 113 200/6 R1A01"; //^error: This module needs to be compiled with TITAN version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? or higher; version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? detected//
/* The old style RnXnn, without the CRL 113 200 and the suffix, implies major version 1
* Now that Titan is at version 2, the following will always pass:
--
GitLab