diff --git a/common/version.h b/common/version.h index 7074164e96626f8e7cf157f4d3c9e124c806120b..ceb87a4dbd2916accf063ebeba498a8fad551e83 100644 --- a/common/version.h +++ b/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) diff --git a/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn b/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn index 15b3da71615bd5fd0ca40788532642c765e59396..fbec26b4e9ed2ec1e5cd8dd5f8fd44767a574110 100644 --- a/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn +++ b/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: