Merge "Version changed for 6.5.0"

common/version.h

@@ -24,8 +24,8 @@
 
 /* Version numbers */
 #define TTCN3_MAJOR 6
-#define TTCN3_MINOR 4
-#define TTCN3_PATCHLEVEL 2   //0-> x=A, 1-> x=B, ...
+#define TTCN3_MINOR 5
+#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
@@ -38,7 +38,7 @@
  * TTCN3_VERSION = TTCN3_MAJOR * 1000000 + TTCN3_MINOR * 10000 +
  *                 TTCN3_PATCHLEVEL * 100 + TTCN3_BUILDNUMBER
  */
-#define TTCN3_VERSION 60402
+#define TTCN3_VERSION 60500
 
 /* A monotonically increasing version number.
  * An official release is deemed to have the highest possible build number (99)

function_test/Semantic_Analyser/ver/high_titan_SE.ttcn

@@ -25,8 +25,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/6 R4C"; /* This one must just pass, the next one must just fail */
-  extension "requiresTITAN CRL 113 200/6 R4D01"; //^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 R5A"; /* This one must just pass, the next one must just fail */
+  extension "requiresTITAN CRL 113 200/6 R5B01"; //^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 6, the following will always pass: