# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1277128626 -10800
# Node ID 7416fe50a18048d75b4d4b5eefcf93bb8098e78f
# Parent  5e76a11e104bdfd41d2d80026923748c34f73ab1
Revision: 201025
Kit: 2010125

diff -r 5e76a11e104b -r 7416fe50a180 sbsv1_os/e32toolp/e32util/e32tpver.pm
--- a/sbsv1_os/e32toolp/e32util/e32tpver.pm	Tue May 25 13:55:34 2010 +0300
+++ b/sbsv1_os/e32toolp/e32util/e32tpver.pm	Mon Jun 21 16:57:06 2010 +0300
@@ -24,7 +24,7 @@
 
 
 sub E32tpver () {
-	my $Version=678; 
+	my $Version=680; 
 }
 
 1;
diff -r 5e76a11e104b -r 7416fe50a180 sbsv1_os/e32toolp/group/release.txt
--- a/sbsv1_os/e32toolp/group/release.txt	Tue May 25 13:55:34 2010 +0300
+++ b/sbsv1_os/e32toolp/group/release.txt	Mon Jun 21 16:57:06 2010 +0300
@@ -1,4 +1,21 @@
+Version 0.01.680
+================
+(Made by Lorence Wang 05/17/2009)
+1) Marvin Shi
+	DEF145403  ABLD bug on GCCE static/import library location 
+2) Marvin Shi
+  DEF145339  abld -check and -what for selected targets is wrong
+
+Version 0.01.679
+================
+(Made by Zheng Shen 11/02/2009)
+1) Marvin Shi
+	PDEF144284  refine fix for Bug 151 -  bldmake is not in PDK2.0c
+2) Ross Qin
+  PDEF144387  Tools meta files should not be exported in the build phase 
+
 Version 0.01.678
+================
 (Made by Zheng Shen 8/02/2009)
 1) Brook Hong
 	DEF143588  Excess warnings from makedef.pl 
diff -r 5e76a11e104b -r 7416fe50a180 sbsv1_os/e32toolp/makmake/makmake.pl
--- a/sbsv1_os/e32toolp/makmake/makmake.pl	Tue May 25 13:55:34 2010 +0300
+++ b/sbsv1_os/e32toolp/makmake/makmake.pl	Mon Jun 21 16:57:06 2010 +0300
@@ -21,7 +21,6 @@
 use FindBin;		# for FindBin::Bin
 use Getopt::Long;
 use Cwd;
-use strict;
 # modified start: makefile improvement 
 use File::stat;
 use Time::localtime;
@@ -1229,7 +1228,13 @@
 	}
 
 #	set up release path
-	$Path{Rel}="$E32env::Data{RelPath}".lc($Plat{Real})."\\";
+	if((&Plat() =~ /gcce/i) && ($TrgType{Basic} eq 'LIB'))
+	{
+		$Path{Rel}=$Path{StatLink};
+	}
+	else {
+		$Path{Rel}="$E32env::Data{RelPath}".lc($Plat{Real})."\\";
+	}
 	
 }
 
diff -r 5e76a11e104b -r 7416fe50a180 sbsv1_os/e32toolp/platform/cl_bpabi.pm
--- a/sbsv1_os/e32toolp/platform/cl_bpabi.pm	Tue May 25 13:55:34 2010 +0300
+++ b/sbsv1_os/e32toolp/platform/cl_bpabi.pm	Mon Jun 21 16:57:06 2010 +0300
@@ -1110,10 +1110,20 @@
 	&main::Output(" \\\n\$(EPOCSTATLINK$Bld)\\$StaticRTLib\.lib");
 
 	&main::Output(" \\\n\t",getConfigVariable('VIA_FILE_PREFIX'));
-	PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCBSFSTATLINK$Bld\)\\\\\$_\"\)", @StatLibList);
+	if($PlatName =~ /^gcce$/i) {
+		PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCSTATLINK$Bld\)\\\\\$_\"\)", @StatLibList);
+	}
+	else {
+		PrintList("\' \\\n\t\'\.\&Generic_Quote\(\"\\\$\(EPOCBSFSTATLINK$Bld\)\\\\\$_\"\)", @StatLibList);
+	}
 	&main::Output(" \\\n\t",getConfigVariable('VIA_FILE_SUFFIX'));
 	
-	@depLibs = (@depLibs, DepLinkList("\&Generic_Quote\(\"\\\$\(EPOCBSFSTATLINK$Bld\)\\\\\$_\"\)", @StatLibList));
+	if($PlatName =~ /^gcce$/i) {
+		@depLibs = (@depLibs, DepLinkList("\&Generic_Quote\(\"\\\$\(EPOCSTATLINK$Bld\)\\\\\$_\"\)", @StatLibList));
+	}
+	else {
+		@depLibs = (@depLibs, DepLinkList("\&Generic_Quote\(\"\\\$\(EPOCBSFSTATLINK$Bld\)\\\\\$_\"\)", @StatLibList));
+	}
 	
 	
 	my @ImportLibList = ImportLibraryList(@LibList);
@@ -1706,9 +1716,14 @@
          elsif ($BasicTrgType=~/^LIB$/o) {
 			&main::Output(
 			"\t\$(AR) ",
-				" \$(ARCHIVER_CREATE_OPTION) ",
-				" \$(EPOCBSFSTATLINK$Bld)\\$Trg \\\n"
+				" \$(ARCHIVER_CREATE_OPTION) "
 			);
+			if($PlatName =~ /^gcce$/i) {
+				&main::Output(" \$(EPOCSTATLINK$Bld)\\$Trg \\\n");
+			}
+			else {
+				&main::Output(" \$(EPOCBSFSTATLINK$Bld)\\$Trg \\\n");
+			}
 		# Pass in the command file if the command file option is passed in
 		if($viaoption) {
                         #'@' is for GCCE whos version is not 3.4.3
diff -r 5e76a11e104b -r 7416fe50a180 sbsv1_os/e32toolp/platform/lockit_info.pm
--- a/sbsv1_os/e32toolp/platform/lockit_info.pm	Tue May 25 13:55:34 2010 +0300
+++ b/sbsv1_os/e32toolp/platform/lockit_info.pm	Mon Jun 21 16:57:06 2010 +0300
@@ -32,7 +32,6 @@
 	Close_InfoFile
 );
 
-use strict;
 use Pathutl;
 my $epocroot;
 my $epocPath;
@@ -87,25 +86,6 @@
 		copy("$RppFile", "$FilePath\\$ResrcFile.rpp");
 	}
 
-	# update bitmaps in epoc32\localisation if -l option and bitmaps specified
-	if ($CWDir && ($Bitmaps ne ""))
-	{
-		my $BmpRef;
-		$Bitmaps =~ s/ +|\t/ /g; # replace tabs and more spaces with single space
-		$Bitmaps =~s/^ //g; # remove leading space
-		$Bitmaps =~s/ $//g; # remove trailing space
-
-		my (@AifBitmaps) = split(/ /, $Bitmaps);
-		foreach $BmpRef (@AifBitmaps) {
-			$BmpRef =~ /^([^\\]+)(\\.*)$/;
-			my $CDepth = $1;
-			my $bmp = $2;
-			Copy_Files($bmp, $FilePath);
-			my $file_base= basename($bmp);
-			chmod (0666,"$FilePath\\$file_base");
-		}
-	}
-
 	if (defined $ENV{ABLD_TOOLSMOD_COMPATIBILITY_MODE} &&  ($ENV{ABLD_TOOLSMOD_COMPATIBILITY_MODE} eq 'alpha')) {
 		if (LineExists($ResrcFile.$lang, $RscTarget) == 0)
 		{
@@ -196,7 +176,7 @@
 sub Create_InfoFile ()
 	{
 	my ($CreateLockitPath, $CreateInfoFile, $Datadir) = @_;
-	if ( !-e "$CreateLockitPath") { mkpath($CreateLockitPath); }
+	if (($CreateLockitPath !~ /mbm$/i) && (!-e "$CreateLockitPath")) { mkpath($CreateLockitPath); }
 	if ( !-e "$epocPath\\group") { mkpath("$epocPath\\group"); }
 	if ( !-e "$epocPath\\group\\$CreateInfoFile.info") {	
 		open INFO,">$epocPath\\group\\$CreateInfoFile.info" or die "ERROR: Can not create file \"$CreateInfoFile\"\n"; 
@@ -325,14 +305,14 @@
 			$LockitPath .= "\\$BaseResrc.rpp";
 		}
 		else {
-			$LockitPath .= "\\$Bitmaps";
+			undef $LockitPath;
 		}
 	}
 
 	my %loggedFiles;
 	$loggedFiles{lc($_)} = 1 foreach keys (%Files);
 	
-	$Files{$LockitPath} = 1 if !($loggedFiles{lc($LockitPath)});
+	$Files{$LockitPath} = 1 if (defined $LockitPath) && (!($loggedFiles{lc($LockitPath)}));
 	$Files{$LockitInfoPath} = 1 if !($loggedFiles{lc($LockitInfoPath)});
 	
 	return %Files;