From e9a426ca46a4d799902164c4a140e4a7d1f48fa4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 18 Nov 2013 09:46:46 -0800 Subject: [PATCH] Upgrade build scripts to AMBuild 2 (bug 5970, r=ds). --- AMBuildScript | 804 ++++++++++++--------------- configure.py | 19 +- core-legacy/AMBuilder | 47 +- core/AMBuilder | 59 +- loader/AMBuilder | 43 +- support/buildbot/PackageScript | 119 +--- support/buildbot/Versioning | 75 +-- support/buildbot/bootstrap.pl | 24 +- support/buildbot/generate_headers.py | 45 ++ support/buildbot/startbuild.pl | 6 +- 10 files changed, 525 insertions(+), 716 deletions(-) create mode 100644 support/buildbot/generate_headers.py diff --git a/AMBuildScript b/AMBuildScript index 3786767..756c3b1 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -1,450 +1,370 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: -import os -import sys -from ambuild.command import SymlinkCommand +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: +import os, sys -class MMS: - def __init__(self): - self.compiler = Cpp.Compiler() +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 - #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) +WinOnly = ['windows'] +WinLinux = ['windows', 'linux'] +WinLinuxMac = ['windows', 'linux', 'mac'] - #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') - 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', '-m32') - self.compiler.AddToListVar('POSTLINKFLAGS', '-m32') - self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions') - self.compiler.AddToListVar('CXXFLAGS', '-fno-rtti') - 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('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 == 'gcc' or self.vendor == 'clang': - self.compiler.AddToListVar('CFLAGS', '-g3') - elif 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', 'MMS_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'] - - 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')) - - def DefaultCompiler(self): - compiler = self.compiler.Clone() - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public')) - return compiler - - 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 AutoVersion(self, folder, binary): - if AMBuild.target['platform'] == 'windows': - env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'MMS_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 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', 'libvstdlib_srv.so', 'libtier0_srv.so'] - elif sdk in ['l4d', 'nd', 'blade', 'insurgency', 'csgo']: - libs = ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so'] - if sdk in ['blade', 'insurgency', 'csgo']: - libs.insert(0, 'interfaces_i486.a') - elif sdk == 'sdk2013': - libs = ['tier1.a', 'libvstdlib_srv.so', 'libtier0_srv.so'] - else: - libs = ['tier1_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', 'libvstdlib.dylib', 'libtier0.dylib'] - else: - staticLibs = os.path.join(sdkPath, 'lib', 'mac') - libs = ['tier1_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'] - 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']) - else: - builder.AddObjectFiles(['tier1_i486.a']) - - if( sdk in ['blade', 'insurgency', 'csgo', 'dota'] ): - builder.AddObjectFiles(['interfaces_i486.a']) - - def DefaultHL2Compiler(self, path, sdk, noLink = False): - compiler = self.DefaultCompiler() - - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path)) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, path, 'sourcehook')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'loader')) - - 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(['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 - -mms = MMS() -globals = { - 'MMS': mms +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('support', '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-legacy', 'AMBuilder'], - ['support', 'buildbot', 'PackageScript'] - ] +class MMSConfig(object): + def __init__(self): + self.sdks = {} + self.binaries = [] + self.generated_headers = None -for parts in FileList: - AMBuild.Include(os.path.join(*parts), globals) + 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_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: + 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.') + + def configure(self): + cfg = builder.DetectCompilers() + cxx = cfg.cxx + + if cxx.behavior == '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', + ] + if (cxx.name == 'gcc' and cxx.majorVersion >= 4) or cxx.name == 'clang': + cfg.cflags += ['-fvisibility=hidden'] + cfg.cxxflags += ['-fvisibility-inlines-hidden'] + cfg.linkflags += ['-m32'] + cfg.cxxflags += [ + '-fno-exceptions', + '-fno-rtti', + '-fno-threadsafe-statics', + '-Wno-non-virtual-dtor', + '-Wno-overloaded-virtual', + ] + if (cxx.name == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 7) or \ + (cxx.name == 'clang' and cxx.majorVersion >= 3): + cfg.cxxflags += ['-Wno-delete-non-virtual-dtor'] + if cxx.name == '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', + ] + cfg.cflags += [ + '/W3', + '/Zi', + ] + cfg.cxxflags += ['/TP'] + cfg.linkflags += [ + '/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 += ['MMS_GENERATED_BUILD'] + cfg.includes += [os.path.join(builder.buildPath, 'includes')] + cfg.cxxincludes += [os.path.join(builder.sourcePath, 'public')] + + def HL2Compiler(self, context, sdk): + compiler = context.compiler.clone() + compiler.cxxincludes += [ + os.path.join(context.currentSourcePath), + os.path.join(context.currentSourcePath, 'sourcehook'), + os.path.join(context.sourcePath, 'loader'), + ] + + defines = ['SE_' + self.sdks[i].define + '=' + self.sdks[i].code for i in self.sdks] + 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(['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)] + + compiler.sourcedeps += MMS.generated_headers + + return compiler + + def LibraryBuilder(self, compiler, name): + binary = compiler.Library(name) + if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + binary.compiler.rcdefines += [ + 'BINARY_NAME="{0}"'.format(binary.outputFile), + 'MMS_GENERATED_BUILD' + ] + elif builder.target_platform == 'mac': + binary.compiler.postlink += [ + '-compatibility_version', '1.0.0', + '-current_version', self.productVersion + ] + return binary + + def Library(self, context, name): + compiler = context.compiler.clone() + return self.LibraryBuilder(compiler, name) + + def HL2Library(self, context, name, sdk): + compiler = self.HL2Compiler(context, sdk) + + if builder.target_platform == 'linux': + if sdk.name == 'ep1': + lib_folder = os.path.join(sdk.path, 'linux_sdk') + elif sdk.name == '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 == '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 == '2013': + compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1.a'))] + else: + compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1_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'] + 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 + +MMS = MMSConfig() +MMS.detectProductVersion() +MMS.detectSDKs() +MMS.configure() + +MMS.generated_headers = builder.RunScript( + 'support/buildbot/Versioning', + { 'MMS': MMS } +) + +builder.RunBuildScripts( + [ + 'loader/AMBuilder', + 'core-legacy/AMBuilder', + 'core/AMBuilder', + 'support/buildbot/PackageScript', + ], + { + 'MMS': MMS + } +) diff --git a/configure.py b/configure.py index 5ae950a..9872273 100644 --- a/configure.py +++ b/configure.py @@ -1,8 +1,19 @@ -# vim: set ts=2 sw=2 tw=99 noet: +# vim: set sts=2 ts=8 sw=2 tw=99 et: 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', @@ -10,4 +21,4 @@ run.options.add_option('--enable-optimize', action='store_const', const='1', des 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-legacy/AMBuilder b/core-legacy/AMBuilder index 2e632a0..3a2fcdc 100644 --- a/core-legacy/AMBuilder +++ b/core-legacy/AMBuilder @@ -1,31 +1,20 @@ -# 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 -try: - sdk = MMS.sdkInfo['ep1'] - - if AMBuild.target['platform'] in sdk['platform']: - compiler = MMS.DefaultHL2Compiler('core-legacy', 'ep1') - - name = 'metamod.' + sdk['ext'] - - extension = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) - MMS.PreSetupHL2Job(extension, binary, 'ep1') - files = [ - 'sourcemm.cpp', - 'concommands.cpp', - 'oslink.cpp', - 'util.cpp', - 'CSmmAPI.cpp', - 'CPlugin.cpp', - 'gamedll_bridge.cpp', - 'vsp_bridge.cpp', - 'sourcehook/sourcehook.cpp' - ] - binary.AddSourceFiles('core-legacy', files) - MMS.PostSetupHL2Job(extension, binary, 'ep1') - MMS.AutoVersion('core-legacy', binary) - binary.SendToJob() -except KeyError: - pass +if 'ep1' in MMS.sdks: + sdk = MMS.sdks['ep1'] + name = 'metamod.' + sdk.ext + binary = MMS.HL2Library(builder, name, sdk) + binary.sources += [ + 'sourcemm.cpp', + 'concommands.cpp', + 'oslink.cpp', + 'util.cpp', + 'CSmmAPI.cpp', + 'CPlugin.cpp', + 'gamedll_bridge.cpp', + 'vsp_bridge.cpp', + 'sourcehook/sourcehook.cpp', + ] + nodes = builder.Add(binary) + MMS.binaries += [nodes] diff --git a/core/AMBuilder b/core/AMBuilder index be83383..454f7f4 100644 --- a/core/AMBuilder +++ b/core/AMBuilder @@ -1,37 +1,30 @@ -# 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 MMS.sdkInfo: - sdk = MMS.sdkInfo[i] - if AMBuild.target['platform'] not in sdk['platform'] or i == 'ep1': - continue +for sdk_name in MMS.sdks: + sdk = MMS.sdks[sdk_name] + if sdk.name == 'ep1': + continue - name = 'metamod.' + sdk['ext'] - - compiler = MMS.DefaultHL2Compiler('core', i) - - extension = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler) - MMS.PreSetupHL2Job(extension, binary, i) - files = [ - 'metamod.cpp', - 'metamod_console.cpp', - 'metamod_oslink.cpp', - 'metamod_plugins.cpp', - 'metamod_util.cpp', - 'provider/console.cpp', - 'provider/provider_ep2.cpp', - 'sourcehook/sourcehook.cpp', - 'sourcehook/sourcehook_hookmangen.cpp', - 'sourcehook/sourcehook_impl_chookidman.cpp', - 'sourcehook/sourcehook_impl_chookmaninfo.cpp', - 'sourcehook/sourcehook_impl_cproto.cpp', - 'sourcehook/sourcehook_impl_cvfnptr.cpp', - 'gamedll_bridge.cpp', - 'vsp_bridge.cpp' - ] - binary.AddSourceFiles('core', files) - MMS.PostSetupHL2Job(extension, binary, i) - MMS.AutoVersion('core', binary) - binary.SendToJob() + name = 'metamod.' + sdk.ext + binary = MMS.HL2Library(builder, name, sdk) + binary.sources += [ + 'metamod.cpp', + 'metamod_console.cpp', + 'metamod_oslink.cpp', + 'metamod_plugins.cpp', + 'metamod_util.cpp', + 'provider/console.cpp', + 'provider/provider_ep2.cpp', + 'sourcehook/sourcehook.cpp', + 'sourcehook/sourcehook_hookmangen.cpp', + 'sourcehook/sourcehook_impl_chookidman.cpp', + 'sourcehook/sourcehook_impl_chookmaninfo.cpp', + 'sourcehook/sourcehook_impl_cproto.cpp', + 'sourcehook/sourcehook_impl_cvfnptr.cpp', + 'gamedll_bridge.cpp', + 'vsp_bridge.cpp' + ] + nodes = builder.Add(binary) + MMS.binaries += [nodes] diff --git a/loader/AMBuilder b/loader/AMBuilder index 9cc337e..0207359 100644 --- a/loader/AMBuilder +++ b/loader/AMBuilder @@ -1,31 +1,22 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python: import os.path -compiler = MMS.DefaultCompiler() -compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'core', 'sourcehook')) -compiler2 = compiler.Clone() +def configure_library(name, linux_defines): + binary = MMS.Library(builder, name) + binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'core', 'sourcehook')] + binary.sources += [ + 'loader.cpp', + 'gamedll.cpp', + 'serverplugin.cpp', + 'utility.cpp', + ] -files = [ - 'loader.cpp', - 'gamedll.cpp', - 'serverplugin.cpp', - 'utility.cpp' - ] + if builder.target_platform == 'linux': + binary.compiler.defines += linux_defines -name = 'server' -loader = AMBuild.AddJob(name) -binary = Cpp.LibraryBuilder(name, AMBuild, loader, compiler) -if AMBuild.target['platform'] == 'linux': - compiler['CDEFINES'].extend(['LIB_PREFIX=\"lib\"', 'LIB_SUFFIX=\".so\"']) -binary.AddSourceFiles('loader', files) -MMS.AutoVersion('loader', binary) -binary.SendToJob() + nodes = builder.Add(binary) + MMS.binaries += [nodes] -if AMBuild.target['platform'] == 'linux': - name = 'server_i486' - loader = AMBuild.AddJob(name) - binary = Cpp.LibraryBuilder(name, AMBuild, loader, compiler2) - compiler2['CDEFINES'].extend(['LIB_PREFIX=\"\"', 'LIB_SUFFIX=\"_i486.so\"']) - binary.AddSourceFiles('loader', files) - MMS.AutoVersion('loader', binary) - binary.SendToJob() +configure_library('server', ['LIB_PREFIX="lib"', 'LIB_SUFFIX=".so"']) +if builder.target_platform == 'linux': + configure_library('server_i486', ['LIB_PREFIX=""', 'LIB_SUFFIX="_i486.so"']) diff --git a/support/buildbot/PackageScript b/support/buildbot/PackageScript index 37a12c2..74de710 100644 --- a/support/buildbot/PackageScript +++ b/support/buildbot/PackageScript @@ -1,114 +1,25 @@ # vim: set ts=2 sw=2 tw=99 noet ft=python: import os -import shutil -import ambuild.osutil as osutil -from ambuild.command import Command -job = AMBuild.AddJob('package') +builder.SetBuildFolder('package') -class DestroyPath(Command): - def __init__(self, folder): - Command.__init__(self) - self.folder = folder +addons_folder = builder.AddFolder('addons') +metamod_folder = builder.AddFolder(os.path.join('addons', 'metamod')) +bin_folder = builder.AddFolder(os.path.join('addons', 'metamod', 'bin')) - def destroy(self, path): - entries = os.listdir(path) - for entry in entries: - newpath = os.path.join(path, entry) - if os.path.isdir(newpath): - self.destroy(newpath) - os.rmdir(newpath) - elif os.path.isfile(newpath): - os.remove(newpath) - - def run(self, runner, job): - runner.PrintOut('rm -rf {0}/*'.format(self.folder)) - self.destroy(self.folder) - -class CreateFolders(Command): - def __init__(self, folders): - Command.__init__(self) - self.folders = folders - - def run(self, runner, job): - for folder in self.folders: - path = os.path.join(*folder) - runner.PrintOut('mkdir {0}'.format(path)) - os.makedirs(path) - -#Shallow folder copy -class CopyFolder(Command): - def __init__(self, fromList, toList, excludes = []): - Command.__init__(self) - self.fromPath = os.path.join(AMBuild.sourceFolder, *fromList) - self.toPath = os.path.join(*toList) - self.excludes = excludes - - def run(self, runner, job): - entries = os.listdir(self.fromPath) - for entry in entries: - if entry in self.excludes: - continue - path = os.path.join(self.fromPath, entry) - if not os.path.isfile(path): - continue - runner.PrintOut('copy {0} to {1}'.format(path, self.toPath)) - shutil.copy(path, self.toPath) - -#Single file copy -class CopyFile(Command): - def __init__(self, fromFile, toPath): - Command.__init__(self) - self.fromFile = fromFile - self.toPath = toPath - - def run(self, runner, job): - runner.PrintOut('copy {0} to {1}'.format(self.fromFile, self.toPath)) - shutil.copy(self.fromFile, self.toPath) - - -folders = [['addons', 'metamod', 'bin']] - -#Setup -job.AddCommand(DestroyPath(os.path.join(AMBuild.outputFolder, 'package'))) -job.AddCommand(CreateFolders(folders)) - -#Copy Files -job.AddCommand(CopyFile(os.path.join(AMBuild.sourceFolder, 'support', 'metamod.vdf'), - os.path.join('addons'))) -job.AddCommand(CopyFile(os.path.join(AMBuild.sourceFolder, 'support', 'metaplugins.ini'), - os.path.join('addons', 'metamod'))) -job.AddCommand(CopyFile(os.path.join(AMBuild.sourceFolder, 'support', 'README.txt'), - os.path.join('addons', 'metamod'))) - -bincopies = [] - -def AddNormalLibrary(name, dest): - dest = os.path.join('addons', 'metamod', dest) - bincopies.append(CopyFile(os.path.join('..', name, name + osutil.SharedLibSuffix()), dest)) - pdb_list.append(name + '\\' + name + '.pdb') - -def AddHL2Library(name, dest): - for i in MMS.sdkInfo: - sdk = MMS.sdkInfo[i] - if AMBuild.target['platform'] not in sdk['platform']: - continue - AddNormalLibrary(name + '.' + sdk['ext'], dest) +builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metamod.vdf'), addons_folder) +builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'metaplugins.ini'), metamod_folder) +builder.AddCopy(os.path.join(builder.sourcePath, 'support', 'README.txt'), metamod_folder) pdb_list = [] +for task in MMS.binaries: + builder.AddCopy(task.binary, bin_folder) -# Copy loader binaries -AddNormalLibrary('server', 'bin') -if AMBuild.target['platform'] == 'linux': - AddNormalLibrary('server_i486', 'bin') + if task.debug: + pdb_list.extend(task.debug) -AddHL2Library('metamod', 'bin') - -job.AddCommandGroup(bincopies) - -if AMBuild.target['platform'] == 'windows': - pdblog = open(os.path.join(AMBuild.outputFolder, 'pdblog.txt'), 'wt') - for pdb in pdb_list: - pdblog.write(pdb + '\n') - pdblog.close() +# Generate PDB info. +with open(os.path.join(builder.buildPath, 'pdblog.txt'), 'wt') as fp: + for line in pdb_list: + fp.write(line.path + '\n') diff --git a/support/buildbot/Versioning b/support/buildbot/Versioning index 843ad16..0e0d9a2 100644 --- a/support/buildbot/Versioning +++ b/support/buildbot/Versioning @@ -1,57 +1,30 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: -import os -import re -import subprocess -from ambuild.cache import Cache -import ambuild.command as command +# vim: set ts=8 sts=2 sw=2 tw=99 et ft=python: +import os, sys -#Quickly try to ascertain the current repository revision -def GetVersion(): - args = ['hg', 'parent', '-R', AMBuild.sourceFolder] - p = command.RunDirectCommand(AMBuild, args) - m = re.match('changeset:\s+(\d+):(.+)', p.stdoutText) - if m == None: - raise Exception('Could not determine repository version') - return m.groups() +builder.SetBuildFolder('/') -def PerformReversioning(): - rev, cset = GetVersion() - cacheFile = os.path.join(AMBuild.outputFolder, '.ambuild', 'hgcache') - cache = Cache(cacheFile) - if os.path.isfile(cacheFile): - cache.LoadCache() - if cache.HasVariable('cset') and cache['cset'] == cset: - return False - cache.CacheVariable('cset', cset) +includes = builder.AddFolder('includes') - 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: - raise Exception('Could not detremine product version') - major, minor, release, tag = m.groups() +argv = [ + sys.executable, + os.path.join(builder.sourcePath, 'support', 'buildbot', 'generate_headers.py'), + os.path.join(builder.sourcePath), + os.path.join(builder.buildPath, 'includes') +] +outputs = [ + os.path.join(builder.buildFolder, 'includes', 'metamod_version_auto.h') +] - incFolder = os.path.join(AMBuild.outputFolder, 'includes') - if not os.path.isdir(incFolder): - os.makedirs(incFolder) - incFile = open(os.path.join(incFolder, 'metamod_version_auto.h'), 'w') - incFile.write(""" -#ifndef _METAMOD_AUTO_VERSION_INFORMATION_H_ -#define _METAMOD_AUTO_VERSION_INFORMATION_H_ - -#define MMS_BUILD_STRING \"{0}\" -#define MMS_BUILD_UNIQUEID \"{1}:{2}\" MMS_BUILD_STRING -#define MMS_FULL_VERSION \"{3}.{4}.{5}\" MMS_BUILD_STRING -#define MMS_FILE_VERSION {6},{7},{8},0 - -#endif /* _METAMOD_AUTO_VERSION_INFORMATION_H_ */ - -""".format(tag, rev, cset, major, minor, release, major, minor, release)) - incFile.close() - - cache.WriteCache() - -PerformReversioning() +sources = [ + os.path.join(builder.sourcePath, 'product.version'), + # This is a hack, but we need some way to only run this script when HG changes. + os.path.join(builder.sourcePath, '.hg', 'dirstate'), +] +cmd_node, output_nodes = builder.AddCommand( + inputs=sources, + argv=argv, + outputs=outputs +) +rvalue = output_nodes diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl index b4d16ca..f971e87 100755 --- a/support/buildbot/bootstrap.pl +++ b/support/buildbot/bootstrap.pl @@ -19,27 +19,7 @@ our ($root) = getcwd(); my $reconf = 0; -#Create output folder if it doesn't exist. -if (!(-d 'OUTPUT')) { - $reconf = 1; -} else { - if (-f 'OUTPUT/sentinel') { - my @s = stat('OUTPUT/sentinel'); - my $mtime = $s[9]; - my @files = ('build/pushbuild.txt', 'build/AMBuildScript', 'build/product.version'); - my ($i); - for ($i = 0; $i <= $#files; $i++) { - if (IsNewer($files[$i], $mtime)) { - $reconf = 1; - last; - } - } - } else { - $reconf = 1; - } -} - -if ($reconf) { +if (!(-f 'OUTPUT/.ambuild2/graph')) { rmtree('OUTPUT'); mkdir('OUTPUT') or die("Failed to create output folder: $!\n"); chdir('OUTPUT'); @@ -54,7 +34,7 @@ if ($reconf) { } elsif ($^O eq "darwin") { $result = `CC=clang CXX=clang python3 ../build/configure.py --enable-optimize`; } else { - $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`; + $result = `C:\\Python27\\Python.exe ..\\build\\configure.py --enable-optimize`; } } print "$result\n"; diff --git a/support/buildbot/generate_headers.py b/support/buildbot/generate_headers.py new file mode 100644 index 0000000..2763b53 --- /dev/null +++ b/support/buildbot/generate_headers.py @@ -0,0 +1,45 @@ +# vim: set ts=8 sts=2 sw=2 tw=99 et: +import re +import os, sys +import subprocess + +argv = sys.argv[1:] +if len(argv) < 2: + sys.stderr.write('Usage: generate_headers.py \n') + sys.exit(1) + +SourceFolder = os.path.abspath(os.path.normpath(argv[0])) +OutputFolder = os.path.normpath(argv[1]) + +def get_hg_version(): + argv = ['hg', 'parent', '-R', SourceFolder] + text = subprocess.check_output(argv) + m = re.match('changeset:\s+(\d+):(.+)', text) + if m == None: + raise Exception('Could not determine repository version') + return m.groups() + +def output_version_header(): + rev, cset = get_hg_version() + with open(os.path.join(SourceFolder, 'product.version')) as fp: + productContents = fp.read() + m = re.match('(\d+)\.(\d+)\.(\d+)(.*)', productContents) + if m == None: + raise Exception('Could not detremine product version') + major, minor, release, tag = m.groups() + + with open(os.path.join(OutputFolder, 'metamod_version_auto.h'), 'w') as fp: + fp.write("""#ifndef _METAMOD_AUTO_VERSION_INFORMATION_H_ +#define _METAMOD_AUTO_VERSION_INFORMATION_H_ + +#define MMS_BUILD_STRING \"{0}\" +#define MMS_BUILD_UNIQUEID \"{1}:{2}\" MMS_BUILD_STRING +#define MMS_FULL_VERSION \"{3}.{4}.{5}\" MMS_BUILD_STRING +#define MMS_FILE_VERSION {6},{7},{8},0 + +#endif /* _METAMOD_AUTO_VERSION_INFORMATION_H_ */ + +""".format(tag, rev, cset, major, minor, release, major, minor, release)) + +output_version_header() + diff --git a/support/buildbot/startbuild.pl b/support/buildbot/startbuild.pl index 7d6a312..45f2f71 100755 --- a/support/buildbot/startbuild.pl +++ b/support/buildbot/startbuild.pl @@ -10,11 +10,7 @@ require 'helpers.pm'; chdir('../../../OUTPUT'); -if ($^O eq "linux" || $^O eq "darwin") { - system("python3 build.py 2>&1"); -} else { - system("C:\\Python31\\python.exe build.py 2>&1"); -} +system("build.py 2>&1"); if ($? != 0) {