- Make the cache files be rebuilt only when the declarations' version changes, instead o pyste's version

Bruno da Silva de Oliveira · Bruno da Silva de Oliveira · commit 2b380d03c9b2 · 2003-08-23T19:18:52.000Z
[SVN r19759]
diff --git a/pyste/NEWS b/pyste/NEWS
@@ -1,6 +1,6 @@
 23 August 2003
 Fixed bug where some Imports where not writing their include files.  
-Now whenever the Pyste version changes, the cache files are rebuilt
+Now whenever the declarations change, the cache files are rebuilt
 automatically.
 
 19 August 2003
diff --git a/pyste/src/Pyste/declarations.py b/pyste/src/Pyste/declarations.py
@@ -3,6 +3,11 @@
     
 '''
 
+# version indicates the version of the declarations. Whenever a declaration
+# changes, this variable should be updated, so that the caches can be rebuilt
+# automatically
+version = '1.0'
+
 #==============================================================================
 # Declaration
 #==============================================================================
diff --git a/pyste/src/Pyste/pyste.py b/pyste/src/Pyste/pyste.py
@@ -41,9 +41,9 @@
 from policies import *
 from CppParser import CppParser, CppParserError
 import time
-from declarations import Typedef
+import declarations
 
-__version__ = '0.9.19'
+__version__ = '0.9.20'
 
 def RecursiveIncludes(include):
     'Return a list containg the include dir and all its subdirectories'
@@ -205,7 +205,7 @@ def Begin():
     for interface in interfaces:
         ExecuteInterface(interface)
     # create the parser
-    parser = CppParser(includes, defines, cache_dir, __version__)
+    parser = CppParser(includes, defines, cache_dir, declarations.version)
     try:
         if not create_cache:
             if not generate_main:
@@ -343,13 +343,13 @@ def GenerateCode(parser, module, out, interfaces, multiple):
     return 0
 
 
-def ExpandTypedefs(declarations, exported_names):
+def ExpandTypedefs(decls, exported_names):
     '''Check if the names in exported_names are a typedef, and add the real class 
     name in the dict.
     '''
     for name in exported_names.keys():
-        for decl in declarations:
-            if isinstance(decl, Typedef):
+        for decl in decls:
+            if isinstance(decl, declarations.Typedef):
                 exported_names[decl.type.FullName()] = None
 
 def UsePsyco():
diff --git a/pyste/tests/test_all.py b/pyste/tests/test_all.py
@@ -4,6 +4,7 @@
 import glob
 import shutil
 import sys
+import time
 
 #=============================================================================
 # win32 configuration
@@ -94,12 +95,23 @@ def main(multiple, module=None):
         modules = get_modules()
     else:
         modules = [module]
+    
+    start = time.clock()
     for module in modules:    
         build_pyste(multiple, module) 
+    print '-'*50
+    print 'Building pyste files: %0.2f seconds' % (time.clock()-start)
+    print
+    
+    start = time.clock()
+    for module in modules:
         if multiple:
             compile_multiple(module)
         else:
             compile_single(module) 
+    print '-'*50
+    print 'Compiling files: %0.2f seconds' % (time.clock()-start) 
+    print
     if len(modules) == 1:
         os.system('python %sUT.py' % modules[0])
     else:
