From e1a820dcf90a8609da9eea83411582aebd3f20aa Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 30 Dec 2013 17:50:56 -0500 Subject: [PATCH] Port simple C++ build scripts to AMBuild 2 (bug 5997 part 1, r=ds). --- AMBuildScript | 926 ++++++++++++++----------------- configure.py | 17 +- core/AMBuilder | 227 ++++---- core/logic/AMBuilder | 140 +++-- extensions/bintools/AMBuilder | 38 +- extensions/clientprefs/AMBuilder | 31 +- extensions/cstrike/AMBuilder | 50 +- extensions/geoip/AMBuilder | 27 +- extensions/mysql/AMBuilder | 64 +-- extensions/regex/AMBuilder | 40 +- extensions/sdkhooks/AMBuilder | 45 +- extensions/sdktools/AMBuilder | 85 ++- extensions/sqlite/AMBuilder | 40 +- extensions/tf2/AMBuilder | 23 +- extensions/topmenus/AMBuilder | 31 +- extensions/updater/AMBuilder | 30 +- loader/AMBuilder | 36 +- sourcepawn/compiler/AMBuilder | 141 ++--- sourcepawn/jit/AMBuilder | 98 ++-- 19 files changed, 955 insertions(+), 1134 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 815f6e84..8e9d2ae3 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -1,529 +1,415 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: -import os -import sys -from ambuild.command import Command -from ambuild.command import ShellCommand -from ambuild.command import SymlinkCommand +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: +import os, sys -class ExtractDebugInfoCommand(Command): - def __init__(self, binary, outfile): - Command.__init__(self) - self.binary = binary - self.outfile = outfile +class SDK(object): + def __init__(self, sdk, ext, aDef, name, platform, dir): + if dir == 'ep1': + folder = 'hl2sdk' + else: + folder = 'hl2sdk-' + dir + self.envvar = sdk + self.ext = ext + self.code = aDef + self.define = name + self.platform = platform + self.folder = folder # Default folder name. + self.name = dir + self.path = None # Actual path - def run(self, runner, job): - if AMBuild.cache['debug']: - return +WinOnly = ['windows'] +WinLinux = ['windows', 'linux'] +WinLinuxMac = ['windows', 'linux', 'mac'] - if not self.binary.NeedsRelink(self.outfile): - return - - if AMBuild.target['platform'] == 'linux': - job.AddCommand(ShellCommand('objcopy --only-keep-debug ' + self.outfile + ' ' + self.outfile + '.dbg')) - job.AddCommand(ShellCommand('objcopy --strip-debug ' + self.outfile)) - job.AddCommand(ShellCommand('objcopy --add-gnu-debuglink=' + os.path.basename(self.outfile) + '.dbg ' + self.outfile)) - elif AMBuild.target['platform'] == 'darwin': - job.AddCommand(ShellCommand('dsymutil ' + self.outfile)) - job.AddCommand(ShellCommand('strip -S ' + self.outfile)) - -class SM: - def __init__(self): - self.compiler = Cpp.Compiler() - - #Build SDK info - self.possibleSdks = { } - self.possibleSdks['ep1'] = {'sdk': 'HL2SDK', 'ext': '1.ep1', 'def': '1', - 'name': 'EPISODEONE', 'platform': ['windows', 'linux'], - 'dir': 'hl2sdk'} - self.possibleSdks['ep2'] = {'sdk': 'HL2SDKOB', 'ext': '2.ep2', 'def': '3', - 'name': 'ORANGEBOX', 'platform': ['windows', 'linux'], - 'dir': 'hl2sdk-ob'} - self.possibleSdks['css'] = {'sdk': 'HL2SDKCSS', 'ext': '2.css', 'def': '6', - 'name': 'CSS', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-css'} - self.possibleSdks['hl2dm'] = {'sdk': 'HL2SDKHL2DM', 'ext': '2.hl2dm', 'def': '7', - 'name': 'HL2DM', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-hl2dm'} - self.possibleSdks['dods'] = {'sdk': 'HL2SDKDODS', 'ext': '2.dods', 'def': '8', - 'name': 'DODS', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-dods'} - self.possibleSdks['sdk2013'] = {'sdk': 'HL2SDK2013', 'ext': '2.sdk2013', 'def': '9', - 'name': 'SDK2013', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-2013'} - self.possibleSdks['tf2'] = {'sdk': 'HL2SDKTF2', 'ext': '2.tf2', 'def': '10', - 'name': 'TF2', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-tf2'} - self.possibleSdks['l4d'] = {'sdk': 'HL2SDKL4D', 'ext': '2.l4d', 'def': '11', - 'name': 'LEFT4DEAD', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-l4d'} - self.possibleSdks['nd'] = {'sdk': 'HL2SDKND', 'ext': '2.nd', 'def': '12', - 'name': 'NUCLEARDAWN', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-nd'} - self.possibleSdks['l4d2'] = {'sdk': 'HL2SDKL4D2', 'ext': '2.l4d2', 'def': '13', - 'name': 'LEFT4DEAD2', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-l4d2'} - self.possibleSdks['darkm'] = {'sdk': 'HL2SDK-DARKM', 'ext': '2.darkm', 'def': '2', - 'name': 'DARKMESSIAH', 'platform': ['windows'], - 'dir': 'hl2sdk-darkm'} - self.possibleSdks['swarm'] = {'sdk': 'HL2SDK-SWARM', 'ext': '2.swarm', 'def': '14', - 'name': 'ALIENSWARM', 'platform': ['windows'], - 'dir': 'hl2sdk-swarm'} - self.possibleSdks['bgt'] = {'sdk': 'HL2SDK-BGT', 'ext': '2.bgt', 'def': '4', - 'name': 'BLOODYGOODTIME', 'platform': ['windows'], - 'dir': 'hl2sdk-bgt'} - self.possibleSdks['eye'] = {'sdk': 'HL2SDK-EYE', 'ext': '2.eye', 'def': '5', - 'name': 'EYE', 'platform': ['windows'], - 'dir': 'hl2sdk-eye'} - self.possibleSdks['csgo'] = {'sdk': 'HL2SDKCSGO', 'ext': '2.csgo', 'def': '18', - 'name': 'CSGO', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-csgo'} - self.possibleSdks['dota'] = {'sdk': 'HL2SDKDOTA', 'ext': '2.dota', 'def': '19', - 'name': 'DOTA', 'platform': ['windows'], - 'dir': 'hl2sdk-dota'} - self.possibleSdks['portal2'] = {'sdk': 'HL2SDKPORTAL2','ext': '2.portal2', 'def': '15', - 'name': 'PORTAL2', 'platform': [], - 'dir': 'hl2sdk-portal2'} - self.possibleSdks['blade'] = {'sdk': 'HL2SDKBLADE', 'ext': '2.blade', 'def': '16', - 'name': 'BLADE', 'platform': ['windows', 'linux'], - 'dir': 'hl2sdk-blade'} - self.possibleSdks['insurgency'] = {'sdk': 'HL2SDKINSURGENCY', 'ext': '2.insurgency', 'def': '17', - 'name': 'INSURGENCY', 'platform': ['windows', 'linux', 'darwin'], - 'dir': 'hl2sdk-insurgency'} - - self.sdkInfo = { } - - if AMBuild.mode == 'config': - #Detect compilers - self.compiler.DetectAll(AMBuild) - - self.hasMySql = AMBuild.options.hasMySql - AMBuild.cache.CacheVariable('hasMySql', self.hasMySql) - - AMBuild.cache.CacheVariable('debug', AMBuild.options.debug) - - #Environment variable paths to external headers - envvars = { 'MMSOURCE110': 'mmsource-1.10', 'MYSQL5': 'mysql-5.0' } - - #Look for Metamod:Source and MySQL if not disabled - for env in envvars: - if not self.hasMySql and env == 'MYSQL5': - continue - path = self.ResolveEnvPath(env, envvars[env]) - if path == None: - raise Exception('Could not find a valid path for {0}'.format(env)) - AMBuild.cache.CacheVariable(env, path) - - #Look for SDK directories - for sdk in self.possibleSdks: - #Get list of SDKs to build against or 'all' or 'present' - sdkList = AMBuild.options.sdks.split(',') - #Build against all supported SDKs? - useAll = sdkList[0] == 'all' - #Build against supported SDKs that exist? - usePresent = sdkList[0] == 'present' - - info = self.possibleSdks[sdk] - if AMBuild.target['platform'] in info['platform']: - env = info['sdk'] - dir = info['dir'] - sdkPath = self.ResolveEnvPath(env, dir) - if sdkPath == None: - if useAll or sdk in sdkList: - raise Exception('Could not find a valid path for {0}'.format(env)) - else: - continue - if useAll or usePresent or sdk in sdkList: - self.sdkInfo[sdk] = info - AMBuild.cache.CacheVariable(env, sdkPath) - - if len(self.sdkInfo) < 1: - raise Exception('At least one SDK must be available.') - - AMBuild.cache.CacheVariable('sdkInfo', self.sdkInfo) - - #Set up defines - cxx = self.compiler.cxx - if isinstance(cxx, Cpp.CompatGCC): - if isinstance(cxx, Cpp.GCC): - self.vendor = 'gcc' - elif isinstance(cxx, Cpp.Clang): - self.vendor = 'clang' - self.compiler.AddToListVar('CDEFINES', 'stricmp=strcasecmp') - self.compiler.AddToListVar('CDEFINES', '_stricmp=strcasecmp') - self.compiler.AddToListVar('CDEFINES', '_snprintf=snprintf') - self.compiler.AddToListVar('CDEFINES', '_vsnprintf=vsnprintf') - self.compiler.AddToListVar('CFLAGS', '-pipe') - self.compiler.AddToListVar('CFLAGS', '-fno-strict-aliasing') - if (self.vendor == 'gcc' and cxx.majorVersion >= 4) or self.vendor == 'clang': - self.compiler.AddToListVar('CFLAGS', '-fvisibility=hidden') - self.compiler.AddToListVar('CXXFLAGS', '-fvisibility-inlines-hidden') - self.compiler.AddToListVar('CFLAGS', '-Wall') - self.compiler.AddToListVar('CFLAGS', '-Werror') - if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 6) or self.vendor == 'clang': - self.compiler.AddToListVar('CFLAGS', '-Wno-narrowing') - self.compiler.AddToListVar('CFLAGS', '-Wno-uninitialized') - self.compiler.AddToListVar('CFLAGS', '-Wno-unused') - self.compiler.AddToListVar('CFLAGS', '-Wno-switch') - self.compiler.AddToListVar('CFLAGS', '-msse') - self.compiler.AddToListVar('CFLAGS', '-g3') - self.compiler.AddToListVar('CFLAGS', '-m32') - self.compiler.AddToListVar('POSTLINKFLAGS', '-m32') - self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions') - self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics') - self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor') - self.compiler.AddToListVar('CXXFLAGS', '-Wno-overloaded-virtual') - if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 7) or \ - (self.vendor == 'clang' and cxx.majorVersion >= 3): - self.compiler.AddToListVar('CXXFLAGS', '-Wno-delete-non-virtual-dtor') - self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H') - self.compiler.AddToListVar('CDEFINES', 'GNUC') - if self.vendor == 'gcc': - self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse') - elif isinstance(cxx, Cpp.MSVC): - self.vendor = 'msvc' - if AMBuild.options.debug == '1': - self.compiler.AddToListVar('CFLAGS', '/MTd') - self.compiler.AddToListVar('POSTLINKFLAGS', '/NODEFAULTLIB:libcmt') - else: - self.compiler.AddToListVar('CFLAGS', '/MT') - self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE') - self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS') - self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE') - self.compiler.AddToListVar('CDEFINES', '_ITERATOR_DEBUG_LEVEL=0') - self.compiler.AddToListVar('CXXFLAGS', '/EHsc') - self.compiler.AddToListVar('CXXFLAGS', '/GR-') - self.compiler.AddToListVar('CFLAGS', '/W3') - self.compiler.AddToListVar('CFLAGS', '/nologo') - self.compiler.AddToListVar('CFLAGS', '/Zi') - self.compiler.AddToListVar('CXXFLAGS', '/TP') - self.compiler.AddToListVar('POSTLINKFLAGS', '/DEBUG') - self.compiler.AddToListVar('POSTLINKFLAGS', '/MACHINE:X86') - self.compiler.AddToListVar('POSTLINKFLAGS', '/SUBSYSTEM:WINDOWS') - self.compiler.AddToListVar('POSTLINKFLAGS', 'kernel32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'user32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'gdi32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'winspool.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'comdlg32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'advapi32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'shell32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'ole32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'oleaut32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'uuid.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'odbc32.lib') - self.compiler.AddToListVar('POSTLINKFLAGS', 'odbccp32.lib') - - #Optimization - if AMBuild.options.opt == '1': - self.compiler.AddToListVar('CDEFINES', 'NDEBUG') - if self.vendor == 'gcc' or self.vendor == 'clang': - self.compiler.AddToListVar('CFLAGS', '-O3') - elif self.vendor == 'msvc': - self.compiler.AddToListVar('CFLAGS', '/Ox') - self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:ICF') - self.compiler.AddToListVar('POSTLINKFLAGS', '/OPT:REF') - - #Debugging - if AMBuild.options.debug == '1': - self.compiler.AddToListVar('CDEFINES', 'DEBUG') - self.compiler.AddToListVar('CDEFINES', '_DEBUG') - if self.vendor == 'msvc': - self.compiler.AddToListVar('CFLAGS', '/Od') - self.compiler.AddToListVar('CFLAGS', '/RTC1') - - #This needs to be after our optimization flags which could otherwise disable it. - if self.vendor == 'msvc': - # Don't omit frame pointer - self.compiler.AddToListVar('CFLAGS', '/Oy-') - - #Platform-specifics - if AMBuild.target['platform'] == 'linux': - self.compiler.AddToListVar('CDEFINES', '_LINUX') - self.compiler.AddToListVar('CDEFINES', 'POSIX') - if self.vendor == 'gcc': - self.compiler.AddToListVar('POSTLINKFLAGS', '-static-libgcc') - if self.vendor == 'clang': - self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh') - elif AMBuild.target['platform'] == 'darwin': - self.compiler.AddToListVar('CDEFINES', 'OSX') - self.compiler.AddToListVar('CDEFINES', '_OSX') - self.compiler.AddToListVar('CDEFINES', 'POSIX') - self.compiler.AddToListVar('POSTLINKFLAGS', '-mmacosx-version-min=10.5') - self.compiler.AddToListVar('POSTLINKFLAGS', ['-arch', 'i386']) - self.compiler.AddToListVar('POSTLINKFLAGS', '-lstdc++') - - # For OS X dylib versioning - import re - productFile = open(os.path.join(AMBuild.sourceFolder, 'product.version'), 'r') - productContents = productFile.read() - productFile.close() - m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents) - if m == None: - self.version = '1.0.0' - else: - major, minor, release = m.groups() - self.version = '{0}.{1}.{2}'.format(major, minor, release) - AMBuild.cache.CacheVariable('version', self.version) - elif AMBuild.target['platform'] == 'windows': - self.compiler.AddToListVar('CDEFINES', 'WIN32') - self.compiler.AddToListVar('CDEFINES', '_WINDOWS') - - #Finish up - self.compiler.AddToListVar('CDEFINES', 'SOURCEMOD_BUILD') - self.compiler.AddToListVar('CDEFINES', 'SM_GENERATED_BUILD') - self.compiler.AddToListVar('CINCLUDES', - os.path.join(AMBuild.outputFolder, 'includes')) - self.compiler.ToConfig(AMBuild, 'compiler') - AMBuild.cache.CacheVariable('vendor', self.vendor) - self.targetMap = { } - AMBuild.cache.CacheVariable('targetMap', self.targetMap) - else: - self.sdkInfo = AMBuild.cache['sdkInfo'] - self.compiler.FromConfig(AMBuild, 'compiler') - self.targetMap = AMBuild.cache['targetMap'] - self.hasMySql = AMBuild.cache['hasMySql'] - - if AMBuild.target['platform'] == 'windows': - self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public')) - self.compiler.AddToListVar('RCINCLUDES', - os.path.join(AMBuild.outputFolder, 'includes')) - self.mmsPath = AMBuild.cache['MMSOURCE110'] - - def DefaultCompiler(self): - return self.compiler.Clone() - - def JobMatters(self, jobname): - file = sys._getframe().f_code.co_filename - if AMBuild.mode == 'config': - self.targetMap[jobname] = file - return True - if len(AMBuild.args) == 0: - return True - if not jobname in AMBuild.args: - return False - - def DefaultExtCompiler(self, path): - compiler = self.DefaultCompiler() - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path)) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path, 'sdk')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'extensions')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'sourcepawn')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'amtl')) - return compiler - - def AutoVersion(self, folder, binary): - if AMBuild.target['platform'] == 'windows': - env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']} - binary.AddResourceFile(os.path.join(folder, 'version.rc' ), env) - elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder): - binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0']) - binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']]) - else: - return - - def ExtractDebugInfo(self, job, binary): - src = os.path.join('..', AMBuild.outputFolder, job.workFolder, binary.binaryFile) - job.AddCommand(ExtractDebugInfoCommand(binary, src)) - - def PreSetupHL2Job(self, job, builder, sdk): - info = self.sdkInfo[sdk] - sdkPath = AMBuild.cache[info['sdk']] - if AMBuild.target['platform'] == 'linux': - if sdk == 'ep1': - staticLibs = os.path.join(sdkPath, 'linux_sdk') - elif sdk == 'sdk2013': - staticLibs = os.path.join(sdkPath, 'lib', 'public', 'linux32') - else: - staticLibs = os.path.join(sdkPath, 'lib', 'linux') - workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) - libs = [] - if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'l4d2']: - libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so'] - elif sdk in ['l4d', 'nd', 'blade', 'insurgency', 'csgo']: - libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so'] - if sdk in ['blade', 'insurgency', 'csgo']: - libs.append('interfaces_i486.a') - elif sdk == 'sdk2013': - libs = ['tier1.a', 'mathlib.a', 'libvstdlib_srv.so', 'libtier0_srv.so'] - else: - libs = ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_i486.so', 'tier0_i486.so'] - - for lib in libs: - link = os.path.join(workFolder, lib) - target = os.path.join(staticLibs, lib) - try: - os.lstat(link) - except: - job.AddCommand(SymlinkCommand(link, target)) - elif AMBuild.target['platform'] == 'darwin': - if sdk == 'sdk2013': - staticLibs = os.path.join(sdkPath, 'lib', 'public', 'osx32') - libs = ['tier1.a', 'mathlib.a', 'libvstdlib.dylib', 'libtier0.dylib'] - else: - staticLibs = os.path.join(sdkPath, 'lib', 'mac') - libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.dylib', 'libtier0.dylib'] - workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) - if sdk in ['insurgency', 'csgo']: - libs.append('interfaces_i486.a') - for lib in libs: - link = os.path.join(workFolder, lib) - target = os.path.join(staticLibs, lib) - try: - os.lstat(link) - except: - job.AddCommand(SymlinkCommand(link, target)) - elif AMBuild.target['platform'] == 'windows': - libs = ['tier0', 'tier1', 'vstdlib', 'mathlib'] - if sdk in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']: - libs.append('interfaces') - for lib in libs: - libPath = os.path.join(sdkPath, 'lib', 'public', lib) + '.lib' - builder.RebuildIfNewer(libPath) - builder['POSTLINKFLAGS'].append(libPath) - - def PostSetupHL2Job(self, job, builder, sdk): - if AMBuild.target['platform'] in ['linux', 'darwin']: - if sdk == 'sdk2013': - builder.AddObjectFiles(['tier1.a', 'mathlib.a']) - else: - builder.AddObjectFiles(['tier1_i486.a', 'mathlib_i486.a']) - - if sdk in ['blade', 'insurgency', 'csgo']: - builder.AddObjectFiles(['interfaces_i486.a']) - - def DefaultHL2Compiler(self, path, sdk, noLink = False, oldMms = '-legacy'): - compiler = self.DefaultExtCompiler(path) - - mms = 'core' - if sdk == 'ep1': - mms += oldMms - - compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms)) - compiler['CXXINCLUDES'].append(os.path.join(self.mmsPath, mms, 'sourcehook')) - - info = self.possibleSdks - compiler['CDEFINES'].extend(['SE_' + info[i]['name'] + '=' + info[i]['def'] for i in info]) - - paths = [['public'], ['public', 'engine'], ['public', 'mathlib'], ['public', 'vstdlib'], - ['public', 'tier0'], ['public', 'tier1']] - if sdk == 'ep1' or sdk == 'darkm': - paths.append(['public', 'dlls']) - paths.append(['game_shared']) - else: - paths.append(['public', 'game', 'server']) - paths.append(['public', 'toolframework']) - paths.append(['game', 'shared']) - paths.append(['common']) - - info = self.sdkInfo[sdk] - sdkPath = AMBuild.cache[info['sdk']] - - compiler['CDEFINES'].append('SOURCE_ENGINE=' + info['def']) - - if sdk == 'sdk2013' and isinstance(compiler.cxx, Cpp.CompatGCC): - # The 2013 SDK already has these in public/tier0/basetypes.h - compiler['CDEFINES'].remove('stricmp=strcasecmp') - compiler['CDEFINES'].remove('_stricmp=strcasecmp') - compiler['CDEFINES'].remove('_snprintf=snprintf') - compiler['CDEFINES'].remove('_vsnprintf=vsnprintf') - - if sdk in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']: - if AMBuild.target['platform'] == 'windows': - compiler['CDEFINES'].extend(['COMPILER_MSVC', 'COMPILER_MSVC32']) - else: - compiler['CDEFINES'].extend(['COMPILER_GCC']) - - if sdk == 'sdk2013' and AMBuild.target['platform'] == 'darwin': - compiler['POSTLINKFLAGS'].append('-liconv') - - if sdk in ['css','hl2dm','dods','sdk2013','tf2','l4d2']: - if AMBuild.target['platform'] == 'linux' or AMBuild.target['platform'] == 'darwin': - compiler['CDEFINES'].append('NO_MALLOC_OVERRIDE') - - if AMBuild.target['platform'] == 'linux': - if sdk == 'ep1': - staticLibs = os.path.join(sdkPath, 'linux_sdk') - elif sdk == 'sdk2013': - staticLibs = os.path.join(sdkPath, 'lib', 'public', 'linux32') - else: - staticLibs = os.path.join(sdkPath, 'lib', 'linux') - elif AMBuild.target['platform'] == 'darwin': - if sdk == 'sdk2013': - staticLibs = os.path.join(sdkPath, 'lib', 'public', 'osx32') - else: - staticLibs = os.path.join(sdkPath, 'lib', 'mac') - - for i in paths: - compiler['CXXINCLUDES'].append(os.path.join(sdkPath, *i)) - - if not noLink: - if AMBuild.target['platform'] == 'linux': - compiler['POSTLINKFLAGS'][0:0] = ['-lm'] - if sdk in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'l4d2']: - compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so'] - compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so'] - elif sdk in ['l4d', 'nd', 'blade', 'insurgency', 'csgo']: - compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so'] - compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so'] - else: - compiler['POSTLINKFLAGS'][0:0] = ['tier0_i486.so'] - compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_i486.so'] - elif AMBuild.target['platform'] == 'darwin': - compiler['POSTLINKFLAGS'][0:0] = ['libtier0.dylib'] - compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.dylib'] - - return compiler - - def ResolveEnvPath(self, env, defaultDir): - if env in os.environ: - path = os.environ[env] - if os.path.isdir(path): - return path - else: - head = os.getcwd() - oldhead = None - while head != None and head != oldhead: - path = os.path.join(head, defaultDir) - if os.path.isdir(path): - return path - oldhead = head - head, tail = os.path.split(head) - return None - -sm = SM() -globals = { - 'SM': sm +PossibleSDKs = { + 'ep1': SDK('HL2SDK', '1.ep1', '1', 'EPISODEONE', WinLinux, 'ep1'), + 'ep2': SDK('HL2SDKOB', '2.ep2', '3', 'ORANGEBOX', WinLinux, 'ob'), + 'css': SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'), + 'hl2dm': SDK('HL2SDKHL2DM', '2.hl2dm', '7', 'HL2DM', WinLinuxMac, 'hl2dm'), + 'dods': SDK('HL2SDKDODS', '2.dods', '8', 'DODS', WinLinuxMac, 'dods'), + 'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, '2013'), + 'tf2': SDK('HL2SDKTF2', '2.tf2', '10', 'TF2', WinLinuxMac, 'tf2'), + 'l4d': SDK('HL2SDKL4D', '2.l4d', '11', 'LEFT4DEAD', WinLinuxMac, 'l4d'), + 'nd': SDK('HL2SDKND', '2.nd', '12', 'NUCLEARDAWN', WinLinuxMac, 'nd'), + 'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '13', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'), + 'darkm': SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'), + 'swarm': SDK('HL2SDK-SWARM', '2.swarm', '14', 'ALIENSWARM', WinOnly, 'swarm'), + 'bgt': SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'), + 'eye': SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'), + 'csgo': SDK('HL2SDKCSGO', '2.csgo', '18', 'CSGO', WinLinuxMac, 'csgo'), + 'dota': SDK('HL2SDKDOTA', '2.dota', '19', 'DOTA', WinOnly, 'dota'), + 'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '15', 'PORTAL2', [], 'portal2'), + 'blade': SDK('HL2SDKBLADE', '2.blade', '16', 'BLADE', WinLinux, 'blade'), + 'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '17', 'INSURGENCY', WinLinuxMac, 'insurgency'), } -AMBuild.Include(os.path.join('tools', 'buildbot', 'Versioning'), globals) +def ResolveEnvPath(env, folder): + if env in os.environ: + path = os.environ[env] + if os.path.isdir(path): + return path + else: + head = os.getcwd() + oldhead = None + while head != None and head != oldhead: + path = os.path.join(head, folder) + if os.path.isdir(path): + return path + oldhead = head + head, tail = os.path.split(head) + return None -FileList = [ - ['loader', 'AMBuilder'], - ['core', 'AMBuilder'], - ['core', 'logic', 'AMBuilder'], - ['extensions', 'bintools', 'AMBuilder'], - ['extensions', 'clientprefs', 'AMBuilder'], - ['extensions', 'cstrike', 'AMBuilder'], - ['extensions', 'curl', 'AMBuilder'], - ['extensions', 'geoip', 'AMBuilder'], - ['extensions', 'mysql', 'AMBuilder'], - ['extensions', 'sdkhooks', 'AMBuilder'], - ['extensions', 'sdktools', 'AMBuilder'], - ['extensions', 'topmenus', 'AMBuilder'], - ['extensions', 'updater', 'AMBuilder'], - ['extensions', 'sqlite', 'AMBuilder'], - ['extensions', 'regex', 'AMBuilder'], - ['extensions', 'tf2', 'AMBuilder'], - ['sourcepawn', 'jit', 'AMBuilder'], - ['sourcepawn', 'compiler', 'AMBuilder'], - ['plugins', 'AMBuilder'], - ['tools', 'buildbot', 'PackageScript'], - ['tools', 'buildbot', 'BreakpadSymbols'] - ] +class SMConfig(object): + def __init__(self): + self.sdks = {} + self.binaries = [] + self.mms_root = None + self.mysql_root = None -if not sm.hasMySql: - FileList.remove(['extensions', 'mysql', 'AMBuilder']) + def detectSDKs(self): + sdk_list = builder.options.sdks.split(',') + use_all = sdk_list[0] == 'all' + use_present = sdk_list[0] == 'present' -for parts in FileList: - AMBuild.Include(os.path.join(*parts), globals) + for sdk_name in PossibleSDKs: + sdk = PossibleSDKs[sdk_name] + if builder.target_platform in sdk.platform: + sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder) + if sdk_path is None: + if use_all or sdk_name in sdk_list: + raise Exception('Could not find a valid path for {0}'.format(sdk.envvar)) + continue + if use_all or use_present or sdk_name in sdk_list: + sdk.path = sdk_path + self.sdks[sdk_name] = sdk + if len(self.sdks) < 1: + raise Exception('At least one SDK must be available.') + + self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10') + if not self.mms_root: + self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central') + if not self.mms_root: + raise Exception('Could not find a source copy of Metamod:Source') + + if builder.options.hasMySql: + for i in range(7): + self.mysql_root = ResolveEnvPath('MYSQL5', 'mysql-5.' + str(i)) + if self.mysql_root: + break + if not self.mysql_root: + raise Exception('Could not find a path to MySQL!') + + def configure(self): + cfg = builder.DetectCompilers() + cxx = cfg.cxx + + if cxx.behavior is 'gcc': + cfg.defines += [ + 'stricmp=strcasecmp', + '_stricmp=strcasecmp', + '_snprintf=snprintf', + '_vsnprintf=vsnprintf', + 'HAVE_STDINT_H', + 'GNUC', + ] + cfg.cflags += [ + '-pipe', + '-fno-strict-aliasing', + '-Wall', + '-Werror', + '-Wno-uninitialized', + '-Wno-unused', + '-Wno-switch', + '-msse', + '-m32', + '-g3', + ] + + have_gcc = cxx.name is 'gcc' + have_clang = cxx.name is 'clang' + if have_clang or (have_gcc and cxx.majorVersion >= 4): + cfg.cflags += ['-fvisibility=hidden'] + cfg.cxxflags += ['-fvisibility-inlines-hidden'] + if have_clang or (have_gcc and cxx.minorVersion >= 6): + cfg.cflags += ['-Wno-narrowing'] + if (have_gcc and cxx.minorVersion >= 7) or (have_clang and cxx.majorVersion >= 4): + cfg.cxxflags += ['-Wno-delete-non-virtual-dtor'] + + cfg.linkflags += ['-m32'] + cfg.cxxflags += [ + '-fno-exceptions', + '-fno-threadsafe-statics', + '-Wno-non-virtual-dtor', + '-Wno-overloaded-virtual', + ] + + if have_gcc: + cfg.cflags += ['-mfpmath=sse'] + elif cxx.name == 'msvc': + if builder.options.debug == '1': + cfg.cflags += ['/MTd'] + cfg.linkflags += ['/NODEFAULTLIB:libcmt'] + else: + cfg.cflags += ['/MT'] + cfg.defines += [ + '_CRT_SECURE_NO_DEPRECATE', + '_CRT_SECURE_NO_WARNINGS', + '_CRT_NONSTDC_NO_DEPRECATE', + '_ITERATOR_DEBUG_LEVEL=0', + ] + cfg.cflags += [ + '/W3', + '/Zi', + ] + cfg.cxxflags += [ + '/EHsc', + '/GR-', + '/TP', + ] + cfg.linkflags += [ + '/DEBUG', + '/MACHINE:X86', + '/SUBSYSTEM:WINDOWS', + 'kernel32.lib', + 'user32.lib', + 'gdi32.lib', + 'winspool.lib', + 'comdlg32.lib', + 'advapi32.lib', + 'shell32.lib', + 'ole32.lib', + 'oleaut32.lib', + 'uuid.lib', + 'odbc32.lib', + 'odbccp32.lib', + ] + + # Optimization + if builder.options.opt == '1': + cfg.defines += ['NDEBUG'] + if cxx.behavior == 'gcc': + cfg.cflags += ['-O3'] + elif cxx.behavior == 'msvc': + cfg.cflags += ['/Ox'] + cfg.linkflags += ['/OPT:ICF', '/OPT:REF'] + + # Debugging + if builder.options.debug == '1': + cfg.defines += ['DEBUG', '_DEBUG'] + if cxx.behavior == 'gcc': + cfg.cflags += ['-g3'] + elif cxx.behavior == 'msvc': + cfg.cflags += ['/Od', '/RTC1'] + + # This needs to be after our optimization flags which could otherwise disable it. + if cxx.name == 'msvc': + # Don't omit the frame pointer. + cfg.cflags += ['/Oy-'] + + # Platform-specifics + if builder.target_platform == 'linux': + cfg.defines += ['_LINUX', 'POSIX'] + if cxx.name == 'gcc': + cfg.linkflags += ['-static-libgcc'] + elif cxx.name == 'clang': + cfg.linkflags += ['-lgcc_eh'] + elif builder.target_platform == 'mac': + cfg.defines += ['OSX', '_OSX', 'POSIX'] + cfg.linkflags += [ + '-mmacosx-version-min=10.5', + '-arch', 'i386', + '-lstdc++', + ] + elif builder.target_platform == 'windows': + cfg.defines += ['WIN32', '_WINDOWS'] + + # Finish up. + cfg.defines += [ + 'SOURCEMOD_BUILD', + ] + cfg.includes += [os.path.join(builder.buildPath, 'includes')] + + def LibraryBuilder(self, compiler, name): + binary = compiler.Library(name) + return binary + + def ProgramBuilder(self, compiler, name): + binary = compiler.Program(name) + return binary + + def Library(self, context, name): + compiler = context.compiler.clone() + return self.LibraryBuilder(compiler, name) + + def Program(self, context, name): + compiler = context.compiler.clone() + return self.ProgramBuilder(compiler, name) + + def ExtCompiler(self, context): + compiler = context.compiler.clone() + compiler.cxxincludes += [ + os.path.join(context.currentSourcePath), + os.path.join(context.currentSourcePath, 'sdk'), + os.path.join(builder.sourcePath, 'public'), + os.path.join(builder.sourcePath, 'public', 'extensions'), + os.path.join(builder.sourcePath, 'public', 'sourcepawn'), + os.path.join(builder.sourcePath, 'public', 'amtl'), + ] + return compiler + + def HL2Compiler(self, context, sdk): + compiler = self.ExtCompiler(context) + + if sdk.name == 'ep1': + mms_path = os.path.join(self.mms_root, 'core-legacy') + else: + mms_path = os.path.join(self.mms_root, 'core') + + compiler.cxxincludes += [ + os.path.join(mms_path), + os.path.join(mms_path, 'sourcehook'), + ] + + defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs] + compiler.defines += defines + paths = [ + ['public'], + ['public', 'engine'], + ['public', 'mathlib'], + ['public', 'vstdlib'], + ['public', 'tier0'], + ['public', 'tier1'] + ] + if sdk.name == 'ep1' or sdk.name == 'darkm': + paths.append(['public', 'dlls']) + paths.append(['game_shared']) + else: + paths.append(['public', 'game', 'server']) + paths.append(['public', 'toolframework']) + paths.append(['game', 'shared']) + paths.append(['common']) + + compiler.defines += ['SOURCE_ENGINE=' + sdk.code] + + if sdk.name == '2013' and compiler.cxx.behavior == 'gcc': + # The 2013 SDK already has these in public/tier0/basetypes.h + compiler.defines.remove('stricmp=strcasecmp') + compiler.defines.remove('_stricmp=strcasecmp') + compiler.defines.remove('_snprintf=snprintf') + compiler.defines.remove('_vsnprintf=vsnprintf') + + if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']: + if compiler.cc.behavior == 'msvc': + compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32'] + else: + compiler.defines += ['COMPILER_GCC'] + + if sdk.name in ['css', 'hl2dm', 'dods', '2013', 'tf2', 'l4d2']: + if builder.target_platform in ['linux', 'mac']: + compiler.defines += ['NO_MALLOC_OVERRIDE'] + + for path in paths: + compiler.cxxincludes += [os.path.join(sdk.path, *path)] + + return compiler + + def ExtLibrary(self, context, name): + compiler = self.ExtCompiler(context) + return self.LibraryBuilder(compiler, name) + + def HL2Library(self, context, name, sdk): + compiler = self.HL2Compiler(context, sdk) + + if builder.target_platform is 'linux': + if sdk.name is 'ep1': + lib_folder = os.path.join(sdk.path, 'linux_sdk') + elif sdk.name is '2013': + lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32') + else: + lib_folder = os.path.join(sdk.path, 'lib', 'linux') + elif builder.target_platform == 'mac': + if sdk.name is '2013': + lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32') + else: + lib_folder = os.path.join(sdk.path, 'lib', 'mac') + + if builder.target_platform in ['linux', 'mac']: + if sdk.name is '2013': + compiler.postlink += [ + compiler.Dep(os.path.join(lib_folder, 'tier1.a')), + compiler.Dep(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')) + ] + + if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']: + compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))] + + binary = self.LibraryBuilder(compiler, name) + + dynamic_libs = [] + if builder.target_platform == 'linux': + compiler.linkflags[0:0] = ['-lm'] + if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', '2013', 'l4d2']: + dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so'] + elif sdk.name in ['l4d', 'nd', 'blade', 'insurgency', 'csgo']: + dynamic_libs = ['libtier0.so', 'libvstdlib.so'] + else: + dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so'] + elif builder.target_platform == 'mac': + binary.compiler.linkflags.append('-liconv') + dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib'] + elif builder.target_platform == 'windows': + libs = ['tier0', 'tier1', 'vstdlib', 'mathlib'] + if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']: + libs.append('interfaces') + for lib in libs: + lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib' + binary.compiler.linkflags.append(binary.Dep(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 + + linker = make_linker(source_path, output_path) + binary.compiler.linkflags[0:0] = [binary.Dep(library, linker)] + + return binary + +SM = SMConfig() +SM.detectSDKs() +SM.configure() + +builder.RunBuildScripts( + [ + 'loader/AMBuilder', + 'core/AMBuilder', + 'core/logic/AMBuilder', + 'extensions/bintools/AMBuilder', + 'extensions/clientprefs/AMBuilder', + 'extensions/cstrike/AMBuilder', + 'extensions/geoip/AMBuilder', + 'extensions/mysql/AMBuilder', + 'extensions/regex/AMBuilder', + 'extensions/sdkhooks/AMBuilder', + 'extensions/sdktools/AMBuilder', + 'extensions/sqlite/AMBuilder', + 'extensions/tf2/AMBuilder', + 'extensions/topmenus/AMBuilder', + 'extensions/updater/AMBuilder', + 'sourcepawn/compiler/AMBuilder', + 'sourcepawn/jit/AMBuilder', + ], + { + 'SM': SM + } +) diff --git a/configure.py b/configure.py index 4c758b4c..8b6a2868 100644 --- a/configure.py +++ b/configure.py @@ -1,8 +1,19 @@ # vim: set ts=2 sw=2 tw=99 noet: import sys -import ambuild.runner as runner +try: + from ambuild2 import run +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) -run = runner.Runner() +run = run.PrepareBuild(sourcePath=sys.path[0]) +run.default_build_folder = 'obj-' + run.target_platform run.options.add_option('--enable-debug', action='store_const', const='1', dest='debug', help='Enable debugging symbols') run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt', @@ -12,4 +23,4 @@ run.options.add_option('--no-mysql', action='store_false', default=True, dest='h run.options.add_option('-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)') -run.Configure(sys.path[0]) +run.Configure() diff --git a/core/AMBuilder b/core/AMBuilder index 27c50180..078ccb06 100644 --- a/core/AMBuilder +++ b/core/AMBuilder @@ -1,137 +1,110 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -from ambuild.command import SymlinkCommand -for i in SM.sdkInfo: - sdk = SM.sdkInfo[i] - if AMBuild.target['platform'] not in sdk['platform']: - continue +for sdk_name in SM.sdks: + sdk = SM.sdks[sdk_name] + binary_name = 'sourcemod.' + sdk.ext - name = 'sourcemod.' + sdk['ext'] + binary = SM.HL2Library(builder, binary_name, sdk) + compiler = binary.compiler - compiler = SM.DefaultHL2Compiler('core', i) + if sdk.name is 'csgo': + # Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve. + if compiler.cxx.behavior is 'gcc': + compiler.cflags += ['-Wno-sign-compare'] + compiler.cxxincludes += [ + os.path.join(sdk.path, 'common', 'protobuf-2.3.0', 'src'), + os.path.join(sdk.path, 'public', 'engine', 'protobuf'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf') + ] + elif sdk.name is 'dota': + compiler.cxxincludes += [ + os.path.join(sdk.path, 'common', 'protobuf-2.4.1', 'src'), + os.path.join(sdk.path, 'public', 'engine', 'protobuf'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf') + ] - if i == 'csgo': - # Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve. - if isinstance(compiler.cxx, Cpp.CompatGCC): - compiler.AddToListVar('CFLAGS', '-Wno-sign-compare') - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'common', 'protobuf-2.3.0', 'src')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'engine', 'protobuf')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'game', 'shared', 'csgo', 'protobuf')) - elif i == 'dota': - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'common', 'protobuf-2.4.1', 'src')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'engine', 'protobuf')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'game', 'shared', 'protobuf')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'game', 'shared', 'dota', 'protobuf')) + if builder.target_platform is 'linux': + compiler.postlink += ['-lpthread', '-lrt'] - extension = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) - SM.PreSetupHL2Job(extension, binary, i) + if sdk.name is 'csgo' or sdk.name is 'dota': + if builder.target_platform is 'linux': + lib_path = os.path.join(sdk.path, 'lib', 'linux32', 'release', 'libprotobuf.a') + elif builder.target_platform is 'mac': + lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a') + elif builder.target_platform is 'windows': + if 'DEBUG' in compiler.defines: + lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib') + else: + lib_path = os.path.join(sdk.path, 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib') + compiler.linkflags.insert(0, binary.Dep(lib_path)) - if AMBuild.target['platform'] == 'linux': - compiler['POSTLINKFLAGS'].append('-lpthread') - compiler['POSTLINKFLAGS'].append('-lrt') + binary.sources += [ + 'AdminCache.cpp', + 'MenuStyle_Valve.cpp', + 'logic_bridge.cpp', + 'smn_entities.cpp', + 'sm_stringutil.cpp', + 'MenuVoting.cpp', + 'smn_events.cpp', + 'smn_menus.cpp', + 'sm_trie.cpp', + 'CDataPack.cpp', + 'frame_hooks.cpp', + 'smn_nextmap.cpp', + 'sourcemm_api.cpp', + 'ChatTriggers.cpp', + 'smn_player.cpp', + 'sourcemod.cpp', + 'concmd_cleaner.cpp', + 'HalfLife2.cpp', + 'NextMap.cpp', + 'ConCmdManager.cpp', + 'ConVarManager.cpp', + 'LibrarySys.cpp', + 'PlayerManager.cpp', + 'TimerSys.cpp', + 'CoreConfig.cpp', + 'Logger.cpp', + 'smn_halflife.cpp', + 'smn_console.cpp', + 'UserMessages.cpp', + 'MenuManager.cpp', + 'smn_core.cpp', + 'smn_hudtext.cpp', + 'smn_usermsgs.cpp', + 'MenuStyle_Base.cpp', + 'smn_keyvalues.cpp', + 'smn_vector.cpp', + 'EventManager.cpp', + 'MenuStyle_Radio.cpp', + 'sm_autonatives.cpp', + 'sm_srvcmds.cpp', + 'ConsoleDetours.cpp' + ] + + if sdk.name in ['csgo', 'dota']: + binary.sources += ['smn_protobuf.cpp'] + else: + binary.sources += ['smn_bitbuffer.cpp'] - if i in ['csgo', 'dota']: - if AMBuild.target['platform'] == 'linux': - link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a') - target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'linux32', 'release'), 'libprotobuf.a') - try: - os.lstat(link) - except: - extension.AddCommand(SymlinkCommand(link, target)) - elif AMBuild.target['platform'] == 'darwin': - link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a') - target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'osx32', 'release'), 'libprotobuf.a') - try: - os.lstat(link) - except: - extension.AddCommand(SymlinkCommand(link, target)) - elif AMBuild.target['platform'] == 'windows': - if 'DEBUG' in compiler['CDEFINES']: - libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib') - else: - libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib') - binary.RebuildIfNewer(libPath) - binary['POSTLINKFLAGS'].append(libPath) + if sdk.name is 'csgo': + binary.sources += [ + os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'), + ] + elif sdk.name is 'dota': + binary.sources += [ + os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'networkbasetypes.pb.cc'), + os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'ai_activity.pb.cc'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'usermessages.pb.cc'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_commonmessages.pb.cc'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessages.pb.cc'), + os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessage_helpers.cpp'), + ] - files = [ - 'AdminCache.cpp', - 'MenuStyle_Valve.cpp', - 'logic_bridge.cpp', - 'smn_entities.cpp', - 'sm_stringutil.cpp', - 'MenuVoting.cpp', - 'smn_events.cpp', - 'smn_menus.cpp', - 'sm_trie.cpp', - 'CDataPack.cpp', - 'frame_hooks.cpp', - 'smn_nextmap.cpp', - 'sourcemm_api.cpp', - 'ChatTriggers.cpp', - 'smn_player.cpp', - 'sourcemod.cpp', - 'concmd_cleaner.cpp', - 'HalfLife2.cpp', - 'NextMap.cpp', - 'ConCmdManager.cpp', - 'ConVarManager.cpp', - 'LibrarySys.cpp', - 'PlayerManager.cpp', - 'TimerSys.cpp', - 'CoreConfig.cpp', - 'Logger.cpp', - 'smn_halflife.cpp', - 'smn_console.cpp', - 'UserMessages.cpp', - 'MenuManager.cpp', - 'smn_core.cpp', - 'smn_hudtext.cpp', - 'smn_usermsgs.cpp', - 'MenuStyle_Base.cpp', - 'smn_keyvalues.cpp', - 'smn_vector.cpp', - 'EventManager.cpp', - 'MenuStyle_Radio.cpp', - 'sm_autonatives.cpp', - 'sm_srvcmds.cpp', - 'ConsoleDetours.cpp' - ] - - if i in ['csgo', 'dota']: - files.append('smn_protobuf.cpp') - else: - files.append('smn_bitbuffer.cpp') - - binary.AddSourceFiles('core', files) - - if i == 'csgo': - files = [ - os.path.join('public', 'engine', 'protobuf', 'netmessages.pb.cc'), - os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'), - os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'), - ] - binary.AddSourceFiles(AMBuild.cache[sdk['sdk']], files) - elif i == 'dota': - files = [ - os.path.join('public', 'engine', 'protobuf', 'networkbasetypes.pb.cc'), - os.path.join('public', 'engine', 'protobuf', 'netmessages.pb.cc'), - os.path.join('public', 'game', 'shared', 'protobuf', 'ai_activity.pb.cc'), - os.path.join('public', 'game', 'shared', 'protobuf', 'usermessages.pb.cc'), - os.path.join('public', 'game', 'shared', 'dota', 'protobuf', 'dota_commonmessages.pb.cc'), - os.path.join('public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessages.pb.cc'), - os.path.join('public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessage_helpers.cpp'), - ] - binary.AddSourceFiles(AMBuild.cache[sdk['sdk']], files) - - SM.PostSetupHL2Job(extension, binary, i) - - if i in ['csgo', 'dota']: - if AMBuild.target['platform'] in ['linux', 'darwin']: - binary.AddObjectFiles(['libprotobuf.a']) - - SM.AutoVersion('core', binary) - SM.ExtractDebugInfo(extension, binary) - binary.SendToJob() + SM.binaries += [builder.Add(binary)] diff --git a/core/logic/AMBuilder b/core/logic/AMBuilder index db6f7842..c53e81db 100644 --- a/core/logic/AMBuilder +++ b/core/logic/AMBuilder @@ -1,76 +1,72 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultCompiler() -base = AMBuild.sourceFolder -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'core', 'logic')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'sourcepawn')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'amtl')) -compiler['CDEFINES'].append('SM_DEFAULT_THREADER') -compiler['CDEFINES'].append('SM_LOGIC') - -if AMBuild.target['platform'] == 'linux': - compiler['POSTLINKFLAGS'].append('-lpthread') - compiler['POSTLINKFLAGS'].append('-lrt') -if AMBuild.target['platform'] == 'darwin': - compiler['CFLAGS'].extend(['-Wno-deprecated-declarations']) - compiler['POSTLINKFLAGS'].extend(['-framework', 'CoreServices']) - -extension = AMBuild.AddJob('sourcemod.logic') -binary = Cpp.LibraryBuilder('sourcemod.logic', AMBuild, extension, compiler) -files = [ - 'common_logic.cpp', - 'smn_adt_array.cpp', - 'smn_sorting.cpp', - 'smn_maplists.cpp', - 'ADTFactory.cpp', - 'smn_adt_stack.cpp', - 'thread/ThreadWorker.cpp', - 'thread/BaseWorker.cpp', - 'ThreadSupport.cpp', - 'smn_float.cpp', - 'TextParsers.cpp', - 'smn_textparse.cpp', - 'smn_adt_trie.cpp', - 'Profiler.cpp', - 'smn_functions.cpp', - 'smn_timers.cpp', - 'smn_players.cpp', - 'MemoryUtils.cpp', - 'smn_admin.cpp', - 'smn_banning.cpp', - 'smn_filesystem.cpp', - 'stringutil.cpp', - 'Translator.cpp', - 'PhraseCollection.cpp', - 'smn_lang.cpp', - 'smn_string.cpp', - 'smn_handles.cpp', - 'smn_datapacks.cpp', - 'smn_gameconfigs.cpp', - 'smn_fakenatives.cpp', - 'GameConfigs.cpp', - 'sm_crc32.cpp', - 'smn_profiler.cpp', - 'ShareSys.cpp', - 'PluginSys.cpp', - 'HandleSys.cpp', - 'NativeOwner.cpp', - 'NativeInvoker.cpp', - 'ExtensionSys.cpp', - 'DebugReporter.cpp', - 'Database.cpp', - 'smn_database.cpp', - 'ForwardSys.cpp', - ] -if AMBuild.target['platform'] == 'windows': - files.append('thread/WinThreads.cpp') +binary = SM.Library(builder, 'sourcemod.logic') +binary.compiler.cxxincludes += [ + os.path.join(builder.sourcePath, 'core', 'logic'), + os.path.join(builder.sourcePath, 'public'), + os.path.join(builder.sourcePath, 'public', 'sourcepawn'), + os.path.join(builder.sourcePath, 'public', 'amtl'), + os.path.join(SM.mms_root, 'core', 'sourcehook') +] +binary.compiler.defines += [ + 'SM_DEFAULT_THREADER', + 'SM_LOGIC' +] + +if builder.target_platform is 'linux': + binary.compiler.postlink += ['-lpthread', '-lrt'] +elif builder.target_platform is 'mac': + binary.compiler.cflags += ['-Wno-deprecated-declarations'] + binary.compiler.postlink += ['-framework', 'CoreServices'] +binary.sources += [ + 'common_logic.cpp', + 'smn_adt_array.cpp', + 'smn_sorting.cpp', + 'smn_maplists.cpp', + 'ADTFactory.cpp', + 'smn_adt_stack.cpp', + 'thread/ThreadWorker.cpp', + 'thread/BaseWorker.cpp', + 'ThreadSupport.cpp', + 'smn_float.cpp', + 'TextParsers.cpp', + 'smn_textparse.cpp', + 'smn_adt_trie.cpp', + 'Profiler.cpp', + 'smn_functions.cpp', + 'smn_timers.cpp', + 'smn_players.cpp', + 'MemoryUtils.cpp', + 'smn_admin.cpp', + 'smn_banning.cpp', + 'smn_filesystem.cpp', + 'stringutil.cpp', + 'Translator.cpp', + 'PhraseCollection.cpp', + 'smn_lang.cpp', + 'smn_string.cpp', + 'smn_handles.cpp', + 'smn_datapacks.cpp', + 'smn_gameconfigs.cpp', + 'smn_fakenatives.cpp', + 'GameConfigs.cpp', + 'sm_crc32.cpp', + 'smn_profiler.cpp', + 'ShareSys.cpp', + 'PluginSys.cpp', + 'HandleSys.cpp', + 'NativeOwner.cpp', + 'NativeInvoker.cpp', + 'ExtensionSys.cpp', + 'DebugReporter.cpp', + 'Database.cpp', + 'smn_database.cpp', + 'ForwardSys.cpp', +] +if builder.target_platform is 'windows': + binary.sources += ['thread/WinThreads.cpp'] else: - files.append('thread/PosixThreads.cpp') -binary.AddSourceFiles('core/logic', files) -SM.AutoVersion('core/logic', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() + binary.sources += ['thread/PosixThreads.cpp'] +SM.binaries += [builder.Add(binary)] diff --git a/extensions/bintools/AMBuilder b/extensions/bintools/AMBuilder index 82942e18..5cc38b03 100644 --- a/extensions/bintools/AMBuilder +++ b/extensions/bintools/AMBuilder @@ -1,25 +1,23 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultExtCompiler('extensions/bintools') -compiler['CDEFINES'].append('HOOKING_ENABLED') -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) -compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit')) -compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86')) +binary = SM.ExtLibrary(builder, 'bintools.ext') +binary.compiler.defines += ['HOOKING_ENABLED'] +binary.compiler.cxxincludes += [ + os.path.join(SM.mms_root, 'core', 'sourcehook'), + os.path.join(builder.sourcePath, 'public', 'jit'), + os.path.join(builder.sourcePath, 'public', 'jit', 'x86'), +] -extension = AMBuild.AddJob('bintools.ext') -binary = Cpp.LibraryBuilder('bintools.ext', AMBuild, extension, compiler) -binary.AddSourceFiles('extensions/bintools', [ - 'extension.cpp', - 'CallMaker.cpp', - 'CallWrapper.cpp', - 'HookWrapper.cpp', - 'jit_call.cpp', - 'jit_hook.cpp', - 'sdk/smsdk_ext.cpp' - ]) -SM.AutoVersion('extensions/bintools', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() +binary.sources += [ + 'extension.cpp', + 'CallMaker.cpp', + 'CallWrapper.cpp', + 'HookWrapper.cpp', + 'jit_call.cpp', + 'jit_hook.cpp', + 'sdk/smsdk_ext.cpp' +] +SM.binaries += [builder.Add(binary)] diff --git a/extensions/clientprefs/AMBuilder b/extensions/clientprefs/AMBuilder index 58f7f585..d59818fa 100644 --- a/extensions/clientprefs/AMBuilder +++ b/extensions/clientprefs/AMBuilder @@ -1,20 +1,19 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultExtCompiler('extensions/clientprefs') -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) +binary = SM.ExtLibrary(builder, 'clientprefs.ext') +binary.compiler.cxxincludes += [ + os.path.join(SM.mms_root, 'core', 'sourcehook'), +] -extension = AMBuild.AddJob('clientprefs.ext') -binary = Cpp.LibraryBuilder('clientprefs.ext', AMBuild, extension, compiler) -binary.AddSourceFiles('extensions/clientprefs', [ - 'extension.cpp', - 'cookie.cpp', - 'menus.cpp', - 'natives.cpp', - 'query.cpp', - 'sdk/smsdk_ext.cpp' - ]) -SM.AutoVersion('extensions/clientprefs', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() +binary.sources += [ + 'extension.cpp', + 'cookie.cpp', + 'menus.cpp', + 'natives.cpp', + 'query.cpp', + 'sdk/smsdk_ext.cpp' +] + +SM.binaries += [builder.Add(binary)] diff --git a/extensions/cstrike/AMBuilder b/extensions/cstrike/AMBuilder index 65358b60..f9d0c866 100644 --- a/extensions/cstrike/AMBuilder +++ b/extensions/cstrike/AMBuilder @@ -1,33 +1,21 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -for i in SM.sdkInfo: - if i != 'css' and i != 'csgo': - continue - - sdk = SM.sdkInfo[i] - - if AMBuild.target['platform'] not in sdk['platform']: - continue - - compiler = SM.DefaultHL2Compiler('extensions/cstrike', i) - - name = 'game.cstrike.ext.' + sdk['ext'] - extension = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) - SM.PreSetupHL2Job(extension, binary, i) - binary.AddSourceFiles('extensions/cstrike', [ - 'extension.cpp', - 'natives.cpp', - 'RegNatives.cpp', - 'timeleft.cpp', - 'forwards.cpp', - 'util_cstrike.cpp', - 'sdk/smsdk_ext.cpp', - 'CDetour/detours.cpp', - 'asm/asm.c' - ]) - SM.PostSetupHL2Job(extension, binary, i) - SM.AutoVersion('extensions/cstrike', binary) - SM.ExtractDebugInfo(extension, binary) - binary.SendToJob() \ No newline at end of file +for sdk_name in ['css', 'csgo']: + if sdk_name not in SM.sdks: + continue + sdk = SM.sdks[sdk_name] + + binary = SM.HL2Library(builder, 'game.cstrike.ext.' + sdk.ext, sdk) + binary.sources += [ + 'extension.cpp', + 'natives.cpp', + 'RegNatives.cpp', + 'timeleft.cpp', + 'forwards.cpp', + 'util_cstrike.cpp', + 'sdk/smsdk_ext.cpp', + 'CDetour/detours.cpp', + 'asm/asm.c' + ] + SM.binaries += [builder.Add(binary)] diff --git a/extensions/geoip/AMBuilder b/extensions/geoip/AMBuilder index d94df53f..fc43b384 100644 --- a/extensions/geoip/AMBuilder +++ b/extensions/geoip/AMBuilder @@ -1,16 +1,15 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: -compiler = SM.DefaultExtCompiler('extensions/geoip') +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: +import os -extension = AMBuild.AddJob('geoip.ext') -binary = Cpp.LibraryBuilder('geoip.ext', AMBuild, extension, compiler) -binary.AddSourceFiles('extensions/geoip', [ - 'extension.cpp', - 'GeoIP.c', - 'sdk/smsdk_ext.cpp' - ]) -if AMBuild.target['platform'] == 'windows': - binary['POSTLINKFLAGS'].append('wsock32.lib') -SM.AutoVersion('extensions/geoip', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() +binary = SM.ExtLibrary(builder, 'geoip.ext') +if builder.target_platform is 'windows': + binary.compiler.postlink += ['wsock32.lib'] + +binary.sources += [ + 'extension.cpp', + 'GeoIP.c', + 'sdk/smsdk_ext.cpp' +] + +SM.binaries += [builder.Add(binary)] diff --git a/extensions/mysql/AMBuilder b/extensions/mysql/AMBuilder index a623cba2..ec66d457 100644 --- a/extensions/mysql/AMBuilder +++ b/extensions/mysql/AMBuilder @@ -1,39 +1,35 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultExtCompiler('extensions/mysql') -compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['MYSQL5'], 'include')) -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) +if SM.mysql_root: + binary = SM.ExtLibrary(builder, 'dbi.mysql.ext') + binary.compiler.cxxincludes += [ + os.path.join(SM.mysql_root, 'include'), + os.path.join(SM.mms_root, 'core', 'sourcehook') + ] -extension = AMBuild.AddJob('dbi.mysql.ext') -binary = Cpp.LibraryBuilder('dbi.mysql.ext', AMBuild, extension, compiler) + if builder.target_platform is 'linux' or builder.target_platform is 'darwin': + binary.compiler.postlink += [ + os.path.join(SM.mysql_root, 'lib', 'libmysqlclient_r.a'), + '-lz', + '-lpthread', + '-lm' + ] + elif builder.target_platform is 'windows': + binary.compiler.postlink += [ + os.path.join(SM.mysql_root, 'lib', 'opt', 'mysqlclient.lib'), + os.path.join(SM.mysql_root, 'lib', 'opt', 'zlib.lib'), + 'wsock32.lib' + ] -if AMBuild.target['platform'] == 'linux' or AMBuild.target['platform'] == 'darwin': - lib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'libmysqlclient_r.a') - link = [lib, - '-lz', - '-lpthread', - '-lm'] - binary.RelinkIfNewer(lib) - binary['POSTLINKFLAGS'].extend(link) -elif AMBuild.target['platform'] == 'windows': - mylib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'mysqlclient.lib') - zlib = os.path.join(AMBuild.cache['MYSQL5'], 'lib', 'opt', 'zlib.lib') - binary.RelinkIfNewer(mylib) - binary.RelinkIfNewer(zlib) - binary['POSTLINKFLAGS'].extend([mylib, zlib, 'wsock32.lib']) - - -binary.AddSourceFiles('extensions/mysql', [ - 'sdk/smsdk_ext.cpp', - 'mysql/MyBasicResults.cpp', - 'mysql/MyBoundResults.cpp', - 'mysql/MyDatabase.cpp', - 'mysql/MyDriver.cpp', - 'mysql/MyStatement.cpp', - 'extension.cpp' - ]) -SM.AutoVersion('extensions/mysql', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() + binary.sources += [ + 'sdk/smsdk_ext.cpp', + 'mysql/MyBasicResults.cpp', + 'mysql/MyBoundResults.cpp', + 'mysql/MyDatabase.cpp', + 'mysql/MyDriver.cpp', + 'mysql/MyStatement.cpp', + 'extension.cpp' + ] + SM.binaries += [builder.Add(binary)] diff --git a/extensions/regex/AMBuilder b/extensions/regex/AMBuilder index fda4c1db..66100025 100644 --- a/extensions/regex/AMBuilder +++ b/extensions/regex/AMBuilder @@ -1,28 +1,24 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultExtCompiler('extensions/regex') -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) +binary = SM.ExtLibrary(builder, 'regex.ext') +binary.compiler.cxxincludes += [ + os.path.join(SM.mms_root, 'core', 'sourcehook'), +] -extension = AMBuild.AddJob('regex.ext') -binary = Cpp.LibraryBuilder('regex.ext', AMBuild, extension, compiler) +if builder.target_platform is 'linux': + path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_linux', 'libpcre.a') +elif builder.target_platform is 'windows': + path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_win', 'pcre.lib') +elif builder.target_platform is 'mac': + path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_darwin', 'libpcre.a') +binary.compiler.postlink += [binary.Dep(path)] -if AMBuild.target['platform'] == 'linux': - path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_linux', 'libpcre.a') -elif AMBuild.target['platform'] == 'windows': - path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_win', 'pcre.lib') -elif AMBuild.target['platform'] == 'darwin': - path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_darwin', 'libpcre.a') +binary.sources += [ + 'extension.cpp', + 'CRegEx.cpp', + 'sdk/smsdk_ext.cpp', +] -binary.RelinkIfNewer(path) -binary['POSTLINKFLAGS'].append(path) - -binary.AddSourceFiles('extensions/regex', [ - 'extension.cpp', - 'CRegEx.cpp', - 'sdk/smsdk_ext.cpp', - ]) -SM.AutoVersion('extensions/regex', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() +SM.binaries += [builder.Add(binary)] diff --git a/extensions/sdkhooks/AMBuilder b/extensions/sdkhooks/AMBuilder index d2edbf43..bc3d48a5 100644 --- a/extensions/sdkhooks/AMBuilder +++ b/extensions/sdkhooks/AMBuilder @@ -1,30 +1,21 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -for i in SM.sdkInfo: - sdk = SM.sdkInfo[i] - if AMBuild.target['platform'] not in sdk['platform']: - continue - - compiler = SM.DefaultHL2Compiler('extensions/sdkhooks', i) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'game', 'shared')) - - if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang': - compiler['CXXFLAGS'].append('-Wno-invalid-offsetof') - - name = 'sdkhooks.ext.' + sdk['ext'] - extension = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) - SM.PreSetupHL2Job(extension, binary, i) - binary.AddSourceFiles('extensions/sdkhooks', [ - 'extension.cpp', - 'natives.cpp', - 'takedamageinfohack.cpp', - 'util.cpp', - 'sdk/smsdk_ext.cpp', - ]) - SM.PostSetupHL2Job(extension, binary, i) - SM.AutoVersion('extensions/sdkhooks', binary) - SM.ExtractDebugInfo(extension, binary) - binary.SendToJob() +for sdk_name in SM.sdks: + sdk = SM.sdks[sdk_name] + + binary = SM.HL2Library(builder, 'sdkhooks.ext.' + sdk.ext, sdk) + binary.compiler.cxxincludes += [ + os.path.join(sdk.path, 'game', 'shared') + ] + if binary.compiler.cxx.behavior is 'gcc': + binary.compiler.cxxflags += ['-Wno-invalid-offsetof'] + binary.sources += [ + 'extension.cpp', + 'natives.cpp', + 'takedamageinfohack.cpp', + 'util.cpp', + 'sdk/smsdk_ext.cpp', + ] + SM.binaries += [builder.Add(binary)] diff --git a/extensions/sdktools/AMBuilder b/extensions/sdktools/AMBuilder index 72ad3f4b..28fe8166 100644 --- a/extensions/sdktools/AMBuilder +++ b/extensions/sdktools/AMBuilder @@ -1,52 +1,45 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -for i in SM.sdkInfo: - sdk = SM.sdkInfo[i] - if AMBuild.target['platform'] not in sdk['platform']: - continue +for sdk_name in SM.sdks: + sdk = SM.sdks[sdk_name] - compiler = SM.DefaultHL2Compiler('extensions/sdktools', i) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86')) + binary = SM.HL2Library(builder, 'sdktools.ext.' + sdk.ext, sdk) + binary.compiler.cxxincludes += [ + os.path.join(sdk.path, 'game', 'shared'), + os.path.join(builder.sourcePath, 'public', 'jit'), + os.path.join(builder.sourcePath, 'public', 'jit', 'x86'), + ] - if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang': - compiler['CXXFLAGS'].append('-Wno-invalid-offsetof') + if sdk.name != 'ep1': + binary.compiler.defines += ['HOOKING_ENABLED'] - if i != 'ep1': - compiler['CDEFINES'].append('HOOKING_ENABLED') - - name = 'sdktools.ext.' + sdk['ext'] - extension = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) - SM.PreSetupHL2Job(extension, binary, i) - binary.AddSourceFiles('extensions/sdktools', [ - 'extension.cpp', - 'inputnatives.cpp', - 'output.cpp', - 'outputnatives.cpp', - 'tempents.cpp', - 'tenatives.cpp', - 'teamnatives.cpp', - 'trnatives.cpp', - 'vcaller.cpp', - 'vcallbuilder.cpp', - 'vdecoder.cpp', - 'vglobals.cpp', - 'vhelpers.cpp', - 'vnatives.cpp', - 'voice.cpp', - 'vsound.cpp', - 'clientnatives.cpp', - 'hooks.cpp', - 'gamerulesnatives.cpp', - 'vstringtable.cpp', - 'CDetour/detours.cpp', - 'sdk/smsdk_ext.cpp', - 'asm/asm.c' - ]) - SM.PostSetupHL2Job(extension, binary, i) - SM.AutoVersion('extensions/sdktools', binary) - SM.ExtractDebugInfo(extension, binary) - binary.SendToJob() + if binary.compiler.cxx.behavior is 'gcc': + binary.compiler.cxxflags += ['-Wno-invalid-offsetof'] + binary.sources += [ + 'extension.cpp', + 'inputnatives.cpp', + 'output.cpp', + 'outputnatives.cpp', + 'tempents.cpp', + 'tenatives.cpp', + 'teamnatives.cpp', + 'trnatives.cpp', + 'vcaller.cpp', + 'vcallbuilder.cpp', + 'vdecoder.cpp', + 'vglobals.cpp', + 'vhelpers.cpp', + 'vnatives.cpp', + 'voice.cpp', + 'vsound.cpp', + 'clientnatives.cpp', + 'hooks.cpp', + 'gamerulesnatives.cpp', + 'vstringtable.cpp', + 'CDetour/detours.cpp', + 'sdk/smsdk_ext.cpp', + 'asm/asm.c' + ] + SM.binaries += [builder.Add(binary)] diff --git a/extensions/sqlite/AMBuilder b/extensions/sqlite/AMBuilder index 01b34af2..37816f97 100644 --- a/extensions/sqlite/AMBuilder +++ b/extensions/sqlite/AMBuilder @@ -1,22 +1,28 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultExtCompiler('extensions/sqlite') -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) +binary = SM.ExtLibrary(builder, 'dbi.sqlite.ext') +binary.compiler.cxxincludes += [ + os.path.join(SM.mms_root, 'core', 'sourcehook'), +] -compiler['CDEFINES'].extend(['SQLITE_OMIT_LOAD_EXTENSION', 'SQLITE_THREADSAFE']) -if AMBuild.target['platform'] == 'linux': - compiler['POSTLINKFLAGS'].extend(['-ldl', '-lpthread']) +binary.compiler.defines += [ + 'SQLITE_OMIT_LOAD_EXTENSION', + 'SQLITE_THREADSAFE' +] +if builder.target_platform is 'linux': + binary.compiler.postlink += ['-ldl', '-lpthread'] -extension = AMBuild.AddJob('dbi.sqlite.ext') -binary = Cpp.LibraryBuilder('dbi.sqlite.ext', AMBuild, extension, compiler) -files = [ - 'sdk/smsdk_ext.cpp', 'sdk/sm_memtable.cpp', 'extension.cpp', - 'driver/SqDatabase.cpp', 'driver/SqDriver.cpp', 'driver/SqQuery.cpp', - 'driver/SqResults.cpp', 'sqlite-source/sqlite3.c' - ] -binary.AddSourceFiles('extensions/sqlite', files) -SM.AutoVersion('extensions/sqlite', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() +binary.sources += [ + 'sdk/smsdk_ext.cpp', + 'sdk/sm_memtable.cpp', + 'extension.cpp', + 'driver/SqDatabase.cpp', + 'driver/SqDriver.cpp', + 'driver/SqQuery.cpp', + 'driver/SqResults.cpp', + 'sqlite-source/sqlite3.c' +] + +SM.binaries += [builder.Add(binary)] diff --git a/extensions/tf2/AMBuilder b/extensions/tf2/AMBuilder index 24b5c03c..6a15541d 100644 --- a/extensions/tf2/AMBuilder +++ b/extensions/tf2/AMBuilder @@ -1,14 +1,11 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -if 'tf2' in SM.sdkInfo: - sdk = SM.sdkInfo['tf2'] - compiler = SM.DefaultHL2Compiler('extensions/tf2', 'tf2') - name = 'game.tf2.ext.' + sdk['ext'] - extension = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) - SM.PreSetupHL2Job(extension, binary, 'tf2') - binary.AddSourceFiles('extensions/tf2', [ +if 'tf2' in SM.sdks: + sdk = SM.sdks['tf2'] + + binary = SM.HL2Library(builder, 'game.tf2.ext.' + sdk.ext, sdk) + binary.sources += [ 'extension.cpp', 'natives.cpp', 'RegNatives.cpp', @@ -21,9 +18,5 @@ if 'tf2' in SM.sdkInfo: 'CDetour/detours.cpp', 'sdk/smsdk_ext.cpp', 'asm/asm.c' - ]) - SM.PostSetupHL2Job(extension, binary, 'tf2') - SM.AutoVersion('extensions/tf2', binary) - SM.ExtractDebugInfo(extension, binary) - binary.SendToJob() - + ] + SM.binaries += [builder.Add(binary)] diff --git a/extensions/topmenus/AMBuilder b/extensions/topmenus/AMBuilder index 9a7fd54b..28fef1ff 100644 --- a/extensions/topmenus/AMBuilder +++ b/extensions/topmenus/AMBuilder @@ -1,20 +1,19 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultExtCompiler('extensions/topmenus') -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) +binary = SM.ExtLibrary(builder, 'topmenus.ext') +binary.compiler.cxxincludes += [ + os.path.join(SM.mms_root, 'core', 'sourcehook'), +] -extension = AMBuild.AddJob('topmenus.ext') -binary = Cpp.LibraryBuilder('topmenus.ext', AMBuild, extension, compiler) -binary.AddSourceFiles('extensions/topmenus', [ - 'extension.cpp', - 'smn_topmenus.cpp', - 'TopMenu.cpp', - 'TopMenuManager.cpp', - 'sdk/smsdk_ext.cpp', - 'sdk/sm_memtable.cpp' - ]) -SM.AutoVersion('extensions/topmenus', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() +binary.sources += [ + 'extension.cpp', + 'smn_topmenus.cpp', + 'TopMenu.cpp', + 'TopMenuManager.cpp', + 'sdk/smsdk_ext.cpp', + 'sdk/sm_memtable.cpp' +] + +SM.binaries += [builder.Add(binary)] diff --git a/extensions/updater/AMBuilder b/extensions/updater/AMBuilder index c563edf7..75451fab 100644 --- a/extensions/updater/AMBuilder +++ b/extensions/updater/AMBuilder @@ -1,19 +1,19 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultExtCompiler('extensions/updater') -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) +binary = SM.ExtLibrary(builder, 'updater.ext') +binary.compiler.cxxincludes += [ + os.path.join(SM.mms_root, 'core', 'sourcehook'), +] + +binary.sources += [ + 'extension.cpp', + 'MemoryDownloader.cpp', + 'Updater.cpp', + 'md5.cpp', + 'sdk/smsdk_ext.cpp' +] + +SM.binaries += [builder.Add(binary)] -extension = AMBuild.AddJob('updater.ext') -binary = Cpp.LibraryBuilder('updater.ext', AMBuild, extension, compiler) -binary.AddSourceFiles('extensions/updater', [ - 'extension.cpp', - 'MemoryDownloader.cpp', - 'Updater.cpp', - 'md5.cpp', - 'sdk/smsdk_ext.cpp' - ]) -SM.AutoVersion('extensions/updater', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() diff --git a/loader/AMBuilder b/loader/AMBuilder index f77d0347..419a4c22 100644 --- a/loader/AMBuilder +++ b/loader/AMBuilder @@ -1,22 +1,22 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os.path -compiler = SM.DefaultCompiler() -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core')) -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) +if builder.target_platform in ['windows', 'mac']: + name = 'sourcemod_mm' + extra_ldflags = [] +elif builder.target_platform is 'linux': + name = 'sourcemod_mm_i486' + extra_ldflags = ['-ldl'] -if AMBuild.target['platform'] == 'windows' or AMBuild.target['platform'] == 'darwin': - name = 'sourcemod_mm' -elif AMBuild.target['platform'] == 'linux': - name = 'sourcemod_mm_i486' - compiler['POSTLINKFLAGS'].extend(['-ldl']) - -loader = AMBuild.AddJob('loader') -binary = Cpp.LibraryBuilder(name, AMBuild, loader, compiler) -binary.AddSourceFiles('loader', [ - 'loader.cpp' - ]) -SM.AutoVersion('loader', binary) -SM.ExtractDebugInfo(loader, binary) -binary.SendToJob() +binary = SM.Library(builder, name) +binary.compiler.cxxincludes += [ + os.path.join(SM.mms_root, 'core'), + os.path.join(SM.mms_root, 'sourcehook') +] +binary.compiler.linkflags += extra_ldflags +binary.sources = [ + 'loader.cpp' +] +nodes = builder.Add(binary) +SM.binaries += [nodes] diff --git a/sourcepawn/compiler/AMBuilder b/sourcepawn/compiler/AMBuilder index dac2bab9..d972483e 100644 --- a/sourcepawn/compiler/AMBuilder +++ b/sourcepawn/compiler/AMBuilder @@ -1,72 +1,75 @@ # vim: set ts=2 sw=2 tw=99 noet ft=python: import os -compiler = SM.DefaultCompiler() -compiler['CINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public')) -compiler['CINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'sourcepawn')) -compiler['CINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'sourcepawn', 'compiler')) -compiler['CINCLUDES'].append(os.path.join(AMBuild.outputFolder, 'includes')) - -if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang': - compiler['CFLAGS'].append('-Wno-format') - if AMBuild.target['platform'] == 'linux': - compiler['POSTLINKFLAGS'].extend(['-lgcc', '-lm']) -elif compiler.cc.name == 'msvc': - compiler['POSTLINKFLAGS'].remove('/SUBSYSTEM:WINDOWS') - compiler['POSTLINKFLAGS'].append('/SUBSYSTEM:CONSOLE') - -if AMBuild.target['platform'] == 'linux': - compiler['CDEFINES'].extend(['LINUX', 'HAVE_STDINT_H', 'AMX_ANSIONLY', 'ENABLE_BINRELOC', '_GNU_SOURCE']) -elif AMBuild.target['platform'] == 'darwin': - compiler['CDEFINES'].extend(['DARWIN', 'HAVE_STDINT_H', 'AMX_ANSIONLY', 'ENABLE_BINRELOC', 'HAVE_SAFESTR']) - -extension = AMBuild.AddJob('spcomp') -binary = Cpp.ExecutableBuilder('spcomp', AMBuild, extension, compiler) -files = [ - 'libpawnc.c', - 'lstring.c', - 'memfile.c', - 'pawncc.c', - 'sc1.c', - 'sc2.c', - 'sc3.c', - 'sc4.c', - 'sc5.c', - 'sc6.c', - 'sc7.c', - 'scexpand.c', - 'sci18n.c', - 'sclist.c', - 'scmemfil.c', - 'scstate.c', - 'sctracker.c', - 'scvars.c', - 'sp_file.c', - 'zlib/adler32.c', - 'zlib/compress.c', - 'zlib/crc32.c', - 'zlib/deflate.c', - 'zlib/gzio.c', - 'zlib/infback.c', - 'zlib/inffast.c', - 'zlib/inflate.c', - 'zlib/inftrees.c', - 'zlib/trees.c', - 'zlib/uncompr.c', - 'zlib/zutil.c', - 'sp_symhash.c' - ] -if AMBuild.target['platform'] == 'linux': - files.append('binreloc.c') -binary.AddSourceFiles('sourcepawn/compiler', files) - -if AMBuild.target['platform'] == 'windows': - env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']} - binary.AddResourceFile('sourcepawn/compiler/libpawnc.rc', env) -elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder): - binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0']) - binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']]) - -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() - +binary = SM.Program(builder, 'spcomp') +compiler = binary.compiler +compiler.includes += [ + os.path.join(builder.sourcePath, 'public'), + os.path.join(builder.sourcePath, 'public', 'sourcepawn'), + os.path.join(builder.sourcePath, 'sourcepawn', 'compiler'), + os.path.join(builder.buildPath, 'includes'), +] + +if compiler.cc.behavior is 'gcc': + compiler.cflags += ['-Wno-format'] + if builder.target_platform is 'linux': + compiler.postlink += ['-lgcc', '-lm'] +elif compiler.cc.behavior is 'msvc': + compiler.linkflags.remove('/SUBSYSTEM:WINDOWS') + compiler.linkflags.append('/SUBSYSTEM:CONSOLE') + +if builder.target_platform is 'linux': + compiler.defines += [ + 'LINUX', + 'HAVE_STDINT_H', + 'AMX_ANSIONLY', + 'ENABLE_BINRELOC', + '_GNU_SOURCE' + ] +elif builder.target_platform is 'mac': + compiler.defines += [ + 'DARWIN', + 'HAVE_STDINT_H', + 'AMX_ANSIONLY', + 'ENABLE_BINRELOC', + 'HAVE_SAFESTR' + ] + +binary.sources += [ + 'libpawnc.c', + 'lstring.c', + 'memfile.c', + 'pawncc.c', + 'sc1.c', + 'sc2.c', + 'sc3.c', + 'sc4.c', + 'sc5.c', + 'sc6.c', + 'sc7.c', + 'scexpand.c', + 'sci18n.c', + 'sclist.c', + 'scmemfil.c', + 'scstate.c', + 'sctracker.c', + 'scvars.c', + 'sp_file.c', + 'zlib/adler32.c', + 'zlib/compress.c', + 'zlib/crc32.c', + 'zlib/deflate.c', + 'zlib/gzio.c', + 'zlib/infback.c', + 'zlib/inffast.c', + 'zlib/inflate.c', + 'zlib/inftrees.c', + 'zlib/trees.c', + 'zlib/uncompr.c', + 'zlib/zutil.c', + 'sp_symhash.c' +] +if builder.target_platform is 'linux': + binary.sources.append('binreloc.c') + +SM.binaries += [builder.Add(binary)] diff --git a/sourcepawn/jit/AMBuilder b/sourcepawn/jit/AMBuilder index 311ed4bb..b5107edc 100644 --- a/sourcepawn/jit/AMBuilder +++ b/sourcepawn/jit/AMBuilder @@ -1,56 +1,50 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os -compiler = SM.DefaultCompiler() -base = AMBuild.sourceFolder -compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'sourcepawn', 'jit')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'sourcepawn', 'jit', 'x86')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'sourcepawn')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'amtl')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'jit')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'jit', 'x86')) -compiler['CXXINCLUDES'].append(os.path.join(base, 'knight', 'shared')) +binary = SM.Library(builder, 'sourcepawn.jit.x86') +binary.compiler.includes += [ + os.path.join(SM.mms_root, 'core', 'sourcehook'), + os.path.join(builder.sourcePath, 'sourcepawn', 'jit'), + os.path.join(builder.sourcePath, 'sourcepawn', 'jit', 'x86'), + os.path.join(builder.sourcePath, 'public'), + os.path.join(builder.sourcePath, 'public', 'sourcepawn'), + os.path.join(builder.sourcePath, 'public', 'amtl'), + os.path.join(builder.sourcePath, 'public', 'jit'), + os.path.join(builder.sourcePath, 'public', 'jit', 'x86'), + os.path.join(builder.sourcePath, 'knight', 'shared'), +] -if AMBuild.target['platform'] == 'linux': - compiler['POSTLINKFLAGS'].append('-lpthread') - compiler['POSTLINKFLAGS'].append('-lrt') -if AMBuild.target['platform'] == 'darwin': - compiler['POSTLINKFLAGS'].append('-lpthread') - compiler['POSTLINKFLAGS'].append('-ldl') - -extension = AMBuild.AddJob('sourcepawn.jit.x86') -binary = Cpp.LibraryBuilder('sourcepawn.jit.x86', AMBuild, extension, compiler) -binary.AddSourceFiles('sourcepawn/jit', [ - 'BaseRuntime.cpp', - 'engine2.cpp', - 'dll_exports.cpp', - 'jit_function.cpp', - 'sp_vm_basecontext.cpp', - 'sp_vm_engine.cpp', - 'sp_vm_function.cpp', - 'opcodes.cpp', - 'interpreter.cpp', - 'watchdog_timer.cpp', - 'x86/jit_x86.cpp', - 'zlib/adler32.c', - 'zlib/compress.c', - 'zlib/crc32.c', - 'zlib/deflate.c', - 'zlib/gzio.c', - 'zlib/infback.c', - 'zlib/inffast.c', - 'zlib/inflate.c', - 'zlib/inftrees.c', - 'zlib/trees.c', - 'zlib/uncompr.c', - 'zlib/zutil.c', - 'md5/md5.cpp', - '../../knight/shared/KeCodeAllocator.cpp', - '../../public/jit/x86/assembler-x86.cpp' - ]) -SM.AutoVersion('sourcepawn/jit', binary) -SM.ExtractDebugInfo(extension, binary) -binary.SendToJob() +if builder.target_platform is 'linux': + binary.compiler.postlink += ['-lpthread', '-lrt'] +elif builder.target_platform is 'darwin': + binary.compiler.postlink += ['-lpthread', '-ldl'] +binary.sources += [ + 'BaseRuntime.cpp', + 'engine2.cpp', + 'dll_exports.cpp', + 'jit_function.cpp', + 'sp_vm_basecontext.cpp', + 'sp_vm_engine.cpp', + 'sp_vm_function.cpp', + 'opcodes.cpp', + 'interpreter.cpp', + 'watchdog_timer.cpp', + 'x86/jit_x86.cpp', + 'zlib/adler32.c', + 'zlib/compress.c', + 'zlib/crc32.c', + 'zlib/deflate.c', + 'zlib/gzio.c', + 'zlib/infback.c', + 'zlib/inffast.c', + 'zlib/inflate.c', + 'zlib/inftrees.c', + 'zlib/trees.c', + 'zlib/uncompr.c', + 'zlib/zutil.c', + 'md5/md5.cpp', + '../../knight/shared/KeCodeAllocator.cpp', + '../../public/jit/x86/assembler-x86.cpp', +] +SM.binaries += [builder.Add(binary)]