# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268649901 -7200
# Node ID 8a441e81fe630a8f7f0906ffafabb6903d3e6259
# Parent  99082257a2711fe384a26b51bc4148ab13727dbc
Revision: 201010
Kit: 201010

diff -r 99082257a271 -r 8a441e81fe63 bldsystemtools/commonbldutils/SFUpdateLicenceHeader.cfg
--- a/bldsystemtools/commonbldutils/SFUpdateLicenceHeader.cfg	Fri Mar 12 15:49:27 2010 +0200
+++ b/bldsystemtools/commonbldutils/SFUpdateLicenceHeader.cfg	Mon Mar 15 12:45:01 2010 +0200
@@ -15,7 +15,7 @@
 # Description: Configuration file for the SFUpdateLicenceHeader.pl tool
 #
 # File version
-sf-update-licence-header-config-1.1
+sf-update-licence-header-config-1.2
 
 # Patterns for generated headers which can be ignored
 # Syntax:
@@ -40,9 +40,16 @@
 # sf-distribution-id ID4
 # sf-distribution-id ID5 ID6
 
+# ####################
+# Information based on
+# http://s60wiki.nokia.com/S60Wiki/Symbian_Foundation_initial_contribution/DevelopablePhaseStatus#Week_47_delivery
+# ####################
 # Isolationserver. This component takes care of isolating s60 code from open source code
 sf-distribution-id 301
 
+# Nokia VPN Client
+sf-distribution-id 1030
+
 # d-bus. Open source IPC library
 sf-distribution-id 1300
 
@@ -60,7 +67,7 @@
 sf-distribution-id 1303
 
 # Gstreamer. 3rd party component, open source code.
-# sf-distribution-id 1304
+### sf-distribution-id 1304
 
 # Libxml2. OSS, open C xml parser
 sf-distribution-id 1305
@@ -72,10 +79,10 @@
 sf-distribution-id 1307
 
 #iType rasterizer code (delivered to the Foundation under separate R&D licenses in BINARY format)
-sf-distribution-id 1309
+### sf-distribution-id 1309
 
 # S60 font files (delivered to the Foundation under separate R&D licenses in BINARY format)
-sf-distribution-id 1312
+### sf-distribution-id 1312
 
 # FreeType. The default font rasterizer
 sf-distribution-id 1313
@@ -89,3 +96,11 @@
 # ODE. ODE is an open source, high performance library for simulating rigid body dynamics.
 sf-distribution-id 1401
 
+# base_e32_compsupp
+sf-distribution-id 1423
+
+# zlib
+sf-distribution-id 1426
+
+# syslibs_FATCharsetConv
+sf-distribution-id 1427
diff -r 99082257a271 -r 8a441e81fe63 bldsystemtools/commonbldutils/SFUpdateLicenceHeader.pl
--- a/bldsystemtools/commonbldutils/SFUpdateLicenceHeader.pl	Fri Mar 12 15:49:27 2010 +0200
+++ b/bldsystemtools/commonbldutils/SFUpdateLicenceHeader.pl	Mon Mar 15 12:45:01 2010 +0200
@@ -29,7 +29,7 @@
 ####################
 
 # 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
@@ -80,10 +80,11 @@
 # 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;
 
@@ -91,7 +92,7 @@
 #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
@@ -119,7 +120,7 @@
 # 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)?';
@@ -145,7 +146,7 @@
 #
 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"
@@ -176,7 +177,7 @@
 #
 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"
@@ -200,7 +201,7 @@
 # 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"
@@ -232,7 +233,7 @@
 #
 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"
@@ -253,7 +254,7 @@
 ##############
 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
@@ -287,7 +288,7 @@
 #
 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
@@ -587,7 +588,8 @@
     
 	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 = '#';
@@ -1195,9 +1197,10 @@
 
     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]++;
@@ -1437,7 +1440,7 @@
 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
 {
@@ -1828,6 +1831,8 @@
     # 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 .
@@ -1847,6 +1852,11 @@
             return 1;  # OK
        }
 
+        if (!$isSFId)
+        {
+            return 1;
+        }   
+
         if (($$header_ref =~ m/$testValueSfl/s) || ($$filecontent_ref =~ m/$testValueSfl/s))
         {
             #  Still SFL header in place
@@ -1865,10 +1875,9 @@
     }
 
     # 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) )
         {