FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://code.google.com/p/waf

This commit is contained in:
Harald Klimach 2015-02-25 11:21:01 +01:00
parent 7775cda5c3 f87ff1060d
commit 8b58f728b9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Scripting.py
View File

@ -377,7 +377,7 @@ class Dist(Context.Context):
zip.write(x.abspath(), archive_name, zipfile.ZIP_DEFLATED)
zip.close()
else:
self.fatal('Valid algo types are tar.bz2, tar.gz or zip')
self.fatal('Valid algo types are tar.bz2, tar.gz, tar.xz or zip')
try:
from hashlib import sha1 as sha

2
waflib/extras/batched_cc.py
View File

@ -126,7 +126,7 @@ def hook(cls_type):
def fix_path(tsk):
if self.env.CC_NAME == 'msvc':
tsk.env.append_unique('CXX_TGT_F_BATCHED', '/Fo%s' % outdir.abspath())
tsk.env.append_unique('CXX_TGT_F_BATCHED', '/Fo%s\\' % outdir.abspath())
if not node.parent in self.masters:
m = self.masters[node.parent] = self.master = self.create_task('batch')

4
wscript
View File

@ -18,7 +18,7 @@ top = '.'
out = 'build'
demos = ['cpp', 'qt4', 'tex', 'ocaml', 'kde3', 'adv', 'cc', 'idl', 'docbook', 'xmlwaf', 'gnome']
zip_types = ['bz2', 'gz']
zip_types = ['bz2', 'gz', 'xz']
PRELUDE = ''
@ -342,6 +342,8 @@ def create_waf(self, *k, **kw):
code1 = reg.sub(zipType, code1)
if zipType == 'gz':
code1 = code1.replace('bunzip2', 'gzip -d')
elif zipType == 'xz':
code1 = code1.replace('bunzip2', 'xz -d')
f = open('%s.tar.%s' % (mw, zipType), 'rb')
try: