From 8fb1de97d8b57b67e27d95ee4c12401bf347f50f Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy2pow10@gmail.com>
Date: Sat, 4 Feb 2012 19:34:19 +0100
Subject: [PATCH] do not load the compat15 tool by default in waf 1.7

---
 ChangeLog         | 4 ++++
 waf-light         | 2 +-
 waflib/Context.py | 4 ++--
 wscript           | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d84ca4e..ee6f20da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+NEW IN WAF 1.7.0
+----------------
+* Do not load the compat15 tool by default
+
 NEW IN WAF 1.6.11
 -----------------
 * Enable custom variables for the boost detection #1089
diff --git a/waf-light b/waf-light
index 90dbd92d..434ca0cd 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys
 
-VERSION="1.6.11"
+VERSION="1.7.0"
 REVISION="x"
 INSTALL="x"
 C1='x'
diff --git a/waflib/Context.py b/waflib/Context.py
index cfaf7548..caa97ec0 100644
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -11,10 +11,10 @@ from waflib import Utils, Errors, Logs
 import waflib.Node
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x1060b00
+HEXVERSION=0x1070000
 """Constant updated on new releases"""
 
-WAFVERSION="1.6.11"
+WAFVERSION="1.7.0"
 """Constant updated on new releases"""
 
 WAFREVISION="a7e69d6b81b04729804754c4d5214da063779a65"
diff --git a/wscript b/wscript
index 06a3f08f..2ffe33ff 100644
--- a/wscript
+++ b/wscript
@@ -10,7 +10,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 """
 
 
-VERSION="1.6.11"
+VERSION="1.7.0"
 APPNAME='waf'
 REVISION=''
 
@@ -20,7 +20,7 @@ out = 'build'
 demos = ['cpp', 'qt4', 'tex', 'ocaml', 'kde3', 'adv', 'cc', 'idl', 'docbook', 'xmlwaf', 'gnome']
 zip_types = ['bz2', 'gz']
 
-PRELUDE = '\timport waflib.extras.compat15'
+PRELUDE = ''
 
 #from tokenize import *
 import tokenize