Changeset 46

Timestamp:

01/24/08 22:31:56 (16 years ago)

Author:

broder

Message:

Changed macathenaDist.py to use Athena 10 svn as upstream when possible

Files:

• trunk/locker-bin/macathenaDist.py (modified) (4 diffs)

trunk/locker-bin/macathenaDist.py

@@ -3 +3 @@
-import tarfile
-import os
+from os.path import basename
-import time
-import shutil
+
+mtime = 0
-
-class MyTarFile(tarfile.TarFile):
@@ -14 +17 @@
-                
-                if info.isdir():
-0
+mtime
-                
-                return info
+
+def packageSvn(module, svnModule, extras=[], svnroot='/afs/dev.mit.edu/source/svn-repos', revision='HEAD'):
+        os.system('attach macathena >/dev/null 2>/dev/null')
+        os.chdir('/mit/macathena/build')
+        
+        os.system('svn export -r %s file://%s/%s %s >/dev/null 2>&1' % (revision, svnroot, svnModule, module))
+        
+        for extra in extras:
+                os.system('svn export -r %s file://%s/%s >/dev/null 2>&1' % (revision, svnroot, extra))
+                os.system('mv %s %s' % (basename(extra), module))
+        
+        version_info = os.popen('svn info -r %s file://%s/%s' % (revision, svnroot, svnModule)).readlines()
+        for line in version_info:
+                if line.startswith('Last Changed Date: '):
+                        time_string = line.strip().split(': ')[1][0:19]
+                elif line.startswith('Last Changed Rev: '):
+                        revision = line.strip().split(': ')[1]
+        
+        mtime = int(time.strftime("%s", time.strptime(time_string, "%Y-%m-%d %H:%M:%S")))
+        
+        tarball = "%s-%s" % (module, revision)
+        os.rename(module, tarball)
+        
+        tar = MyTarFile.open('%s.tar.gz' % tarball, 'w:gz')
+        tar.add(tarball)
+        tar.close()
+        
+        shutil.move('%s.tar.gz' % tarball, '/mit/macathena/dist/')
+        shutil.rmtree('/mit/macathena/build/%s' % tarball)
+        
+        print 'Created /mit/macathena/dist/%s.tar.gz' % tarball
-
-def packageCvs(module, cvsModule, extras=['packs/build/autoconf'], cvsroot='/afs/dev.mit.edu/source/repository', date='tomorrow'):
@@ -47 +81 @@
-        print 'Created /mit/macathena/dist/%s.tar.gz' % tarball
-
-
-
-       'athdir': ['athena/bin
-machtype': ['athena/bin/machtype
-attachandrun': ['athena/bin/attachandrun
-hrun': ['athena/bin/ath
-info': ['athena/bin/athinfo
-getcluster': ['athena/bin/getcluster', ['packs/build/autoconf', 'packs/build/aclocal.m4']
-libxj': ['athena/lib/Xj'
-ss': ['athena/lib/ss', ['packs/build/autoconf', 'packs/build/aclocal.m4', 'packs/build/libtool']
-athena/bin/xcluster', ['packs/build/autoconf', '
-
+
+
+svnModules = {'libathdir': ['trunk/athena/lib
+athdir': ['trunk/athena/bin/athdir
+machtype': ['trunk/athena/bin/machtype
+tachandrun': ['trunk/athena/bin/attachand
+run': ['trunk/athena/bin/athrun
+athinfo': ['trunk/athena/bin/athinfo'
+getcluster': ['trunk/athena/bin/getcluster', ['attic/packs/build/aclocal.m4']
+xj': ['trunk/athena/lib/Xj'
+trunk/athena/bin/xcluster', ['attic/
+trunk/
-
-if __name__ == '__main__':
@@ -64 +98 @@
-        
-        if sys.argv[1] == "all":
-m
+cvsModules.keys() + svnM
-        else:
-                build = sys.argv[1:]
-        
-        for arg in build:
-
-
+
+
+
+
-                else:
-                        print "Sorry - I don't know about the module %s" % arg