FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 01:46:15 +01:00
Code Issues Projects Releases Wiki Activity

1.7 -> 1.8

Browse Source
This commit is contained in:
Thomas Nagy 2013-10-28 21:32:25 +01:00
parent feaad909d5
commit 2f43179c39
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waf-light
View File

@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
import os, sys
VERSION="1.7.11"
VERSION="1.8.0"
REVISION="x"
INSTALL="x"
C1='x'

4
waflib/Configure.py
View File

@ -434,11 +434,11 @@ def cmd_to_list(self, cmd):
return cmd
@conf
def check_waf_version(self, mini='1.6.99', maxi='1.8.0'):
def check_waf_version(self, mini='1.7.99', maxi='1.9.0'):
"""
Raise a Configuration error if the Waf version does not strictly match the given bounds::
conf.check_waf_version(mini='1.7.0', maxi='1.8.0')
conf.check_waf_version(mini='1.8.0', maxi='1.9.0')
:type mini: number, tuple or string
:param mini: Minimum required version

6
waflib/Context.py
View File

@ -11,13 +11,13 @@ from waflib import Utils, Errors, Logs
import waflib.Node
# the following 3 constants are updated on each new release (do not touch)
HEXVERSION=0x1070b00
HEXVERSION=0x1080000
"""Constant updated on new releases"""
WAFVERSION="1.7.11"
WAFVERSION="1.8.0"
"""Constant updated on new releases"""
WAFREVISION="50f631bc5e00bdda966c68094229b99be9a21084"
WAFREVISION="feaad909d5b46bfdb121cd5d217ba2031bc4ed10"
"""Constant updated on new releases"""
ABI = 98

2
waflib/Scripting.py
View File

@ -447,7 +447,7 @@ class Dist(Context.Context):
try:
return self.excl
except AttributeError:
self.excl = Node.exclude_regs + ' **/waf-1.7.* **/.waf-1.7* **/waf3-1.7.* **/.waf3-1.7* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*'
self.excl = Node.exclude_regs + ' **/waf-1.8.* **/.waf-1.8* **/waf3-1.8.* **/.waf3-1.8* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*'
nd = self.root.find_node(Context.out_dir)
if nd:
self.excl += ' ' + nd.path_from(self.base_path)

10
waflib/extras/codelite.py
View File

@ -588,10 +588,10 @@ class vsnode_project_view(vsnode_alias):
vsnode_alias.__init__(self, ctx, node, name)
self.tg = self.ctx() # fake one, cannot remove
self.exclude_files = Node.exclude_regs + '''
waf-1.7.*
waf3-1.7.*/**
.waf-1.7.*
.waf3-1.7.*/**
waf-1.8.*
waf3-1.8.*/**
.waf-1.8.*
.waf3-1.8.*/**
**/*.sdf
**/*.suo
**/*.ncb
@ -603,7 +603,7 @@ waf3-1.7.*/**
self.source = self.ctx.srcnode.ant_glob('**', excl=self.exclude_files)
def get_build_command(self, props):
params = self.get_build_params(props) + (self.ctx.cmd,)
params = self.get_build_params(props) + (self.ctx.cmd,)
return "%s %s %s" % params
def get_clean_command(self, props):

8
waflib/extras/msvs.py
View File

@ -618,10 +618,10 @@ class vsnode_project_view(vsnode_alias):
vsnode_alias.__init__(self, ctx, node, name)
self.tg = self.ctx() # fake one, cannot remove
self.exclude_files = Node.exclude_regs + '''
waf-1.7.*
waf3-1.7.*/**
.waf-1.7.*
.waf3-1.7.*/**
waf-1.8.*
waf3-1.8.*/**
.waf-1.8.*
.waf3-1.8.*/**
**/*.sdf
**/*.suo
**/*.ncb

2
wscript
View File

@ -10,7 +10,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
"""
VERSION="1.7.11"
VERSION="1.8.0"
APPNAME='waf'
REVISION=''