reverted the changes from #1212 and #1237

ChangeLog

@@ -1,3 +1,8 @@
+NEW IN WAF 1.7.9
+----------------
+* Reverted the patch submitted in #1237 as it caused regressions
+* Reverted the patch submitted in #1212 as it caused regressions
+
 NEW IN WAF 1.7.8
 ----------------
 * Fixed a configuration issue in the visual studio compiler (regression #1239)

waf-light

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

waflib/Context.py

@@ -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=0x1070800
+HEXVERSION=0x1070900
 """Constant updated on new releases"""
 
-WAFVERSION="1.7.8"
+WAFVERSION="1.7.9"
 """Constant updated on new releases"""
 
-WAFREVISION="8c566d1a427701af46e32bd943d9aead35a0cc07"
+WAFREVISION="c0776f63eebaafac55c4dc96e85b122128506237"
 """Constant updated on new releases"""
 
 ABI = 98

waflib/Tools/c_config.py

@@ -267,10 +267,7 @@ def exec_cfg(self, kw):
 	"""
 
 	def define_it():
-		if kw.get('uselib_store', None):
+		self.define(self.have_define(kw.get('uselib_store', kw['package'])), 1, 0)
-			self.env.append_unique('DEFINES_%s' % kw['uselib_store'], "%s=1" % self.have_define(kw['uselib_store']))
-		else:
-			self.define(self.have_define(kw['package']), 1, 0)
 
 	# pkg-config version
 	if 'atleast_pkgconfig_version' in kw:

waflib/Tools/msvc.py

@@ -970,24 +970,22 @@ def exec_command_msvc(self, *k, **kw):
 	Change the command-line execution for msvc programs.
 	Instead of quoting all the paths and keep using the shell, we can just join the options msvc is interested in
 	"""
-	if self.env['CC_NAME'] != 'msvc':
+	if self.env['CC_NAME'] == 'msvc':
-		return self.exec_command_nomsvc(*k, **kw)
+		if isinstance(k[0], list):
+			lst = []
+			carry = ''
+			for a in k[0]:
+				if a == '/Fo' or a == '/doc' or a[-1] == ':':
+					carry = a
+				else:
+					lst.append(carry + a)
+					carry = ''
+			k = [lst]
 
-	if isinstance(k[0], list):
+		if self.env['PATH']:
-		lst = []
+			env = dict(self.env.env or os.environ)
-		carry = ''
+			env.update(PATH = ';'.join(self.env['PATH']))
-		for a in k[0]:
+			kw['env'] = env
-			if a == '/Fo' or a == '/doc' or a[-1] == ':':
-				carry = a
-			else:
-				lst.append(carry + a)
-				carry = ''
-		k = [lst]
-
-	if self.env['PATH']:
-		env = dict(self.env.env or os.environ)
-		env.update(PATH = ';'.join(self.env['PATH']))
-		kw['env'] = env
 
 	bld = self.generator.bld
 	try:
@@ -1004,7 +1002,6 @@ def exec_command_msvc(self, *k, **kw):
 for k in 'c cxx cprogram cxxprogram cshlib cxxshlib cstlib cxxstlib'.split():
 	cls = Task.classes.get(k, None)
 	if cls:
-		cls.exec_command_nomsvc = cls.exec_command
 		cls.exec_command = exec_command_msvc
 		cls.exec_response_command = exec_response_command
 		cls.quote_response_command = quote_response_command

wscript

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