From 5a1fb90360c4dc9792501ac8777d7694712589d7 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Fri, 13 Aug 2010 00:36:21 -0700 Subject: [PATCH] Performance and assurement improvements in wscript --- wscript | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/wscript b/wscript index acf65e6401c..8e40d74ad11 100644 --- a/wscript +++ b/wscript @@ -590,11 +590,13 @@ def rpm(context): if not Options.options.blddir: outputdir = _join(context.curdir,blddir,"rpmbuild") else: outputdir = _join(_abspath(Options.options.blddir),"rpmbuild") Utils.pprint("GREEN","Building RPMs") + tarball = Scripting.dist() + sourcedir = _join(outputdir,"SOURCES") - shutil.rmtree(_join(outputdir,"SOURCES")) + if _exists(sourcedir): shutil.rmtree(sourcedir) for a in ["RPMS/noarch","SRPMS","BUILD","SPECS","SOURCES"]: mkdir_p(_join(outputdir,a)) - os.link(tarball,_join(outputdir,"SOURCES",tarball)) + os.link(tarball,_join(sourcedir,tarball)) specfile = "%s.spec"%APPNAME checkdeps = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"--nobuild",specfile]) @@ -634,14 +636,15 @@ def deb(context): if not Options.options.blddir: outputdir = _join(context.curdir,blddir,"debbuild") else: outputdir = _join(_abspath(Options.options.blddir),"debbuild") Utils.pprint("GREEN","Building DEBs") - tarball = Scripting.dist() - - shutil.rmtree(outputdir) + + tarball = Scripting.dist() + srcdir = "%s/%s-%s"%(outputdir,APPNAME,VERSION) + + if _exists(srcdir): shutil.rmtree(srcdir) mkdir_p(outputdir) f = tarfile.open(tarball,'r:bz2') f.extractall(path=outputdir) - srcdir = "%s/%s-%s"%(outputdir,APPNAME,VERSION) if tempchangelog: f = file(_join(srcdir,"debian","changelog"),"w") f.write(tempchangelog)