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

Merge branch 'master' into nullable

Browse Source
This commit is contained in:
David Anderson 2014-07-05 13:24:45 -07:00
commit 49380620e0
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AMBuildScript
View File

@ -73,7 +73,7 @@ class SMConfig(object):
self.versionlib = None self.versionlib = None
def use_auto_versioning(self): def use_auto_versioning(self):
return builder.backend == 'amb2' return builder.backend == 'amb2' and not builder.options.disable_auto_versioning
@property @property
def tag(self): def tag(self):

2
configure.py
View File

@ -31,4 +31,6 @@ run.options.add_option('-s', '--sdks', default='all', dest='sdks',
'comma-delimited list of engine names (default: %default)') 'comma-delimited list of engine names (default: %default)')
run.options.add_option('--breakpad-dump', action='store_true', dest='breakpad_dump', run.options.add_option('--breakpad-dump', action='store_true', dest='breakpad_dump',
default=False, help='Dump and upload breakpad symbols') default=False, help='Dump and upload breakpad symbols')
run.options.add_option('--disable-auto-versioning', action='store_true', dest='disable_auto_versioning',
default=False, help='Disable the auto versioning script')
run.Configure() run.Configure()

2
plugins/AMBuilder
View File

@ -51,7 +51,7 @@ def build_plugin(script_path, smx_file):
argv = argv, argv = argv,
outputs = outputs, outputs = outputs,
dep_type = 'msvc', dep_type = 'msvc',
weak_inputs = SM.generated_headers weak_inputs = SM.generated_headers or []
) )
SM.smx_files[smx_file] = smx_entry SM.smx_files[smx_file] = smx_entry

8
sourcepawn/jit/x86/jit_x86.cpp
View File

@ -287,7 +287,7 @@ CompileFromThunk(BaseRuntime *runtime, cell_t pcode_offs, void **addrp, char *pc
return err; return err;
} }
#if !defined NDEBUG #if defined JIT_SPEW
g_engine1.GetDebugHook()->OnDebugSpew( g_engine1.GetDebugHook()->OnDebugSpew(
"Patching thunk to %s::%s\n", "Patching thunk to %s::%s\n",
runtime->plugin()->name, runtime->plugin()->name,
@ -327,14 +327,12 @@ Compiler::emit(int *errp)
return NULL; return NULL;
} }
#if !defined NDEBUG #if defined JIT_SPEW
g_engine1.GetDebugHook()->OnDebugSpew( g_engine1.GetDebugHook()->OnDebugSpew(
"Compiling function %s::%s\n", "Compiling function %s::%s\n",
plugin_->name, plugin_->name,
GetFunctionName(plugin_, pcode_start_)); GetFunctionName(plugin_, pcode_start_));
#endif
#if defined DEBUG
SpewOpcode(plugin_, code_start_, cip_); SpewOpcode(plugin_, code_start_, cip_);
#endif #endif
@ -352,7 +350,7 @@ Compiler::emit(int *errp)
if (*cip_ == OP_PROC || *cip_ == OP_ENDPROC) if (*cip_ == OP_PROC || *cip_ == OP_ENDPROC)
break; break;
#if defined DEBUG #if defined JIT_SPEW
SpewOpcode(plugin_, code_start_, cip_); SpewOpcode(plugin_, code_start_, cip_);
#endif #endif

10
tools/buildbot/PackageScript
View File

@ -51,10 +51,12 @@ for cxx_task in SM.extensions:
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions']) builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
builder.AddCopy(SM.spcomp.binary, folder_map['addons/sourcemod/scripting']) builder.AddCopy(SM.spcomp.binary, folder_map['addons/sourcemod/scripting'])
# Copy version_auto.inc.
for header in SM.generated_headers: if SM.use_auto_versioning():
if 'version_auto.inc' in header.path: # Copy version_auto.inc.
builder.AddCopy(header, folder_map['addons/sourcemod/scripting/include']) for header in SM.generated_headers:
if 'version_auto.inc' in header.path:
builder.AddCopy(header, folder_map['addons/sourcemod/scripting/include'])
# Export PDB files. We write to a file in the build folder which is pretty # Export PDB files. We write to a file in the build folder which is pretty
# verboten, but it's okay if it's in the root since AMBuild will never try # verboten, but it's okay if it's in the root since AMBuild will never try