From 5acd0dd2d142044937d6aeba881d2763e9087bd6 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 19 Aug 2010 13:03:14 -0400 Subject: [PATCH] Fixed Curl lib AMBuilder script failing with vs2010 (bug 4575, r=ds). --- extensions/curl/AMBuilder | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/extensions/curl/AMBuilder b/extensions/curl/AMBuilder index 646fad29..7f509b2d 100644 --- a/extensions/curl/AMBuilder +++ b/extensions/curl/AMBuilder @@ -1,5 +1,6 @@ # vim: set ts=2 sw=2 tw=99 noet ft=python : import os.path +import subprocess import ambuild.command as command import ambuild.osutil as osutil @@ -24,10 +25,21 @@ def BuildCURL(): curl.AddCommand(command.DirectCommand(argv = args, env = env)) curl.AddCommand(command.ShellCommand('cd lib && make')) else: - args = ['vcbuild', - os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib', - 'build_libcurl.vcproj'), - 'LIB Release'] + args = '' + projpath = os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib', + 'build_libcurl.vcproj') + try: + subprocess.Popen('vcbuild') + except: + xprojpath = os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib', + 'build_libcurl.vcxproj') + if not os.path.isfile(xprojpath): + curl.AddCommand(command.DirectCommand(['vcupgrade', projpath])) + args = ['msbuild', xprojpath, '/p:Configuration=LIB Release'] + + if not args: + args = ['vcbuild', projpath, 'LIB Release'] + curl.AddCommand(command.DirectCommand(args)) #die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib");