From: Xavier Ducrohet Date: Thu, 3 Jan 2013 18:49:28 +0000 (-0800) Subject: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command... X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/218c8389d15ef0667eac8bc883f63eeb7133bdea?hp=853cbd5801d6c83dca7ee7ab8f3392b16bde7c96 am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge. * commit '816fd074cfc32fd3323163dd0c358e249f9cbf56': Add single crunch command to aapt. do not merge. --- diff --git a/Bundle.h b/Bundle.h index 5089b9d..fde3bd6 100644 --- a/Bundle.h +++ b/Bundle.h @@ -38,7 +38,6 @@ typedef enum Command { kCommandRemove, kCommandPackage, kCommandCrunch, - kCommandSingleCrunch, } Command; /* @@ -63,7 +62,6 @@ public: mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL), mExtraPackages(NULL), mMaxResVersion(NULL), mDebugMode(false), mNonConstantId(false), mProduct(NULL), mUseCrunchCache(false), mErrorOnFailedInsert(false), mOutputTextSymbols(NULL), - mSingleCrunchInputFile(NULL), mSingleCrunchOutputFile(NULL), mArgc(0), mArgv(NULL) {} ~Bundle(void) {} @@ -178,10 +176,6 @@ public: bool getUseCrunchCache() const { return mUseCrunchCache; } const char* getOutputTextSymbols() const { return mOutputTextSymbols; } void setOutputTextSymbols(const char* val) { mOutputTextSymbols = val; } - const char* getSingleCrunchInputFile() const { return mSingleCrunchInputFile; } - void setSingleCrunchInputFile(const char* val) { mSingleCrunchInputFile = val; } - const char* getSingleCrunchOutputFile() const { return mSingleCrunchOutputFile; } - void setSingleCrunchOutputFile(const char* val) { mSingleCrunchOutputFile = val; } /* * Set and get the file specification. @@ -289,8 +283,6 @@ private: bool mUseCrunchCache; bool mErrorOnFailedInsert; const char* mOutputTextSymbols; - const char* mSingleCrunchInputFile; - const char* mSingleCrunchOutputFile; /* file specification */ int mArgc; diff --git a/Command.cpp b/Command.cpp index b98925b..0a5e590 100644 --- a/Command.cpp +++ b/Command.cpp @@ -7,7 +7,6 @@ #include "Bundle.h" #include "ResourceFilter.h" #include "ResourceTable.h" -#include "Images.h" #include "XMLNode.h" #include @@ -1840,21 +1839,6 @@ int doCrunch(Bundle* bundle) return NO_ERROR; } -/* - * Do PNG Crunching on a single flag - * -i points to a single png file - * -o points to a single png output file - */ -int doSingleCrunch(Bundle* bundle) -{ - fprintf(stdout, "Crunching single PNG file: %s\n", bundle->getSingleCrunchInputFile()); - fprintf(stdout, "\tOutput file: %s\n", bundle->getSingleCrunchOutputFile()); - - String8 input(bundle->getSingleCrunchInputFile()); - String8 output(bundle->getSingleCrunchOutputFile()); - return preProcessImageToCache(bundle, input, output); -} - char CONSOLE_DATA[2925] = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 95, 46, 32, 32, 32, 32, 32, 32, 32, 32, 32, diff --git a/Main.cpp b/Main.cpp index 32fecb2..f398de0 100644 --- a/Main.cpp +++ b/Main.cpp @@ -85,11 +85,7 @@ void usage(void) " Add specified files to Zip-compatible archive.\n\n", gProgName); fprintf(stderr, " %s c[runch] [-v] -S resource-sources ... -C output-folder ...\n" - " Do PNG preprocessing on one or several resource folders\n" - " and store the results in the output folder.\n\n", gProgName); - fprintf(stderr, - " %s s[ingleCrunch] [-v] -i input-file -o outputfile\n" - " Do PNG preprocessing on a single file.\n\n", gProgName); + " Do PNG preprocessing and store the results in output folder.\n\n", gProgName); fprintf(stderr, " %s v[ersion]\n" " Print program version.\n\n", gProgName); @@ -207,14 +203,13 @@ int handleCommand(Bundle* bundle) // printf(" %d: '%s'\n", i, bundle->getFileSpecEntry(i)); switch (bundle->getCommand()) { - case kCommandVersion: return doVersion(bundle); - case kCommandList: return doList(bundle); - case kCommandDump: return doDump(bundle); - case kCommandAdd: return doAdd(bundle); - case kCommandRemove: return doRemove(bundle); - case kCommandPackage: return doPackage(bundle); - case kCommandCrunch: return doCrunch(bundle); - case kCommandSingleCrunch: return doSingleCrunch(bundle); + case kCommandVersion: return doVersion(bundle); + case kCommandList: return doList(bundle); + case kCommandDump: return doDump(bundle); + case kCommandAdd: return doAdd(bundle); + case kCommandRemove: return doRemove(bundle); + case kCommandPackage: return doPackage(bundle); + case kCommandCrunch: return doCrunch(bundle); default: fprintf(stderr, "%s: requested command not yet supported\n", gProgName); return 1; @@ -254,8 +249,6 @@ int main(int argc, char* const argv[]) bundle.setCommand(kCommandPackage); else if (argv[1][0] == 'c') bundle.setCommand(kCommandCrunch); - else if (argv[1][0] == 's') - bundle.setCommand(kCommandSingleCrunch); else { fprintf(stderr, "ERROR: Unknown command '%s'\n", argv[1]); wantUsage = true; @@ -434,28 +427,6 @@ int main(int argc, char* const argv[]) convertPath(argv[0]); bundle.setCrunchedOutputDir(argv[0]); break; - case 'i': - argc--; - argv++; - if (!argc) { - fprintf(stderr, "ERROR: No argument supplied for '-i' option\n"); - wantUsage = true; - goto bail; - } - convertPath(argv[0]); - bundle.setSingleCrunchInputFile(argv[0]); - break; - case 'o': - argc--; - argv++; - if (!argc) { - fprintf(stderr, "ERROR: No argument supplied for '-o' option\n"); - wantUsage = true; - goto bail; - } - convertPath(argv[0]); - bundle.setSingleCrunchOutputFile(argv[0]); - break; case '0': argc--; argv++; diff --git a/Main.h b/Main.h index a6b39ac..d20c601 100644 --- a/Main.h +++ b/Main.h @@ -29,7 +29,6 @@ extern int doAdd(Bundle* bundle); extern int doRemove(Bundle* bundle); extern int doPackage(Bundle* bundle); extern int doCrunch(Bundle* bundle); -extern int doSingleCrunch(Bundle* bundle); extern int calcPercent(long uncompressedLen, long compressedLen); diff --git a/Resource.cpp b/Resource.cpp index 77168f9..9c2e1b9 100644 --- a/Resource.cpp +++ b/Resource.cpp @@ -1946,7 +1946,7 @@ static status_t writeTextLayoutClasses( const bool pub = (typeSpecFlags&ResTable_typeSpec::SPEC_PUBLIC) != 0; fprintf(fp, - "int styleable %s_%s %d\n", + "int styleable.%s_%s %d\n", nclassName.string(), String8(name).string(), (int)pos); }