Index: trunk/locker-bin/macathenaDist.py =================================================================== --- trunk/locker-bin/macathenaDist.py (revision 65) +++ trunk/locker-bin/macathenaDist.py (revision 73) @@ -33,10 +33,11 @@ info.gname = "wheel" - if info.isdir(): - info.mtime = mtime + info.mtime = mtime return info def packageSvn(module, svnModule, extras=[], svnroot='file:///afs/dev.mit.edu/source/svn-repos', revision='HEAD'): + global mtime + os.system('attach macathena >/dev/null 2>/dev/null') os.chdir('/mit/macathena/build') @@ -71,4 +72,6 @@ def packageCvs(module, cvsModule, extras=['packs/build/autoconf'], cvsroot='/afs/dev.mit.edu/source/repository', date='tomorrow'): + global mtime + os.system('attach macathena >/dev/null 2>/dev/null') os.chdir('/mit/macathena/build') @@ -86,4 +89,5 @@ stamp = max(stamp, max(os.stat('%s/%s' % (root, file))[8] for file in files)) + mtime = int(time.strftime('%s', time.localtime(stamp))) tarball_time = time.strftime('%Y%m%d', time.localtime(stamp)) tarball = '%s-%s' % (module, tarball_time) @@ -101,14 +105,14 @@ cvsModules = {'moira': ['moira', False, '/afs/athena.mit.edu/astaff/project/moiradev/repository']} -svnModules = {'libathdir': ['trunk/athena/lib/athdir'], - 'athdir': ['trunk/athena/bin/athdir'], - 'machtype': ['trunk/athena/bin/machtype'], +svnModules = {'athdir': ['trunk/athena/bin/athdir'], 'attachandrun': ['trunk/athena/bin/attachandrun'], 'athrun': ['trunk/athena/bin/athrun'], 'athinfo': ['trunk/athena/bin/athinfo'], + 'discuss': ['trunk/athena/bin/discuss', ['attic/packs/build/aclocal.m4']], 'getcluster': ['trunk/athena/bin/getcluster', ['attic/packs/build/aclocal.m4']], + 'libathdir': ['trunk/athena/lib/athdir'], 'libxj': ['trunk/athena/lib/Xj'], + 'machtype': ['trunk/athena/bin/machtype'], 'xcluster': ['trunk/athena/bin/xcluster', ['attic/packs/build/aclocal.m4']], - 'discuss': ['trunk/athena/bin/discuss'], # Our packages: 'add': ['trunk/source/add', False, 'https://macathena.mit.edu/svn'], @@ -128,6 +132,8 @@ for arg in build: if svnModules.has_key(arg): + print "Building %s" % arg apply(packageSvn, [arg] + svnModules[arg]) elif cvsModules.has_key(arg): + print "Building %s" % arg apply(packageCvs, [arg] + cvsModules[arg]) else: