commit 358490082d8435aa36feaff8107aa55c3cf363ad
author Logan <tzuhsiang.chien@gmail.com> Sat Jan 15 07:30:43 2011 +0800
committer Logan <tzuhsiang.chien@gmail.com> Sun Jan 16 11:09:43 2011 +0800
tree 99d53b027789dd4b8a93017a696263a6467a866f
parent e89f60008eedc589f41c200c4e6012e660d4aea2

Introduce Config.h.  So that libbcc will rebuild on config change.

lib/bcc/Script.cpp

diff --git a/lib/bcc/Script.cpp b/lib/bcc/Script.cpp
index 23ec7fc..89d6115 100644
--- a/lib/bcc/Script.cpp
+++ b/lib/bcc/Script.cpp
@@ -19,6 +19,8 @@
 
 #include "Script.h"
 
+#include "Config.h"
+
 #include "CacheReader.h"
 #include "CacheWriter.h"
 #include "FileHandle.h"
@@ -46,10 +48,19 @@
 namespace bcc {
 
 Script::~Script() {
-  if (mStatus == ScriptStatus::Compiled) {
+  switch (mStatus) {
+  case ScriptStatus::Compiled:
     delete mCompiled;
-  } else if (mStatus == ScriptStatus::Cached) {
+    break;
+
+#if USE_CACHE
+  case ScriptStatus::Cached:
     delete mCached;
+    break;
+#endif
+
+  default:
+    break;
   }
 }
 
@@ -108,16 +119,19 @@
     return 1;
   }
 
+#if USE_CACHE
   // Load Cache File
   mCachePath = cachePath;
   if (cachePath && internalLoadCache() == 0) {
     return 0;
   }
+#endif
 
   return internalCompile();
 }
 
 
+#if USE_CACHE
 int Script::internalLoadCache() {
   if (getBooleanProp("debug.bcc.nocache")) {
     // Android system environment property disable the cache mechanism by
@@ -152,7 +166,7 @@
   CacheReader reader;
 
   // Dependencies
-#if defined(USE_LIBBCC_SHA1SUM)
+#if USE_LIBBCC_SHA1SUM
   reader.addDependency(BCC_FILE_RESOURCE, pathLibBCC, sha1LibBCC);
 #endif
 
@@ -183,6 +197,7 @@
 
   return 0;
 }
+#endif
 
 
 int Script::internalCompile() {
@@ -233,6 +248,7 @@
     return 1;
   }
 
+#if USE_CACHE
   // TODO(logan): Write the cache out
   if (mCachePath && !getBooleanProp("debug.bcc.nocache")) {
     FileHandle file;
@@ -241,7 +257,7 @@
       CacheWriter writer;
 
       // Dependencies
-#if defined(USE_LIBBCC_SHA1SUM)
+#if USE_LIBBCC_SHA1SUM
       writer.addDependency(BCC_FILE_RESOURCE, pathLibBCC, sha1LibBCC);
 #endif
       writer.addDependency(BCC_FILE_RESOURCE, pathLibRS, sha1LibRS);
@@ -270,6 +286,7 @@
       }
     }
   }
+#endif // USE_CACHE
 
   return 0;
 }
@@ -288,7 +305,9 @@
 void *Script::lookup(const char *name) {
   switch (mStatus) {
   case ScriptStatus::Compiled:  return mCompiled->lookup(name);
+#if USE_CACHE
   case ScriptStatus::Cached:    return mCached->lookup(name);
+#endif
 
   default:
     mErrorCode = BCC_INVALID_OPERATION;
@@ -300,7 +319,9 @@
 size_t Script::getExportVarCount() const {
   switch (mStatus) {
   case ScriptStatus::Compiled:  return mCompiled->getExportVarCount();
+#if USE_CACHE
   case ScriptStatus::Cached:    return mCached->getExportVarCount();
+#endif
   default:                      return 0;
   }
 }
@@ -309,7 +330,9 @@
 size_t Script::getExportFuncCount() const {
   switch (mStatus) {
   case ScriptStatus::Compiled:  return mCompiled->getExportFuncCount();
+#if USE_CACHE
   case ScriptStatus::Cached:    return mCached->getExportFuncCount();
+#endif
   default:                      return 0;
   }
 }
@@ -318,7 +341,9 @@
 size_t Script::getPragmaCount() const {
   switch (mStatus) {
   case ScriptStatus::Compiled:  return mCompiled->getPragmaCount();
+#if USE_CACHE
   case ScriptStatus::Cached:    return mCached->getPragmaCount();
+#endif
   default:                      return 0;
   }
 }
@@ -327,7 +352,9 @@
 size_t Script::getFuncCount() const {
   switch (mStatus) {
   case ScriptStatus::Compiled:  return mCompiled->getFuncCount();
+#if USE_CACHE
   case ScriptStatus::Cached:    return mCached->getFuncCount();
+#endif
   default:                      return 0;
   }
 }
@@ -340,7 +367,10 @@
     m##STATUS->getExportVarList(varListSize, varList); \
     break;
 
+#if USE_CACHE
   DELEGATE(Cached);
+#endif
+
   DELEGATE(Compiled);
 #undef DELEGATE
 
@@ -357,7 +387,10 @@
     m##STATUS->getExportFuncList(funcListSize, funcList); \
     break;
 
+#if USE_CACHE
   DELEGATE(Cached);
+#endif
+
   DELEGATE(Compiled);
 #undef DELEGATE
 
@@ -376,7 +409,10 @@
     m##STATUS->getPragmaList(pragmaListSize, keyList, valueList); \
     break;
 
+#if USE_CACHE
   DELEGATE(Cached);
+#endif
+
   DELEGATE(Compiled);
 #undef DELEGATE
 
@@ -394,7 +430,10 @@
     m##STATUS->getFuncInfoList(funcInfoListSize, funcInfoList);
     break;
 
+#if USE_CACHE
   DELEGATE(Cached);
+#endif
+
   DELEGATE(Compiled);
 #undef DELEGATE
 
@@ -405,7 +444,9 @@
 
 char *Script::getContext() {
   switch (mStatus) {
+#if USE_CACHE
   case ScriptStatus::Cached:    return mCached->getContext();
+#endif
   case ScriptStatus::Compiled:  return mCompiled->getContext();
 
   default: