From f2296e1f91435e616c33bb9a90f9a8c3c8628f84 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 29 Jun 2011 16:46:14 -0700 Subject: [PATCH 1/5] Use active, not passive FTP. --- tools/buildbot/package.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/buildbot/package.pl b/tools/buildbot/package.pl index 9a4a2fc3a..d7dbeebf6 100755 --- a/tools/buildbot/package.pl +++ b/tools/buildbot/package.pl @@ -65,7 +65,7 @@ $ftp_path .= "/$major.$minor"; my ($ftp); -$ftp = Net::FTP->new($ftp_host, Debug => 0) +$ftp = Net::FTP->new($ftp_host, Debug => 0, Passive => 0) or die "Cannot connect to host $ftp_host: $@"; $ftp->login($ftp_user, $ftp_pass) From 987c87a7cf5d434f22dd89c91f3fcd449171f9df Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 29 Jun 2011 19:09:29 -0700 Subject: [PATCH 2/5] Fix curl build. --- extensions/curl/AMBuilder | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/extensions/curl/AMBuilder b/extensions/curl/AMBuilder index 05423ed46..9264ea027 100644 --- a/extensions/curl/AMBuilder +++ b/extensions/curl/AMBuilder @@ -19,10 +19,21 @@ def BuildCURL(): curl.AddCommand(command.DirectCommand(args)) 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"); From 113073880bb0b388101ee6424d630c2f8bbc127b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 4 Jul 2011 01:57:19 -0700 Subject: [PATCH 3/5] Fix crash when dynamic arrays run out of memory (bug 4632, r=fyren). --HG-- extra : rebase_source : afa37320e5d974b142de8d6ec42783985fa5cae2 --- sourcepawn/jit/x86/jit_x86.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sourcepawn/jit/x86/jit_x86.cpp b/sourcepawn/jit/x86/jit_x86.cpp index 01cc20186..69f2a8549 100644 --- a/sourcepawn/jit/x86/jit_x86.cpp +++ b/sourcepawn/jit/x86/jit_x86.cpp @@ -2544,17 +2544,7 @@ bool JITX86::InitializeJIT() jit = &writer; - /* Build the genarray intrinsic */ - jit->outbase = NULL; - jit->outptr = NULL; - WriteIntrinsic_GenArray(jit); - m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos()); - jit->outbase = (jitcode_t)m_pJitGenArray; - jit->outptr = jit->outbase; - WriteIntrinsic_GenArray(jit); - /* Build the entry point */ - writer = JitWriter(); jit->outbase = NULL; jit->outptr = NULL; Write_Execute_Function(jit); @@ -2564,6 +2554,16 @@ bool JITX86::InitializeJIT() offs = Write_Execute_Function(jit); m_pJitReturn = (uint8_t *)m_pJitEntry + offs; + /* Build the genarray intrinsic */ + writer = JitWriter(); + jit->outbase = NULL; + jit->outptr = NULL; + WriteIntrinsic_GenArray(jit); + m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos()); + jit->outbase = (jitcode_t)m_pJitGenArray; + jit->outptr = jit->outbase; + WriteIntrinsic_GenArray(jit); + return true; } From cf870bd8a47213cd3a2663039e7534225cfbf11d Mon Sep 17 00:00:00 2001 From: javalia Date: Mon, 4 Jul 2011 15:27:18 -0700 Subject: [PATCH 4/5] Increase symbol name limit to 63 characters (bug 4564, r=dvander). --- sourcepawn/compiler/amx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sourcepawn/compiler/amx.h b/sourcepawn/compiler/amx.h index 577afff89..b8de039ad 100644 --- a/sourcepawn/compiler/amx.h +++ b/sourcepawn/compiler/amx.h @@ -228,7 +228,7 @@ typedef struct tagAMX_NATIVE_INFO { #define AMX_USERNUM 4 #define sEXPMAX 19 /* maximum name length for file version <= 6 */ -#define sNAMEMAX 31 /* maximum name length of symbol name */ +#define sNAMEMAX 63 /* maximum name length of symbol name */ typedef struct tagAMX_FUNCSTUB { ucell address; From 0b67ee4553ab2c3ae7dd42e4e06aab86adf81a66 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 4 Jul 2011 15:33:33 -0700 Subject: [PATCH 5/5] Clobber --- pushbuild.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pushbuild.txt b/pushbuild.txt index aa9ecf3fc..632462b36 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -28,3 +28,4 @@ tsu smalltsu _ oh +yam