Merge from head.

[gem5.git] / util / make_release.py

diff --git a/util/make_release.py b/util/make_release.py
index 47b6678fe80bad6960176b2aca207c03de0c8c3b..636391a96aea3a1269e606e0ed63a86675661f5f 100755 (executable)
--- a/util/make_release.py
+++ b/util/make_release.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2006 The Regents of The University of Michigan
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,6 +33,7 @@ import os
 import re
 import shutil
 import sys
+import time
 
 from glob import glob
 from os import system
@@ -42,9 +43,10 @@ def mkdir(*args):
     path = joinpath(*args)
     os.mkdir(path)
 
-def touch(*args):
+def touch(*args, **kwargs):
+    when = kwargs.get('when', None)
     path = joinpath(*args)
-    os.utime(path, None)
+    os.utime(path, when)
 
 def rmtree(*args):
     path = joinpath(*args)
@@ -110,8 +112,13 @@ mkdir(encumbered_dir)
 
 system('bk export -tplain -w -r+ %s' % release_dir)
 
+
+# move the time forward on some files by a couple of minutes so we can
+# avoid building things unnecessarily
+when = int(time.time()) + 120
+
 # make sure scons doesn't try to run flex unnecessarily
-touch(release_dir, 'src/encumbered/eio/exolex.cc')
+touch(release_dir, 'src/encumbered/eio/exolex.cc', when=(when, when))
 
 # get rid of non-shipping code
 rmtree(release_dir, 'src/encumbered/dev')
@@ -122,27 +129,34 @@ rmtree(release_dir, 'src/mem/cache/prefetch/ghb_*.cc')
 rmtree(release_dir, 'src/mem/cache/prefetch/ghb_*.hh')
 rmtree(release_dir, 'src/mem/cache/prefetch/stride_*.cc')
 rmtree(release_dir, 'src/mem/cache/prefetch/stride_*.hh')
-rmtree(release_dir, 'src/oldmem')
 rmtree(release_dir, 'configs/fullsys')
 rmtree(release_dir, 'configs/test')
 rmtree(release_dir, 'configs/splash2')
 rmtree(release_dir, 'tests/long/*/ref')
 rmtree(release_dir, 'tests/old')
+rmtree(release_dir, 'src/dev/i8*')
 
 # get rid of some of private scripts
 remove(release_dir, 'util/chgcopyright')
 remove(release_dir, 'util/make_release.py')
 
+def remove_sources(regex, subdir):
+    script = joinpath(release_dir, subdir, 'SConscript')
+    if isinstance(regex, str):
+        regex = re.compile(regex)
+    inscript = file(script, 'r').readlines()
+    outscript = file(script, 'w')
+    for line in inscript:
+        if regex.match(line):
+            continue
+
+        outscript.write(line)
+    outscript.close()
+
 # fix up the SConscript to deal with files we've removed
-mem_expr = re.compile('.*mem/cache/(tags/split|prefetch/(ghb|stride)).*')
-inscript = file(joinpath(release_dir, 'src', 'SConscript'), 'r').readlines()
-outscript = file(joinpath(release_dir, 'src', 'SConscript'), 'w')
-for line in inscript:
-    if mem_expr.match(line):
-        continue
-
-    outscript.write(line)
-outscript.close()
+remove_sources(r'.*split.*\.cc', 'src/mem/cache/tags')
+remove_sources(r'.*(ghb|stride)_prefetcher\.cc', 'src/mem/cache/prefetch')
+remove_sources(r'.*i8254xGBe.*', 'src/dev')
 
 benches = [ 'bzip2', 'eon', 'gzip', 'mcf', 'parser', 'perlbmk',
             'twolf', 'vortex' ]