FCL/sftools/dev/build: comparison imgtools/romtools/rofsbuild/rofsbuild.cpp

equal deleted inserted replaced

-:ccd52fece6ff
+:0757c2976f96
 #include "cache/cache.hpp"
 #include "cache/cachegenerator.hpp"
 #include "cache/cachevalidator.hpp"
 #include "cache/cacheablelist.hpp"
 #include "cache/cachemanager.hpp"
-#include "logging/loggingexception.hpp"
+#include "logparser.h"
-#include "logging/logparser.hpp"
 #include <malloc.h>
 #ifndef WIN32
 #include <unistd.h>
 #include <strings.h>
 #define stricmp strcasecmp
 #define _alloca alloca
 #endif
 static const TInt RofsbuildMajorVersion=2;
-static const TInt RofsbuildMinorVersion=16;
+static const TInt RofsbuildMinorVersion=17;
 static const TInt RofsbuildPatchVersion=3;
 static TBool SizeSummary=EFalse;
 static TPrintType SizeWhere=EAlways;
 static TInt gHeaderType=1;			// EPOC header
 ECompression gCompress=ECompressionUnknown;
 TUint  gCompressionMethod=0;
 TInt gThreadNum = 0;
 TInt gCPUNum = 0;
 TBool gGenSymbols = EFalse;
+TBool gGenBsymbols = EFalse;
 TInt gCodePagingOverride = -1;
 TInt gDataPagingOverride = -1;
 TInt gLogLevel = 0;	// Information is logged based on logging level.
 // The default is 0. So all the existing logs are generated as if gLogLevel = 0.
 // If any extra information required, the log level must be appropriately supplied.
 	"Option: -v verbose,  -?,  -s[log|screen|both] size summary\n"
 	"        -d<bitmask> set trace mask (DEB build only)\n"
 	"        -compress   compress executable files where possible\n"
 	"        -j<digit> do the main job with <digit> threads\n"
 	"        -symbols generate symbol file\n"
+	"        -bsymbols generate binary symbol file\n"
 	"        -compressionmethod none|inflate|bytepair to set the compression\n"
 	"              none     uncompress the image.\n"
 	"              inflate  compress the image.\n"
 	"              bytepair compress the image.\n"
 	"        -coreimage <core image file>\n"
 				if(argv[i][5]) {
 					gSmrImage = ETrue;
 					gSmrFileName.assign(&argv[i][5]);
 				}
 				else {
-					Print (EError, "SMR obey file is missing\n");
+					printf ("ERROR: SMR obey file is missing\n");
 				}
 			} else if (stricmp(argv[i], "-K") == 0) {
 				gKeepGoing = ETrue;
 			}else if (stricmp(argv[i], "-SYMBOLS") == 0) {
 				gGenSymbols = ETrue;
+			}
+			else if (stricmp(argv[i], "-BSYMBOLS") == 0 ) {
+				gGenBsymbols = ETrue;
 			}
 			else if (((argv[i][1] | 0x20) == 's') &&
 				(((argv[i][2]| 0x20) == 'l')||((argv[i][2] | 0x20) == 's'))) {
 					SizeSummary = ETrue;
 					if ((argv[i][2]| 0x20) == 'l')
 			else if(strnicmp(argv[i], "-OBY-CHARSET=", 13) == 0)
 			{
 				if((stricmp(&argv[i][13], "UTF8")==0) || (stricmp(&argv[i][13], "UTF-8")==0))
 					gIsOBYUTF8 = ETrue;
 				else
-					Print(EError, "Invalid encoding %s, default system internal encoding will be used.\n", &argv[i][13]);
+					printf("ERROR: Invalid encoding %s, default system internal encoding will be used.\n", &argv[i][13]);
 			}
 			else if (stricmp(argv[i], "-UNCOMPRESS") == 0) {
 				gCompress = ECompressionUncompress;
 			}
 			else if( stricmp(argv[i], "-COMPRESSIONMETHOD") == 0 ) {
 				// next argument should a be method
 				if( (i+1) >= argc || argv[i+1][0] == '-') {
-					Print (EError, "Missing compression method! Set it to default (no compression)!");
+					printf("ERROR: Missing compression method! Set it to default (no compression)!");
 					gCompressionMethod = 0;
 				}
 				else {
 					i++;
 					if( stricmp(argv[i], "NONE") == 0) {
 					else if( stricmp(argv[i], "BYTEPAIR") == 0) {
 						gCompress = ECompressionCompress;
 						gCompressionMethod = KUidCompressionBytePair;
 					}
 					else {
-						Print (EError, "Unknown compression method! Set it to default (no compression)!");
+						printf("ERROR: Unknown compression method! Set it to default (no compression)!");
 						gCompress = ECompressionUnknown;
 						gCompressionMethod = 0;
 					}
 				}
 			else if (stricmp(argv[i], "-COREIMAGE") == 0) {
 				gUseCoreImage = ETrue;
 				// next argument should be image filename
 				if ((i+1 >= argc) || argv[i+1][0] == '-')
-					Print (EError, "Missing image file name");
+					printf("ERROR: Missing image file name");
 				else {
 					i++;
 					gImageFilename.assign(argv[i]);
 				}
 			}
 				if(argv[i][11])	{
 					gDriveImage = ETrue;
 					gDriveFilename.assign(&argv[i][11]);
 				}
 				else {
-					Print (EError, "Drive obey file is missing\n");
+					printf("ERROR: Drive obey file is missing\n");
 				}
 			}
 			else if (argv[i][1] == '?') {
 				reallyHelp = ETrue;
 			}
 				gEnableStdPathWarning = ETrue;
 			}
 			else if( stricmp(argv[i], "-LOGLEVEL") == 0) {
 				// next argument should a be loglevel
 				if( (i+1) >= argc || argv[i+1][0] == '-') {
-					Print (EError, "Missing loglevel!");
+					printf ("ERROR: Missing loglevel!");
 					gLogLevel = DEFAULT_LOG_LEVEL;
 				}
 				else {
 					i++;
 					if (strcmp(argv[i], "2") == 0)
 					if (strcmp(argv[i], "1") == 0)
 						gLogLevel = LOG_LEVEL_FILE_DETAILS;
 					else if (strcmp(argv[i], "0") == 0)
 						gLogLevel = DEFAULT_LOG_LEVEL;
 					else
-						Print(EError, "Only loglevel 0, 1 or 2 is allowed!");
+						printf("ERROR: Only loglevel 0, 1 or 2 is allowed!");
 				}
 			}
 			else if( stricmp(argv[i], "-LOGLEVEL2") == 0)
 				gLogLevel = (LOG_LEVEL_FILE_DETAILS | LOG_LEVEL_FILE_ATTRIBUTES);
 			else if( stricmp(argv[i], "-LOGLEVEL1") == 0)
 			else if (strnicmp(argv[i], "-loginput=", 10) == 0) {
 				loginput = argv[i] + 10;
 			}
 			else {
 #ifdef WIN32
-				Print (EWarning, "Unrecognised option %s\n",argv[i]);
+				printf ("WARNING: Unrecognised option %s\n",argv[i]);
 #else
 				if(0 == access(argv[i],R_OK)){
 					filename.assign(argv[i]);
 				}
 				else {
-					Print (EWarning, "Unrecognised option %s\n",argv[i]);
+					printf("WARNING: Unrecognised option %s\n",argv[i]);
 				}
 #endif
 			}
 		}
 		i++;
 	}
 	if (paramFileFlag)
 		return;
+	if(gGenSymbols && gGenBsymbols)
+	{
+		printf("WARNING: Options symbols and bsymbols cannot be used at the same time, the common symbols file will be created this time!\n");
+		gGenBsymbols = EFalse;
+	}
 	if((gDriveImage == EFalse) && (gSmrImage ==  EFalse) &&
 		(filename.empty() || (gUseCoreImage && gImageFilename.length() == 0)) && (loginput.length() == 0)){
 			Print (EAlways, HelpText);
 			if (reallyHelp) {
 				ObeyFileReader::KeywordHelp();
 				Print (EAlways, ReallyHelpText);
 			}
 			else if (filename.empty()){
-				Print(EAlways, "Obey filename is missing\n");
+				printf("WARNING: Obey filename is missing\n");
 			}
 	}
 }
 /**
 		gCPUNum = MAXIMUM_THREADS;
 	PrintVersion();
 	processCommandLine(argc, argv);
 	if(gThreadNum == 0) {
 		if(gCPUNum > 0) {
-			printf("WARNING: The number of processors (%d) is used as the number of concurrent jobs.\n", gCPUNum);
+			printf("The double number of processors (%d) is used as the number of concurrent jobs.\n", gCPUNum * 2);
-			gThreadNum = gCPUNum;
+			gThreadNum = gCPUNum * 2;
 		}
 		else {
-			printf("WARNING: Can't automatically get the valid number of concurrent jobs and %d is used.\n", DEFAULT_THREADS);
+			printf("Can't automatically get the valid number of concurrent jobs and %d is used.\n", DEFAULT_THREADS);
 			gThreadNum = DEFAULT_THREADS;
 		}
 	}
 	if(loginput.length() >= 1)
 	{
 		try
 		{
-			LogParser::GetInstance()->ParseSymbol(loginput.c_str());
+			LogParser::GetInstance(ERofsImage)->ParseSymbol(loginput.c_str());
 		}
 		catch(LoggingException le)
 		{
 			printf("ERROR: %s\r\n", le.GetErrorMessage());
 			return 1;

changeset 708	0757c2976f96
parent 698	e3ee96a3961c
child 714	e5a58c351011