UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Curl lib AMBuilder script failing with vs2010 (bug 4575, r=ds).

Browse Source
This commit is contained in:
Nicholas Hastings 2010-08-19 13:03:14 -04:00
parent 0d933a1901
commit 5acd0dd2d1
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/curl/AMBuilder
View File

@ -1,5 +1,6 @@
# vim: set ts=2 sw=2 tw=99 noet ft=python : # vim: set ts=2 sw=2 tw=99 noet ft=python :
import os.path import os.path
import subprocess
import ambuild.command as command import ambuild.command as command
import ambuild.osutil as osutil import ambuild.osutil as osutil
@ -24,10 +25,21 @@ def BuildCURL():
curl.AddCommand(command.DirectCommand(argv = args, env = env)) curl.AddCommand(command.DirectCommand(argv = args, env = env))
curl.AddCommand(command.ShellCommand('cd lib && make')) curl.AddCommand(command.ShellCommand('cd lib && make'))
else: else:
args = ['vcbuild', args = ''
os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib', projpath = os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib',
'build_libcurl.vcproj'), 'build_libcurl.vcproj')
'LIB Release'] 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)) curl.AddCommand(command.DirectCommand(args))
#die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib"); #die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib");