From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 30 Jun 2004 18:44:35 +0000 (+0000)
Subject: update for CVS versions of bakefile
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b778f9d6f5350ad3018aa8ec9b4027c1b352f2b9

update for CVS versions of bakefile


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 846a185031..3dd90bf628 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -11,8 +11,15 @@ import utils
 # register a substitution function for it that provides additional knowledge
 # about the option (in this case that it does not contain dir separators and
 # so utils.nativePaths() doesn't have to do anything with it):
-def __noopSubst(func, name):
-    return '$(%s)' % name
+
+try:
+    # this fails in 0.1.4 and 0.1.5 has different subst.callbacks signature:
+    utils.checkBakefileVersion('0.1.5') 
+    def __noopSubst(name, func, caller):
+        return '$(%s)' % name
+except AttributeError:
+    def __noopSubst(func, name):
+        return '$(%s)' % name
 utils.addSubstituteCallback('CFG', __noopSubst)
 utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)
 utils.addSubstituteCallback('SETUPHDIR', __noopSubst)