You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
71 lines
2.6 KiB
71 lines
2.6 KiB
diff --git a/bootstrap.py b/bootstrap.py
|
|
index 7ffd39a..aba9dd3 100755
|
|
--- a/bootstrap.py
|
|
+++ b/bootstrap.py
|
|
@@ -5,10 +5,10 @@
|
|
from __future__ import print_function
|
|
import os, sys, stat, hashlib, subprocess
|
|
|
|
-WAFRELEASE = "waf-1.8.4"
|
|
+WAFRELEASE = "waf-1.7.16"
|
|
WAFURLS = ["http://ftp.waf.io/pub/release/" + WAFRELEASE,
|
|
"http://www.freehackers.org/~tnagy/release/" + WAFRELEASE]
|
|
-SHA256HASH = "f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8"
|
|
+SHA256HASH = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"
|
|
|
|
if os.path.exists("waf"):
|
|
wafver = subprocess.check_output(['./waf', '--version']).decode()
|
|
@@ -44,8 +44,6 @@ if SHA256HASH == hashlib.sha256(waf).hexdigest():
|
|
print("Checksum verified.")
|
|
else:
|
|
print("The checksum of the downloaded file does not match!")
|
|
- print(" - got: {}".format(hashlib.sha256(waf).hexdigest()))
|
|
- print(" - expected: {}".format(SHA256HASH))
|
|
print("Please download and verify the file manually.")
|
|
|
|
sys.exit(1)
|
|
diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py
|
|
index 0046cbf..eae705e 100644
|
|
--- a/waftools/generators/headers.py
|
|
+++ b/waftools/generators/headers.py
|
|
@@ -1,5 +1,5 @@
|
|
def __cp_to_variant__(ctx, variant, basename):
|
|
- src = ctx.bldnode.search_node(basename).read()
|
|
+ src = ctx.bldnode.search(basename).read()
|
|
node = ctx.bldnode.make_node("{0}/{1}".format(variant, basename))
|
|
node.parent.mkdir()
|
|
node.write(src)
|
|
diff --git a/waftools/waf_customizations.py b/waftools/waf_customizations.py
|
|
index fb5f130..5a9bf27 100644
|
|
--- a/waftools/waf_customizations.py
|
|
+++ b/waftools/waf_customizations.py
|
|
@@ -40,6 +40,15 @@ def build(ctx):
|
|
run_str = cls.hcode + '${LAST_LINKFLAGS}'
|
|
except TypeError:
|
|
run_str = cls.hcode.decode('iso8859-1') + '${LAST_LINKFLAGS}'
|
|
+ def __str__(self):
|
|
+ tgt_str = ' '.join([a.nice_path() for a in self.outputs])
|
|
+ return 'linking -> {0}\n'.format(tgt_str)
|
|
+
|
|
+ cls = Task.classes['cshlib']
|
|
+ class cshlib(cls):
|
|
+ def __str__(self):
|
|
+ tgt_str = ' '.join([a.nice_path() for a in self.outputs])
|
|
+ return 'linking -> {0}\n'.format(tgt_str)
|
|
|
|
cls = Task.classes['macplist']
|
|
class macplist(cls):
|
|
diff --git a/wscript b/wscript
|
|
index d3cc354..903fe31 100644
|
|
--- a/wscript
|
|
+++ b/wscript
|
|
@@ -839,7 +839,7 @@ def is_debug_build(ctx):
|
|
|
|
def configure(ctx):
|
|
ctx.resetenv(ctx.options.variant)
|
|
- ctx.check_waf_version(mini='1.8.4')
|
|
+ ctx.check_waf_version(mini='1.7.15')
|
|
target = os.environ.get('TARGET')
|
|
(cc, pkg_config, ar, windres) = ('cc', 'pkg-config', 'ar', 'windres')
|
|
|