Changeset 19031

Timestamp:

07/12/06 09:56:35 (2 years ago)

Author:

patrick

Message:

When a module's version changes, remove old versioned files (.lib, .dll,
etc.) from the build tree.

Files:

• juggler/trunk/build_windows.py (modified) (7 diffs)

juggler/trunk/build_windows.py

@@ -385 +385 @@
-   cache_file.close()
-
-generateVersionHeader
+updateVersion
-   class JugglerModule:
-      def __init__(self, srcDir, vcDir, projDir, versionEnvVar,
@@ -396 +396 @@
-         self.version_env_var_dot = versionEnvVar + '_DOT'
-         self.param_files         = []
+         self.proj_dir            = os.path.join(gJugglerDir, vcDir, projDir)
-
-         if genFiles is not None:
-            for f in genFiles:
-gJugglerDir, vcDir, projD
+self.proj_d
-
-               if len(f) == 1 or f[1] is None:
@@ -408 +409 @@
-               self.param_files.append((output, template))
-
-gener
+upd
-         for (output, template) in self.param_files:
-            if os.path.exists(output):
@@ -426 +427 @@
-         os.environ[self.version_env_var_dot] = '%d.%d.%d' % \
-                                                   (major, minor, patch)
+
+      def removeOldVersions(self):
+         output_files = []
+         for ext in ['lib', 'dll', 'exp', 'ilk', 'pdb']:
+            output_files += glob.glob(os.path.join(self.proj_dir, '*', '*',
+                                                   '*.' + ext))
+
+         mtime = os.path.getmtime
+         for f in output_files:
+            if mtime(self.version_file) > mtime(f):
+               try:
+                  os.remove(f)
+               except:
+                  print "Failed to remove", f
-
-      version_re      = re.compile(r'((\d+)\.(\d+)\.(\d+)-(\d+))\s')
@@ -551 +566 @@
-   for m in mods:
-      m.setVersionEnvVar()
-
+
+
-
-def generateAntBuildFiles(vcDir):
@@ -1991 +2007 @@
-
-   def runVisualStudio(self):
-generateVersionHeader
+updateVersion
-      self.printMessage("Generating Version Headers.")
-generateVersionHeader
+updateVersion
-      self.printMessage("Generating Ant Build Files.")
-      generateAntBuildFiles(self.mVcDir)
@@ -2080 +2096 @@
-      (cl_ver_major, cl_ver_minor, vc_dir) = chooseVisualStudioDir()
-      options = setVars(cl_ver_major, cl_ver_minor)
-generateVersionHeader
+updateVersion
-      generateAntBuildFiles(vc_dir)
-