From cd2d93cde779d890fc4adacf1b280e8507145704 Mon Sep 17 00:00:00 2001 From: maxime1907 <19607336+maxime1907@users.noreply.github.com> Date: Sun, 29 Aug 2021 18:15:41 +0200 Subject: [PATCH] Add ambuild 2.2 compat, Rename gamedata from CSSFixes.txt to CSSFixes.games.txt --- AMBuildScript | 397 ++++++++++++++---- AMBuilder | 58 ++- PackageScript | 35 +- addons/sourcemod/extensions/CSSFixes.autoload | 0 .../sourcemod/gamedata/CSSFixes.games.txt | 2 +- .../sourcemod/scripting/include}/CSSFixes.inc | 0 configure.py | 38 +- extension.cpp | 4 +- 8 files changed, 403 insertions(+), 131 deletions(-) create mode 100644 addons/sourcemod/extensions/CSSFixes.autoload rename gamedata/CSSFixes.txt => addons/sourcemod/gamedata/CSSFixes.games.txt (94%) rename {include => addons/sourcemod/scripting/include}/CSSFixes.inc (100%) diff --git a/AMBuildScript b/AMBuildScript index 852be34..68e870b 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -1,7 +1,6 @@ # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os, sys - -# Simple extensions do not need to modify this file. +import traceback class SDK(object): def __init__(self, sdk, ext, aDef, name, platform, dir): @@ -13,10 +12,29 @@ class SDK(object): self.platform = platform self.name = dir self.path = None # Actual path + self.platformSpec = platform + + # By default, nothing supports x64. + if type(platform) is list: + self.platformSpec = {p: ['x86'] for p in platform} + else: + self.platformSpec = platform + + def shouldBuild(self, targets): + for cxx in targets: + if cxx.target.platform in self.platformSpec: + if cxx.target.arch in self.platformSpec[cxx.target.platform]: + return True + return False WinOnly = ['windows'] WinLinux = ['windows', 'linux'] WinLinuxMac = ['windows', 'linux', 'mac'] +CSGO = { + 'windows': ['x86'], + 'linux': ['x86', 'x86_64'], + 'mac': ['x86_64'] +} PossibleSDKs = { 'css': SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'), @@ -42,15 +60,54 @@ def ResolveEnvPath(env, folder): def Normalize(path): return os.path.abspath(os.path.normpath(path)) + +def SetArchFlags(compiler): + if compiler.behavior == 'gcc': + if compiler.target.arch == 'x86_64': + compiler.cflags += ['-fPIC'] + elif compiler.like('msvc'): + if compiler.target.arch == 'x86_64': + compiler.defines += ['WIN64'] class ExtensionConfig(object): def __init__(self): self.sdks = {} self.binaries = [] + self.spvm = [] self.extensions = [] self.generated_headers = None - self.mms_root = None self.sm_root = None + self.mms_root = None + self.mysql_root = {} + self.spcomp = None + self.spcomp_bins = None + self.smx_files = {} + self.versionlib = None + self.all_targets = [] + self.target_archs = set() + + + if builder.options.targets: + target_archs = builder.options.targets.split(',') + else: + target_archs = ['x86'] + if builder.backend != 'amb2': + target_archs.append('x86_64') + + for arch in target_archs: + try: + cxx = builder.DetectCxx(target_arch = arch) + self.target_archs.add(cxx.target.arch) + except Exception as e: + # Error if archs were manually overridden. + if builder.options.targets: + raise + print('Skipping target {}: {}'.format(arch, e)) + continue + self.all_targets.append(cxx) + + if not self.all_targets: + raise Exception('No suitable C/C++ compiler was found.') @property def tag(self): @@ -58,14 +115,29 @@ class ExtensionConfig(object): return 'Debug' return 'Release' + def detectProductVersion(self): + builder.AddConfigureFile('product.version') + + # For OS X dylib versioning + import re + with open(os.path.join(builder.sourcePath, 'product.version'), 'r') as fp: + productContents = fp.read() + m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents) + if m == None: + self.productVersion = '1.0.0' + else: + major, minor, release = m.groups() + self.productVersion = '{0}.{1}.{2}'.format(major, minor, release) + def detectSDKs(self): sdk_list = builder.options.sdks.split(',') + use_none = sdk_list[0] == 'none' use_all = sdk_list[0] == 'all' use_present = sdk_list[0] == 'present' for sdk_name in PossibleSDKs: sdk = PossibleSDKs[sdk_name] - if builder.target_platform in sdk.platform: + if sdk.shouldBuild(self.all_targets): if builder.options.hl2sdk_root: sdk_path = os.path.join(builder.options.hl2sdk_root, sdk.folder) else: @@ -78,20 +150,22 @@ class ExtensionConfig(object): sdk.path = Normalize(sdk_path) self.sdks[sdk_name] = sdk - if len(self.sdks) < 1: - raise Exception('At least one SDK must be available.') + if len(self.sdks) < 1 and len(sdk_list) and not use_none: + raise Exception('No applicable SDKs were found, nothing to do') if builder.options.sm_path: self.sm_root = builder.options.sm_path else: - self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.8') + self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.10') if not self.sm_root: - self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod') + self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod-source') if not self.sm_root: self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod-central') + if not self.sm_root: + self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod') if not self.sm_root or not os.path.isdir(self.sm_root): - raise Exception('Could not find a source copy of SourceMod') + raise Exception('Could not find a source copy of Sourcemod') self.sm_root = Normalize(self.sm_root) if builder.options.mms_path: @@ -99,20 +173,37 @@ class ExtensionConfig(object): else: self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10') if not self.mms_root: - self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source') + self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source') if not self.mms_root: self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central') + if not self.mms_root: + self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod') if not self.mms_root or not os.path.isdir(self.mms_root): raise Exception('Could not find a source copy of Metamod:Source') self.mms_root = Normalize(self.mms_root) def configure(self): - cxx = builder.DetectCompilers() + if not set(self.target_archs).issubset(['x86', 'x86_64']): + raise Exception('Unknown target architecture: {0}'.format(self.target_archs)) + + for cxx in self.all_targets: + self.configure_cxx(cxx) + + def configure_cxx(self, cxx): + if cxx.family == 'msvc': + if cxx.version < 1900: + raise Exception('Only MSVC 2015 and later are supported, c++14 support is required.') + if cxx.family == 'gcc': + if cxx.version < 'gcc-4.9': + raise Exception('Only GCC versions 4.9 or greater are supported, c++14 support is required.') + if cxx.family == 'clang': + if cxx.version < 'clang-3.4': + raise Exception('Only clang versions 3.4 or greater are supported, c++14 support is required.') if cxx.like('gcc'): self.configure_gcc(cxx) - elif cxx.vendor == 'msvc': + elif cxx.family == 'msvc': self.configure_msvc(cxx) # Optimizaiton @@ -124,11 +215,11 @@ class ExtensionConfig(object): cxx.defines += ['DEBUG', '_DEBUG'] # Platform-specifics - if builder.target_platform == 'linux': + if cxx.target.platform == 'linux': self.configure_linux(cxx) - elif builder.target_platform == 'mac': + elif cxx.target.platform == 'mac': self.configure_mac(cxx) - elif builder.target_platform == 'windows': + elif cxx.target.platform == 'windows': self.configure_windows(cxx) # Finish up. @@ -149,35 +240,44 @@ class ExtensionConfig(object): '-pipe', '-fno-strict-aliasing', '-Wall', -# '-Werror', + '-Werror', '-Wno-unused', '-Wno-switch', '-Wno-array-bounds', '-msse', - '-m32', '-fvisibility=hidden', ] + + if cxx.version == 'apple-clang-6.0' or cxx.version == 'clang-3.4': + cxx.cxxflags += ['-std=c++1y'] + else: + cxx.cxxflags += ['-std=c++14'] + cxx.cxxflags += [ - '-std=c++14', - '-fno-exceptions', '-fno-threadsafe-statics', '-Wno-non-virtual-dtor', '-Wno-overloaded-virtual', '-fvisibility-inlines-hidden', ] - cxx.linkflags += ['-m32'] - have_gcc = cxx.vendor == 'gcc' - have_clang = cxx.vendor == 'clang' - if cxx.version >= 'clang-3.6': + have_gcc = cxx.family == 'gcc' + have_clang = cxx.family == 'clang' + if cxx.version >= 'clang-3.9' or cxx.version == 'clang-3.4' or cxx.version > 'apple-clang-6.0': + cxx.cxxflags += ['-Wno-expansion-to-defined'] + if cxx.version == 'clang-3.9' or cxx.version == 'apple-clang-8.0': + cxx.cflags += ['-Wno-varargs'] + if cxx.version >= 'clang-3.4' or cxx.version >= 'apple-clang-7.0': cxx.cxxflags += ['-Wno-inconsistent-missing-override'] + if cxx.version >= 'clang-2.9' or cxx.version >= 'apple-clang-3.0': + cxx.cxxflags += ['-Wno-null-dereference'] if have_clang or (cxx.version >= 'gcc-4.6'): cxx.cflags += ['-Wno-narrowing'] if have_clang or (cxx.version >= 'gcc-4.7'): cxx.cxxflags += ['-Wno-delete-non-virtual-dtor'] if cxx.version >= 'gcc-4.8': cxx.cflags += ['-Wno-unused-result'] - + if cxx.version >= 'gcc-9.0': + cxx.cxxflags += ['-Wno-class-memaccess', '-Wno-packed-not-aligned'] if have_clang: cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch'] if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4': @@ -186,11 +286,30 @@ class ExtensionConfig(object): cxx.cxxflags += ['-Wno-deprecated'] cxx.cflags += ['-Wno-sometimes-uninitialized'] + # Work around SDK warnings. + if cxx.version >= 'clang-10.0': + cxx.cflags += [ + '-Wno-implicit-int-float-conversion', + '-Wno-tautological-overlap-compare', + ] + if have_gcc: cxx.cflags += ['-mfpmath=sse'] + cxx.cflags += ['-Wno-maybe-uninitialized'] if builder.options.opt == '1': - cxx.cflags += ['-O3'] + cxx.cflags += [ + '-O3', + '-fexperimental-new-pass-manager', + '-mllvm', + '-inline-threshold=1000', + '-mllvm', + '-vectorize-loops', + '-ftree-vectorize', + ] + + # Don't omit the frame pointer. + cxx.cflags += ['-fno-omit-frame-pointer'] def configure_msvc(self, cxx): if builder.options.debug == '1': @@ -213,7 +332,6 @@ class ExtensionConfig(object): '/TP', ] cxx.linkflags += [ - '/MACHINE:X86', 'kernel32.lib', 'user32.lib', 'gdi32.lib', @@ -240,28 +358,90 @@ class ExtensionConfig(object): cxx.cflags += ['/Oy-'] def configure_linux(self, cxx): - cxx.defines += ['_LINUX', 'POSIX'] - cxx.linkflags += ['-Wl,--exclude-libs,ALL', '-lm'] - if cxx.vendor == 'gcc': + cxx.defines += ['_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64'] + cxx.linkflags += ['-lm'] + if cxx.family == 'gcc': cxx.linkflags += ['-static-libgcc'] - elif cxx.vendor == 'clang': + elif cxx.family == 'clang': cxx.linkflags += ['-lgcc_eh'] cxx.linkflags += ['-static-libstdc++'] def configure_mac(self, cxx): - cxx.defines += ['OSX', '_OSX', 'POSIX'] - cxx.cflags += ['-mmacosx-version-min=10.5'] + cxx.defines += ['OSX', '_OSX', 'POSIX', 'KE_ABSOLUTELY_NO_STL'] + cxx.cflags += ['-mmacosx-version-min=10.7'] cxx.linkflags += [ - '-mmacosx-version-min=10.5', - '-arch', 'i386', - '-lstdc++', - '-stdlib=libstdc++', + '-mmacosx-version-min=10.7', + '-stdlib=libc++', + '-lc++', ] - cxx.cxxflags += ['-stdlib=libstdc++'] + cxx.cxxflags += ['-stdlib=libc++'] def configure_windows(self, cxx): cxx.defines += ['WIN32', '_WINDOWS'] - + + def add_libamtl(self): + # Add libamtl. + self.libamtl = {} + for cxx in self.all_targets: + def get_configure_fn(cxx): + return lambda builder, name: self.StaticLibrary(builder, cxx, name) + extra_vars = {'Configure': get_configure_fn(cxx)} + libamtl = builder.Build('public/amtl/amtl/AMBuilder', extra_vars) + self.libamtl[cxx.target.arch] = libamtl.binary + + def AddVersioning(self, binary): + if binary.compiler.target.platform == 'windows': + binary.sources += ['version.rc'] + binary.compiler.rcdefines += [ + 'BINARY_NAME="{0}"'.format(binary.outputFile), + 'RC_COMPILE', + ] + elif binary.compiler.target.platform == 'mac': + if binary.type == 'library': + binary.compiler.postlink += [ + '-compatibility_version', '1.0.0', + '-current_version', self.productVersion + ] + return binary + + def LibraryBuilder(self, compiler, name): + binary = compiler.Library(name) + self.AddVersioning(binary) + if binary.compiler.like('msvc'): + binary.compiler.linkflags += ['/SUBSYSTEM:WINDOWS'] + return binary + + def ProgramBuilder(self, compiler, name): + binary = compiler.Program(name) + self.AddVersioning(binary) + if '-static-libgcc' in binary.compiler.linkflags: + binary.compiler.linkflags.remove('-static-libgcc') + if '-lgcc_eh' in binary.compiler.linkflags: + binary.compiler.linkflags.remove('-lgcc_eh') + if binary.compiler.like('gcc'): + binary.compiler.linkflags += ['-lstdc++', '-lpthread'] + if binary.compiler.like('msvc'): + binary.compiler.linkflags += ['/SUBSYSTEM:CONSOLE'] + return binary + + def StaticLibraryBuilder(self, compiler, name): + return compiler.StaticLibrary(name) + + def Library(self, context, compiler, name): + compiler = compiler.clone() + SetArchFlags(compiler) + return self.LibraryBuilder(compiler, name) + + def Program(self, context, compiler, name): + compiler = compiler.clone() + SetArchFlags(compiler) + return self.ProgramBuilder(compiler, name) + + def StaticLibrary(self, context, compiler, name): + compiler = compiler.clone() + SetArchFlags(compiler) + return self.StaticLibraryBuilder(compiler, name) + def ConfigureForExtension(self, context, compiler): compiler.cxxincludes += [ os.path.join(context.currentSourcePath), @@ -271,20 +451,23 @@ class ExtensionConfig(object): os.path.join(self.sm_root, 'sourcepawn', 'include'), os.path.join(self.sm_root, 'public', 'amtl', 'amtl'), os.path.join(self.sm_root, 'public', 'amtl'), + os.path.join(self.sm_root, 'extensions', 'sm-ext-common', 'include'), ] return compiler - def ConfigureForHL2(self, binary, sdk): - compiler = binary.compiler + def ExtLibrary(self, context, compiler, name): + binary = self.Library(context, compiler, name) + SetArchFlags(compiler) + self.ConfigureForExtension(context, binary.compiler) + return binary - if sdk.name == 'episode1': - mms_path = os.path.join(self.mms_root, 'core-legacy') - else: - mms_path = os.path.join(self.mms_root, 'core') + def ConfigureForHL2(self, context, binary, sdk): + compiler = binary.compiler + SetArchFlags(compiler) compiler.cxxincludes += [ - os.path.join(mms_path), - os.path.join(mms_path, 'sourcehook'), + os.path.join(self.mms_root, 'core'), + os.path.join(self.mms_root, 'core', 'sourcehook'), ] defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs] @@ -317,113 +500,149 @@ class ExtensionConfig(object): compiler.defines.remove('_vsnprintf=vsnprintf') if compiler.like('msvc'): - compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32'] + compiler.defines += ['COMPILER_MSVC'] + if compiler.target.arch == 'x86': + compiler.defines += ['COMPILER_MSVC32'] + elif compiler.target.arch == 'x86_64': + compiler.defines += ['COMPILER_MSVC64'] + compiler.linkflags += ['legacy_stdio_definitions.lib'] else: compiler.defines += ['COMPILER_GCC'] + if compiler.target.arch == 'x86_64': + compiler.defines += ['X64BITS', 'PLATFORM_64BITS'] + # For everything after Swarm, this needs to be defined for entity networking # to work properly with sendprop value changes. if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']: compiler.defines += ['NETWORK_VARS_ENABLED'] if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2']: - if builder.target_platform in ['linux', 'mac']: + if compiler.target.platform in ['linux', 'mac']: compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE'] - if sdk.name == 'csgo' and builder.target_platform == 'linux': - compiler.linkflags += ['-lstdc++'] + if compiler.target.platform == 'linux': + if sdk.name in ['csgo', 'blade']: + compiler.linkflags.remove('-static-libstdc++') + compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0'] for path in paths: compiler.cxxincludes += [os.path.join(sdk.path, *path)] - if builder.target_platform == 'linux': + if compiler.target.platform == 'linux': if sdk.name == 'episode1': lib_folder = os.path.join(sdk.path, 'linux_sdk') elif sdk.name in ['sdk2013', 'bms']: lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32') + elif compiler.target.arch == 'x86_64': + lib_folder = os.path.join(sdk.path, 'lib', 'linux64') else: lib_folder = os.path.join(sdk.path, 'lib', 'linux') - elif builder.target_platform == 'mac': + elif compiler.target.platform == 'mac': if sdk.name in ['sdk2013', 'bms']: lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32') + elif compiler.target.arch == 'x86_64': + lib_folder = os.path.join(sdk.path, 'lib', 'osx64') else: lib_folder = os.path.join(sdk.path, 'lib', 'mac') - if builder.target_platform in ['linux', 'mac']: - if sdk.name in ['sdk2013', 'bms']: + if compiler.target.platform in ['linux', 'mac']: + if sdk.name in ['sdk2013', 'bms'] or compiler.target.arch == 'x86_64': compiler.postlink += [ - compiler.Dep(os.path.join(lib_folder, 'tier1.a')), - compiler.Dep(os.path.join(lib_folder, 'mathlib.a')) + os.path.join(lib_folder, 'tier1.a'), + os.path.join(lib_folder, 'mathlib.a') ] else: compiler.postlink += [ - compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a')), - compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a')) + os.path.join(lib_folder, 'tier1_i486.a'), + os.path.join(lib_folder, 'mathlib_i486.a') ] if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']: - compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))] + if compiler.target.arch == 'x86_64': + compiler.postlink += [os.path.join(lib_folder, 'interfaces.a')] + else: + compiler.postlink += [os.path.join(lib_folder, 'interfaces_i486.a')] dynamic_libs = [] - if builder.target_platform == 'linux': + if compiler.target.platform == 'linux': if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']: dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so'] + elif compiler.target.arch == 'x86_64' and sdk.name in ['csgo', 'blade']: + dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so'] elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo']: dynamic_libs = ['libtier0.so', 'libvstdlib.so'] else: dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so'] - elif builder.target_platform == 'mac': + elif compiler.target.platform == 'mac': compiler.linkflags.append('-liconv') dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib'] - elif builder.target_platform == 'windows': + elif compiler.target.platform == 'windows': libs = ['tier0', 'tier1', 'vstdlib', 'mathlib'] if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'csgo']: libs.append('interfaces') for lib in libs: - lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib' - compiler.linkflags.append(compiler.Dep(lib_path)) + if compiler.target.arch == 'x86': + lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib' + elif compiler.target.arch == 'x86_64': + lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib' + compiler.linkflags.append(lib_path) for library in dynamic_libs: source_path = os.path.join(lib_folder, library) output_path = os.path.join(binary.localFolder, library) - def make_linker(source_path, output_path): - def link(context, binary): - cmd_node, (output,) = context.AddSymlink(source_path, output_path) - return output - return link + # Ensure the output path exists. + context.AddFolder(binary.localFolder) + output = context.AddSymlink(source_path, output_path) - linker = make_linker(source_path, output_path) - compiler.linkflags[0:0] = [compiler.Dep(library, linker)] + compiler.weaklinkdeps += [output] + compiler.linkflags[0:0] = [library] return binary - def HL2Library(self, context, name, sdk): - binary = context.compiler.Library(name) + def HL2Library(self, context, compiler, name, sdk): + binary = self.Library(context, compiler, name) self.ConfigureForExtension(context, binary.compiler) - return self.ConfigureForHL2(binary, sdk) + return self.ConfigureForHL2(context, binary, sdk) - def HL2Project(self, context, name): - project = context.compiler.LibraryProject(name) - self.ConfigureForExtension(context, project.compiler) + def HL2Project(self, context, compiler, name): + project = context.LibraryProject(name) + self.ConfigureForExtension(context, compiler) return project - def HL2Config(self, project, name, sdk): - binary = project.Configure(name, '{0} - {1}'.format(self.tag, sdk.name)) - return self.ConfigureForHL2(binary, sdk) + def HL2Config(self, project, context, compiler, name, sdk): + binary = project.Configure(compiler, name, + '{0} - {1} {2}'.format(self.tag, sdk.name, compiler.target.arch)) + self.AddVersioning(binary) + return self.ConfigureForHL2(context, binary, sdk) -Extension = ExtensionConfig() -Extension.detectSDKs() -Extension.configure() + def HL2ExtConfig(self, project, context, compiler, name, sdk): + binary = project.Configure(compiler, name, + '{0} - {1} {2}'.format(self.tag, sdk.name, compiler.target.arch)) + self.AddVersioning(binary) + self.ConfigureForHL2(context, binary, sdk) + self.ConfigureForExtension(context, binary.compiler) + return binary -# Add additional buildscripts here -BuildScripts = [ - 'AMBuilder', -] +if getattr(builder, 'target', None) is not None: + sys.stderr.write("Your output folder was configured for AMBuild 2.1, and SourceMod is now\n") + sys.stderr.write("configured to use AMBuild 2.2. Please remove your output folder and\n") + sys.stderr.write("reconfigure to continue.\n") + os._exit(1) + +SM = ExtensionConfig() +SM.detectSDKs() +SM.configure() + +# This will clone the list and each cxx object as we recurse, preventing child +# scripts from messing up global state. +builder.targets = builder.CloneableList(SM.all_targets) if builder.backend == 'amb2': - BuildScripts += [ + BuildScripts = [ + 'AMBuilder', 'PackageScript', ] -builder.RunBuildScripts(BuildScripts, { 'Extension': Extension}) +builder.Build(BuildScripts, { 'SM': SM}) diff --git a/AMBuilder b/AMBuilder index 7059e5e..1eb7708 100644 --- a/AMBuilder +++ b/AMBuilder @@ -1,28 +1,44 @@ # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -if not "SM" in globals(): - SM = Extension - projectName = 'CSSFixes' -project = SM.HL2Project(builder, projectName + '.ext') -project.sources += [ - 'extension.cpp', - '../../public/smsdk_ext.cpp', - '../../public/CDetour/detours.cpp', - '../../public/asm/asm.c', - '../../public/libudis86/decode.c', - '../../public/libudis86/itab.c', - '../../public/libudis86/syn-att.c', - '../../public/libudis86/syn-intel.c', - '../../public/libudis86/syn.c', - '../../public/libudis86/udis86.c', -] -project.compiler.defines += ['HAVE_STRING_H']; +for cxx in builder.targets: + for sdk_name in SM.sdks: + sdk = SM.sdks[sdk_name] -for sdk_name in SM.sdks: - sdk = SM.sdks[sdk_name] - binary = SM.HL2Config(project, projectName + '.ext', sdk) + if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]: + continue -SM.extensions += builder.Add(project) + binary = SM.HL2Library(builder, cxx, projectName + '.ext.' + sdk.ext, sdk) + + binary.compiler.defines += [ + 'HAVE_STRING_H', + ] + + if cxx.target.platform == 'linux': + cxx.postlink += ['-lpthread', '-lrt'] + elif cxx.target.platform == 'mac': + cxx.cflags += ['-Wno-deprecated-declarations'] + cxx.postlink += ['-framework', 'CoreServices'] + + if cxx.family == 'gcc' or cxx.family == 'clang': + cxx.cxxflags += ['-fno-rtti'] + elif cxx.family == 'msvc': + cxx.cxxflags += ['/GR-'] + + binary.sources += [ + 'extension.cpp', + os.path.join(SM.sm_root, 'extensions', 'sm-ext-common', 'mathstubs.c'), + os.path.join(SM.sm_root, 'public', 'smsdk_ext.cpp'), + os.path.join(SM.sm_root, 'public', 'CDetour', 'detours.cpp'), + os.path.join(SM.sm_root, 'public', 'asm', 'asm.c'), + os.path.join(SM.sm_root, 'public', 'libudis86', 'decode.c'), + os.path.join(SM.sm_root, 'public', 'libudis86', 'itab.c'), + os.path.join(SM.sm_root, 'public', 'libudis86', 'syn-att.c'), + os.path.join(SM.sm_root, 'public', 'libudis86', 'syn-intel.c'), + os.path.join(SM.sm_root, 'public', 'libudis86', 'syn.c'), + os.path.join(SM.sm_root, 'public', 'libudis86', 'udis86.c'), + ] + + SM.extensions += [builder.Add(binary)] diff --git a/PackageScript b/PackageScript index 139e2fd..1644866 100644 --- a/PackageScript +++ b/PackageScript @@ -8,15 +8,28 @@ builder.SetBuildFolder('package') # Add any folders you need to this list folder_list = [ 'addons/sourcemod/extensions', - 'addons/sourcemod/gamedata', + 'addons/sourcemod/scripting/include', + 'addons/sourcemod/gamedata' ] +if 'x86_64' in SM.target_archs: + folder_list.extend([ + 'addons/sourcemod/extensions/x64', + ]) + # Create the distribution folder hierarchy. folder_map = {} for folder in folder_list: norm_folder = os.path.normpath(folder) folder_map[folder] = builder.AddFolder(norm_folder) +# Copy binaries. +for cxx_task in SM.extensions: + if cxx_task.target.arch == 'x86_64': + builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions/x64']) + else: + builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions']) + # Do all straight-up file copies from the source tree. def CopyFiles(src, dest, files): if not dest: @@ -24,13 +37,21 @@ def CopyFiles(src, dest, files): dest_entry = folder_map[dest] for source_file in files: source_path = os.path.join(builder.sourcePath, src, source_file) - builder.AddCopy(source_path, dest_entry) + dest_path = os.path.join(dest_entry.path, source_file) + if not os.path.isfile(str(dest_path)): + builder.AddCopy(source_path, dest_entry) # Gamedata -CopyFiles('gamedata', 'addons/sourcemod/gamedata', - [ 'CSSFixes.txt' ] +CopyFiles('addons/sourcemod/gamedata', 'addons/sourcemod/gamedata', + [ 'CSSFixes.games.txt' ] ) -# Copy binaries. -for cxx_task in Extension.extensions: - builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions']) +# Include +CopyFiles('addons/sourcemod/scripting/include', 'addons/sourcemod/scripting/include', + [ 'CSSFixes.inc' ] +) + +# Autoload extension +CopyFiles('addons/sourcemod/extensions', 'addons/sourcemod/extensions', + [ 'CSSFixes.autoload' ] +) diff --git a/addons/sourcemod/extensions/CSSFixes.autoload b/addons/sourcemod/extensions/CSSFixes.autoload new file mode 100644 index 0000000..e69de29 diff --git a/gamedata/CSSFixes.txt b/addons/sourcemod/gamedata/CSSFixes.games.txt similarity index 94% rename from gamedata/CSSFixes.txt rename to addons/sourcemod/gamedata/CSSFixes.games.txt index e20b7f2..1fc3166 100644 --- a/gamedata/CSSFixes.txt +++ b/addons/sourcemod/gamedata/CSSFixes.games.txt @@ -83,4 +83,4 @@ } } } -} +} \ No newline at end of file diff --git a/include/CSSFixes.inc b/addons/sourcemod/scripting/include/CSSFixes.inc similarity index 100% rename from include/CSSFixes.inc rename to addons/sourcemod/scripting/include/CSSFixes.inc diff --git a/configure.py b/configure.py index 57910e8..2804d35 100755 --- a/configure.py +++ b/configure.py @@ -1,23 +1,39 @@ -# vim: set sts=2 ts=8 sw=2 tw=99 et: +# vim: set ts=2 sw=2 tw=99 noet: import sys -from ambuild2 import run +try: + from ambuild2 import run, util +except: + try: + import ambuild + sys.stderr.write('It looks like you have AMBuild 1 installed, but this project uses AMBuild 2.\n') + sys.stderr.write('Upgrade to the latest version of AMBuild to continue.\n') + except: + sys.stderr.write('AMBuild must be installed to build this project.\n') + sys.stderr.write('http://www.alliedmods.net/ambuild\n') + sys.exit(1) -# Simple extensions do not need to modify this file. +# Hack to show a decent upgrade message, which wasn't done until 2.2. +ambuild_version = getattr(run, 'CURRENT_API', '2.1') +if ambuild_version.startswith('2.1'): + sys.stderr.write("AMBuild 2.2 or higher is required; please update\n") + sys.exit(1) -builder = run.PrepareBuild(sourcePath = sys.path[0]) +parser = run.BuildParser(sourcePath = sys.path[0], api='2.2') -builder.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None, +parser.options.add_argument('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None, help='Root search folder for HL2SDKs') -builder.options.add_option('--mms-path', type=str, dest='mms_path', default=None, +parser.options.add_argument('--mms-path', type=str, dest='mms_path', default=None, help='Path to Metamod:Source') -builder.options.add_option('--sm-path', type=str, dest='sm_path', default=None, +parser.options.add_argument('--sm-path', type=str, dest='sm_path', default=None, help='Path to SourceMod') -builder.options.add_option('--enable-debug', action='store_const', const='1', dest='debug', +parser.options.add_argument('--enable-debug', action='store_const', const='1', dest='debug', help='Enable debugging symbols') -builder.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt', +parser.options.add_argument('--enable-optimize', action='store_const', const='1', dest='opt', help='Enable optimization') -builder.options.add_option('-s', '--sdks', default='all', dest='sdks', +parser.options.add_argument('-s', '--sdks', default='all', dest='sdks', help='Build against specified SDKs; valid args are "all", "present", or ' 'comma-delimited list of engine names (default: %default)') +parser.options.add_argument('--targets', type=str, dest='targets', default=None, + help="Override the target architecture (use commas to separate multiple targets).") -builder.Configure() +parser.Configure() diff --git a/extension.cpp b/extension.cpp index a68dc1a..5a0f791 100644 --- a/extension.cpp +++ b/extension.cpp @@ -616,10 +616,10 @@ bool CSSFixes::SDK_OnLoad(char *error, size_t maxlength, bool late) g_iMaxPlayers = playerhelpers->GetMaxClients(); char conf_error[255] = ""; - if(!gameconfs->LoadGameConfigFile("CSSFixes", &g_pGameConf, conf_error, sizeof(conf_error))) + if(!gameconfs->LoadGameConfigFile("CSSFixes.games", &g_pGameConf, conf_error, sizeof(conf_error))) { if(conf_error[0]) - snprintf(error, maxlength, "Could not read CSSFixes.txt: %s", conf_error); + snprintf(error, maxlength, "Could not read CSSFixes.games.txt: %s", conf_error); return false; }