FCL/sf/os/buildtools: comparison bldsystemtools/commonbldutils/SFUpdateLicenceHeader.pl

equal deleted inserted replaced

-:99082257a271
+:8a441e81fe63
 ####################
 # Constants
 ####################
 # Tool version
-use constant VERSION => '2.1';
+use constant VERSION => '2.22';
 # Version history: 0.8 Added copyright year pick-up
 # Version history: 0.9- Bug fixesg
 # Version history: 0.95- EPL header support added
 # Version history: 0.96 Minor script adjustments
 # Version history: 0.97 Assembly files (.s, .cia, .asm) checked as well
 # Version history: 2.0 handleDistributionValue() changes IDs 0-->3/7 and 3-->7,
 #                      isGeneratedHeader() checks for file content added.
 # Version history: 2.01 checkPortionsCopyright implemented and applied
 # Version history: 2.02 Extra license word taken out from EPL header
 # Version history: 2.1 -verify -epl support added and switchLicense() tried first for SFL --> EPL switching
+# Version history: 2.20 Bug fixes.
 my $IGNORE_MAN ='Ignore-manually';
 my $IGNORE ='Ignore';
-my $INTERNAL = 'internal';
+my $INTERNAL = '/internal/';
 use constant KEEP_SYMBIAN => 0;
 use constant REMOVE_SYMBIAN => 1;
 #file extention list that headers should be replace
 my @extlist = ('.cpp', '.c', '.h', '.mmp', '.mmpi', '.rss', '.hrh', '.inl', '.inf', '.iby', '.oby',
 '.loc', '.rh', '.ra', '.java', '.mk', '.bat', '.cmd', '.pkg', '.rls', '.rssi', '.pan', '.py', '.pl', '.s', '.asm', '.cia',
-'.s60', '.pm', '.hpp', '.mmh', '.script',
+'.s60', '.pm', '.hpp', '.mmh', '.script', '.mrp',
 '.pro', '.pri');  # Qt specific
 # Various header comment styles
 my @header_regexps =
 (
 my $linenumtext = "1";  # Use this linenumer in LXR links
 # Copyright patterns
 my $copyrYearPattern = 'Copyright\b.*\d{4}\s*([,-]\s*\d{4})*';
 my $copyrYearPattern2 = '\d{4}(\s*[,-]\s*\d{4})*';
-use constant DEFCOPYRIGHTYEAR => "2009";  # For error cases
+use constant DEFCOPYRIGHTYEAR => "2010";  # For error cases
 my $NokiaCopyrPattern = '\bCopyright\b.*Nokia.*(All Rights)?';
 my $NonNokiaCopyrPattern = '\bCopyright\b.*(?!Nokia).*(All Rights)?';
 my $CopyrPattern = '\bCopyright\b';
 my $RemoveS60TextBlockPattern = 'This material.*Nokia';
 ###############
 # SFL C/C++ style
 #
 my $SFLicenseHeader =
 '/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 # SFL other comment styles (replace # with actual comment starter)
 #
 my $SFLicenseHeader_other_template =
 '#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 # EPL headers
 ###############
 # C/C++ style
 my $EPLLicenseHeader =
 '/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 # EPL other comment styles (replace # with comment starter)
 #
 my $EPLLicenseHeader_other_template =
 '#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ##############
 # LGPL headers
 ##############
 my $LGPLLicenseHeader =
 '/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
 * the Free Software Foundation, version 2.1 of the License.
 # LGPL other comment styles (replace # with comment starter)
 #
 my $LGPLLicenseHeader_other_template =
 '#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, version 2.1 of the License.
 return; # All done
 }
 	elsif ( (lc($suffix) eq ".mk" ) or
 (lc($suffix) eq ".pl") or (lc($suffix) eq ".py") or (lc($suffix) eq ".pm") or # script
-(lc($suffix) eq ".pro") or (lc($suffix) eq ".pri") )   # Qt specific
+(lc($suffix) eq ".pro") or (lc($suffix) eq ".pri") or    # Qt specific
+(lc($suffix) eq ".mrp") )
 {
 # Makefile, Perl or Python script  (# comment)
 		$cm = '#';
 		$cm2 = '#';
 		$newheader = &headerOf(OTHER_HEADER());
 printLog(LOG_DEBUG, "$full_filename content=$content\n");
 if ($dir =~ m/$INTERNAL/i)
 {
-if ( ($content eq SFL_DISTRIBUTION_VALUE) || ($content eq EPL_DISTRIBUTION_VALUE) )
+my $isSFId = &isSFDistribution($content);
-{
+if ( $isSFId )
-# Internal directory has SFL or EPL distribution value, something is wrong !
+{
+# Internal directory has SF distribution value, something is wrong !
 my $comment = "";  # Leave it just empty
 printResult(DISTRIBUTION_CONTEXT() . "$sep"."Internal directory going to SF (current value $content)$sep$comment$sep$sep$full_filename$sep$linenumtext\n");
 $verifyFailedCount[VERI_INTERNAL_TO_SF]++;
 }
 }
 my $sflUrl = 'http://www.symbianfoundation.org/legal/sfl-v10.html';
 my $eplText = '"Eclipse Public License v1.0"';
 my $eplUrl = 'http://www.eclipse.org/legal/epl-v10.html';
 my $eplUrlPattern = 'http\:\/\/www\.eclipse\.org\/legal\/epl\-v10\.html';
 my $eplTextPattern = '"Eclipse\s*Public\s*License\s*v1\.0"';
-my $oldEplTextPattern = 'the\s*License\s*"Eclipse\s*Public\s*License\s*v1\.0'; # "the License" is unncessary
+my $oldEplTextPattern = 'the\s*License\s*"Eclipse\s*Public\s*License\s*v1\.0"'; # "the License" is unncessary
 sub switchLicense
 {
 my $filecontent_ref = shift;
 my $header_ref = shift;
 #
 # OK, it should be Nokia copyrighted file
 #
+my $isSFId = &isSFDistribution($lastDistributionValue);
 # Note that partial headers are manually quoted in the declaration
 # Otherwise \Q$EPLText\E would be needed around those ones
 # because plain text contains special chars, like .
 printLog(LOG_DEBUG, "handleVerify testheaders: $testValueEpl,$$header_ref\n");
 }
 $verifyFailedCount[VERI_OK]++;
 return 1;  # OK
 }
+if (!$isSFId)
+{
+return 1;
+}
 if (($$header_ref =~ m/$testValueSfl/s) || ($$filecontent_ref =~ m/$testValueSfl/s))
 {
 #  Still SFL header in place
 printResult(HEADER_CONTEXT() . "$sep"."EPL header missing (SFL header used)$sep$sep$lastDistributionValue$sep$fullfilename$sep$linenumtext\n");
 }
 $verifyFailedCount[VERI_MISSING_HEADER]++;
 return 0;
 }
 # Cross header versus distribution ID
-if ($lastDistributionValue ne "")
+if ($isSFId)
 {
 # Also other than 7 may be OK based on the config file
-my $isSFId = &isSFDistribution($lastDistributionValue);
 printLog(LOG_DEBUG, "DEBUG:handleVerify:Other ID OK=$isSFId\n");
 if ( ($$filecontent_ref =~ m/$testValueEpl/s) && ($lastDistributionValue ne EPL_DISTRIBUTION_VALUE) )
 {
 printResult(HEADER_CONTEXT() . "$sep"."EPL header vs. distribution id ($lastDistributionValue) mismatch$sep$sep$lastDistributionValue$sep$fullfilename$sep$linenumtext\n");
 $verifyFailedCount[VERI_ID_HEADER_MISMATCH]++;

branch	RCL_3
changeset 19	8a441e81fe63
parent 18	99082257a271