# HG changeset patch # User jjkang # Date 1277967486 -28800 # Node ID f76e0f94b7ab9cc6548653f4a9656d681d2e99e5 # Parent 690cd13b97a933cb1924b11c824cc43c2b3d4a81 Minor change: update package_definition.xml diff -r 690cd13b97a9 -r f76e0f94b7ab bintools/elftools/group/bld.inf --- a/bintools/elftools/group/bld.inf Wed Jun 30 16:14:56 2010 +0800 +++ b/bintools/elftools/group/bld.inf Thu Jul 01 14:58:06 2010 +0800 @@ -25,7 +25,6 @@ #ifndef TOOLS2_LINUX ../elf2inf.pl /epoc32/tools/elf2inf.pl ../def2dll.bat /epoc32/tools/def2dll.bat -A ../deputil.pl /epoc32/tools/deputil.pl ../deputil.pm /epoc32/tools/deputil.pm #endif diff -r 690cd13b97a9 -r f76e0f94b7ab cpptoolsplat/gcce-4.3.2/arm-none-symbianelf-2008-q3-67.exe Binary file cpptoolsplat/gcce-4.3.2/arm-none-symbianelf-2008-q3-67.exe has changed diff -r 690cd13b97a9 -r f76e0f94b7ab imgtools/buildrom/tools/buildrom.pm --- a/imgtools/buildrom/tools/buildrom.pm Wed Jun 30 16:14:56 2010 +0800 +++ b/imgtools/buildrom/tools/buildrom.pm Thu Jul 01 14:58:06 2010 +0800 @@ -152,7 +152,8 @@ -lowmem -- use memory-mapped file for image build to reduce physical memory consumption -checkcase -- check character case of path/name in oby/iby files, the result will be checkcase.log, this option is only valid on windows. - -workdir=xxx -- specify a directory to contain generated files. + -workdir=xxx -- specify a directory to contain generated files. + -prependepocroot -- if there is no EPOCROOT## before /epoc32/, prepend EPOCROOT## to epoc32. Popular -D defines to use include @@ -342,6 +343,7 @@ my $checkcase_platform = ""; my $checkcase_test = 0; my $opt_workdir = 0; +my $prependepocroot = 0; sub match_obyfile { @@ -1019,7 +1021,12 @@ chdir "$currentdir"; next; } - if($arg =~/^-c(.*)/) + if ($arg =~ /^-prependepocroot$/) + { + $prependepocroot = 1; + next; + } + if($arg =~/^-c(.*)/) { if($1 eq 'none' ) { @@ -1438,14 +1445,16 @@ track_source($line); $line =~ s-\\-\/-g; - my $tempstring = $epocroot."epoc32"; - if(($line !~ /^\s*\#/) && ($line =~ /\/epoc32/i) - && ($line !~ /EPOCROOT##\/?epoc32/i) && ($line !~ /$tempstring/i)) + if ($prependepocroot) { - print "add EPOCROOT for line: $line\n" if ($opt_v); - $line =~ s-\/epoc32-EPOCROOT##epoc32-ig; + my $tempstring = $epocroot."epoc32\/"; + if(($line !~ /^\s*\#/) && ($line =~ /\/epoc32\//i) + && ($line !~ /EPOCROOT##\/?epoc32\//i) && ($line !~ /$tempstring/i)) + { + print "add EPOCROOT for line: $line\n" if ($opt_v); + $line =~ s-\/epoc32-EPOCROOT##epoc32-ig; + } } - # # Recognise keywords in lines that we process before substitution # diff -r 690cd13b97a9 -r f76e0f94b7ab imgtools/romtools/group/release.txt --- a/imgtools/romtools/group/release.txt Wed Jun 30 16:14:56 2010 +0800 +++ b/imgtools/romtools/group/release.txt Thu Jul 01 14:58:06 2010 +0800 @@ -1,3 +1,13 @@ +Version 2.12.2 (ROFSBUILD) +=============== +Released by Marvin Shi, 30/06/2010 + 1)DEF145479 Rofsbuild fails to build SMR image with non-HCR content. + +Version 2.12.1 (ROFSBUILD) +=============== +Released by Lorence Wang, 30/06/2010 + 1)Rofsbuild cache test case failed defect. + Version 2.12.0 (ROFSBUILD) =============== Released by Jason Cui, 13/06/2010 diff -r 690cd13b97a9 -r f76e0f94b7ab imgtools/romtools/rofsbuild/r_obey.cpp --- a/imgtools/romtools/rofsbuild/r_obey.cpp Wed Jun 30 16:14:56 2010 +0800 +++ b/imgtools/romtools/rofsbuild/r_obey.cpp Thu Jul 01 14:58:06 2010 +0800 @@ -87,7 +87,7 @@ {_K("fileuncompress"),2, -2,EKeywordFileUncompress,"Non-XIP Executable to be loaded into the ROM uncompressed" }, {_K("patchdata"),2, 5,EKeywordPatchDllData, "Patch exported data"}, {_K("imagename"), 1, 1, EKeywordSmrImageName, "output file for SMR image"}, - {_K("hcrdata"), 1, 1, EKeywordSmrFileData, "file data for HCR SMR image"}, + {_K("smrdata"), 1, 1, EKeywordSmrFileData, "file data for SMR image"}, {_K("formatversion"), 1, 1, EKeywordSmrFormatVersion, "format version for HCR SMR image"}, {_K("payloadflags"), 1, 1, EKeywordSmrFlags, "payload flags for the HCR SMR image"}, {_K("payloaduid"), 1, 1, EKeywordSmrUID, "payload UID for the HCR SMR image"}, diff -r 690cd13b97a9 -r f76e0f94b7ab imgtools/romtools/rofsbuild/r_smrimage.cpp --- a/imgtools/romtools/rofsbuild/r_smrimage.cpp Wed Jun 30 16:14:56 2010 +0800 +++ b/imgtools/romtools/rofsbuild/r_smrimage.cpp Thu Jul 01 14:58:06 2010 +0800 @@ -70,31 +70,25 @@ Val(iSmrRomHeader.iImageVersion,aValues.at(0).c_str()); return ETrue; } -TBool CSmrImage::SetHcrData(const StringVector& aValues) +TBool CSmrImage::SetSmrData(const StringVector& aValues) { if(aValues.size() == 0) { - Print(EError, "keyword hcrdata has not been set!"); + Print(EError, "keyword smrdata has not been set!"); return EFalse; } if(aValues.size() > 1) { - Print(EError, "Keyword hcrdata has been set more than one time!"); + Print(EError, "Keyword smrdata has been set more than one time!"); return EFalse; } - iHcrData = aValues.at(0); + iSmrData = aValues.at(0); - ifstream is(iHcrData.c_str(), ios_base::binary ); + ifstream is(iSmrData.c_str(), ios_base::binary ); if(!is) { - Print(EError, "HCR data file: %s dose not exist!", iHcrData.c_str()); - return EFalse; - } - TUint32 magicWord = 0; - is.read(reinterpret_cast(&magicWord),sizeof(TUint32)); - if(0x66524348 != magicWord){ - Print(EError, "HCR data file: %s is an invalid HCR data file!", iHcrData.c_str()); + Print(EError, "SMR data file: %s dose not exist!", iSmrData.c_str()); return EFalse; } is.close(); @@ -140,7 +134,7 @@ return result; if(! SetFormatVersion(iObeyFile->getValues("formatversion"))) return result; - if(! SetHcrData(iObeyFile->getValues("hcrdata"))) + if(! SetSmrData(iObeyFile->getValues("smrdata"))) return result; if(! SetPayloadUID(iObeyFile->getValues("payloaduid"))) return result; @@ -153,10 +147,10 @@ { TInt imageSize = 0; ifstream is; - is.open(iHcrData.c_str(), ios_base::binary); + is.open(iSmrData.c_str(), ios_base::binary); if(!is) { - Print(EError, "Open HCR data file: %s error!\n", iHcrData.c_str()); + Print(EError, "Open SMR data file: %s error!\n", iSmrData.c_str()); return KErrGeneral; } is.seekg(0, ios_base::end); diff -r 690cd13b97a9 -r f76e0f94b7ab imgtools/romtools/rofsbuild/r_smrimage.h --- a/imgtools/romtools/rofsbuild/r_smrimage.h Wed Jun 30 16:14:56 2010 +0800 +++ b/imgtools/romtools/rofsbuild/r_smrimage.h Thu Jul 01 14:58:06 2010 +0800 @@ -28,7 +28,7 @@ TInt CreateImage(); TBool SetImageName(const StringVector& aValues); TBool SetFormatVersion(const StringVector& aValues); - TBool SetHcrData(const StringVector& aValues); + TBool SetSmrData(const StringVector& aValues); TBool SetPayloadUID(const StringVector& aValues); TBool SetPayloadFlags(const StringVector& aValues); TInt Initialise(); @@ -37,7 +37,7 @@ CObeyFile* iObeyFile; SSmrRomHeader iSmrRomHeader; string iImageName; - string iHcrData; + string iSmrData; }; diff -r 690cd13b97a9 -r f76e0f94b7ab imgtools/romtools/rofsbuild/rofsbuild.cpp --- a/imgtools/romtools/rofsbuild/rofsbuild.cpp Wed Jun 30 16:14:56 2010 +0800 +++ b/imgtools/romtools/rofsbuild/rofsbuild.cpp Thu Jul 01 14:58:06 2010 +0800 @@ -47,7 +47,7 @@ static const TInt RofsbuildMajorVersion=2; static const TInt RofsbuildMinorVersion=12; -static const TInt RofsbuildPatchVersion=0; +static const TInt RofsbuildPatchVersion=2; static TBool SizeSummary=EFalse; static TPrintType SizeWhere=EAlways; diff -r 690cd13b97a9 -r f76e0f94b7ab imgtools/romtools/rofsbuild/src/cache/cachevalidator.cpp --- a/imgtools/romtools/rofsbuild/src/cache/cachevalidator.cpp Wed Jun 30 16:14:56 2010 +0800 +++ b/imgtools/romtools/rofsbuild/src/cache/cachevalidator.cpp Thu Jul 01 14:58:06 2010 +0800 @@ -60,18 +60,19 @@ { return (CacheEntry*)0; } + + boost::filesystem::path originalfile(OriginalFilename); + time_t originalcreationtime = last_write_time(originalfile); + string creationtime(ctime(&originalcreationtime)); + size_t newlinepos = creationtime.find("\n"); + while(newlinepos != string::npos) + { + creationtime.erase(newlinepos, 1); + newlinepos = creationtime.find(("\n")); + } while(entryref) { - boost::filesystem::path originalfile(OriginalFilename); - time_t originalcreationtime = last_write_time(originalfile); - string creationtime(ctime(&originalcreationtime)); - size_t newlinepos = creationtime.find("\n"); - while(newlinepos != string::npos) - { - creationtime.erase(newlinepos, 1); - newlinepos = creationtime.find(("\n")); - } - if((creationtime.compare(entryref->GetOriginalFileCreateTime())== 0) || (atoi(entryref->GetCachedFileCompressionID())==CurrentCompressionID)) + if((creationtime.compare(entryref->GetOriginalFileCreateTime())== 0) && (atoi(entryref->GetCachedFileCompressionID())==CurrentCompressionID)) { boost::filesystem::path cachedfile(entryref->GetCachedFilename()); string filename = cachedfile.file_string(); diff -r 690cd13b97a9 -r f76e0f94b7ab package_definition.xml --- a/package_definition.xml Wed Jun 30 16:14:56 2010 +0800 +++ b/package_definition.xml Thu Jul 01 14:58:06 2010 +0800 @@ -1,76 +1,335 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +