Merge branch 'master' of ssh://review.gerrithub.io:29418/eclipse/titan.core

compiler2/ProjectGenHelper.cc

 ///////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
 // which accompanies this distribution, and is available at

compiler2/ProjectGenHelper.hh

 ///////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
 // which accompanies this distribution, and is available at

compiler2/makefile.c

@@ -1250,7 +1250,8 @@ static void add_file_to_makefile(struct makefile_struct *makefile, char *argumen
             add_ttcn3_module(makefile, file_name, module_name);
           }
      } else if (is_asn1_module(file_name, fp, &module_name)) {
-         if (is_valid_asn1_filename(file_name)) {
+         expstring_t only_file_name = get_file_from_path(file_name);
+         if (is_valid_asn1_filename(only_file_name)) {
            add_asn1_module(makefile, file_name, module_name);
          } else {
              ERROR("The file name `%s' (without suffix) shall be identical to the module name `%s'.\n"
@@ -1258,6 +1259,7 @@ static void add_file_to_makefile(struct makefile_struct *makefile, char *argumen
                    "file name shall contain an underscore character instead.", file_name, module_name);
              Free(module_name);
          }
+         Free(only_file_name);
      } else if (is_xsd_module(file_name, &module_name)) {
        add_xsd_module(makefile, file_name, module_name);
      } else {

compiler2/titanver

 #!/bin/sh
 ###############################################################################
-# Copyright (c) 2000-2015 Ericsson Telecom AB
+# Copyright (c) 2000-2016 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at

compiler2/ttcn3_makefilegen.1

@@ -198,7 +198,7 @@ Ericsson document 2/198 17-CRL 113 200 Uen:
 .SH AUTHOR
 This manpage is written by Janos Zoltan Szabo, Ericsson Telecom AB
 .br
-Copyright (c) 2000-2015 Ericsson Telecom AB
+Copyright (c) 2000-2016 Ericsson Telecom AB
 .br
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

conformance_test/core_language_tests/negative_tests/SAtester.pl

 #!/usr/bin/perl -w
 ###############################################################################
-# Copyright (c) 2000-2015 Ericsson Telecom AB
+# Copyright (c) 2000-2016 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/Sem_0902_001_loopbackPort.cc

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Complete the body of empty functions and
 // add your member functions here.

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/Sem_0902_001_loopbackPort.hh

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Add your attributes and prototypes of your
 // member functions here.

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/Sem_0902_002_loopbackPort.cc

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Complete the body of empty functions and
 // add your member functions here.

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/Sem_0902_002_loopbackPort.hh

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Add your attributes and prototypes of your
 // member functions here.

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/loopbackPort.cc

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Complete the body of empty functions and
 // add your member functions here.

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/loopbackPort.hh

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Add your attributes and prototypes of your
 // member functions here.

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/loopbackPort1.cc

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Complete the body of empty functions and
 // add your member functions here.

conformance_test/core_language_tests/positive_tests/09_test_configurations/0902_test_system_interface/loopbackPort1.hh

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Add your attributes and prototypes of your
 // member functions here.

conformance_test/core_language_tests/positive_tests/16_functions_altsteps_testcases/1602_altsteps/160201_invoking_altsteps/Sem_160201_003_loopbackPort.cc

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Complete the body of empty functions and
 // add your member functions here.

conformance_test/core_language_tests/positive_tests/16_functions_altsteps_testcases/1602_altsteps/160201_invoking_altsteps/Sem_160201_003_loopbackPort.hh

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Add your attributes and prototypes of your
 // member functions here.

conformance_test/core_language_tests/positive_tests/16_functions_altsteps_testcases/1602_altsteps/160201_invoking_altsteps/Sem_160201_004_loopbackPort.cc

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Complete the body of empty functions and
 // add your member functions here.

conformance_test/core_language_tests/positive_tests/16_functions_altsteps_testcases/1602_altsteps/160201_invoking_altsteps/Sem_160201_004_loopbackPort.hh

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Add your attributes and prototypes of your
 // member functions here.

conformance_test/core_language_tests/positive_tests/20_statement_and_operations_for_alt/2002_the_alt_statement/Sem_2002_012_loopbackPort.cc

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Complete the body of empty functions and
 // add your member functions here.

conformance_test/core_language_tests/positive_tests/20_statement_and_operations_for_alt/2002_the_alt_statement/Sem_2002_012_loopbackPort.hh

@@ -2,7 +2,7 @@
 // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
 
-// Copyright (c) 2000-2015 Ericsson Telecom AB
+// Copyright (c) 2000-2016 Ericsson Telecom AB
 
 // You may modify this file. Add your attributes and prototypes of your
 // member functions here.