Port simple C++ build scripts to AMBuild 2 (bug 5997 part 1, r=ds).

2013-12-30 17:50:56 -05:00
parent b749bbf42b
commit e1a820dcf9
19 changed files with 955 additions and 1134 deletions
@@ -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)]