diff --git a/common/version.h b/common/version.h index 2e60420f4826d7708d1684e70c7c5b3a6486283e..db61657ba3120ad46e813dbfa1c4614263553e6c 100644 --- a/common/version.h +++ b/common/version.h @@ -24,8 +24,8 @@ /* Version numbers */ #define TTCN3_MAJOR 6 -#define TTCN3_MINOR 5 -#define TTCN3_PATCHLEVEL 2 //0-> x=A, 1-> x=B, ... +#define TTCN3_MINOR 6 +#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 60502 +#define TTCN3_VERSION 60600 /* 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 329440c7d6d5b8b926625e6927dc81d9d21642a9..5e61b521049a7899198582a399ae5e6481ea97c7 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 R5C"; /* This one must just pass, the next one must just fail */ - extension "requiresTITAN CRL 113 200/6 R5D01"; //^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 R6A"; /* This one must just pass, the next one must just fail */ + extension "requiresTITAN CRL 113 200/6 R6B01"; //^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: