diff --git a/.hgignore b/.hgignore index 9af9aca..299b722 100644 --- a/.hgignore +++ b/.hgignore @@ -1,5 +1,6 @@ syntax: glob build +extension/version_auto.h google-breakpad/android google-breakpad/codereview.settings google-breakpad/README.ANDROID diff --git a/extension/AMBuilder b/extension/AMBuilder index f3c2969..ec22f53 100644 --- a/extension/AMBuilder +++ b/extension/AMBuilder @@ -1,6 +1,19 @@ # vim: set ts=2 sw=2 tw=99 noet ft=python: import os +import ambuild.osutil as osutil from ambuild.command import SymlinkCommand +from ambuild.command import ShellCommand + +def BuildBreakpad(): + breakpad = AMBuild.AddJob('google-breakpad') + if AMBuild.target['platform'] not in ['linux']: + return + if osutil.FileExists(os.path.join(AMBuild.outputFolder, 'google-breakpad', 'src', 'client', 'linux', 'libbreakpad_client.a')): + return + breakpad.AddCommand(ShellCommand(os.path.join(AMBuild.sourceFolder, 'google-breakpad', 'configure'))) + breakpad.AddCommand(ShellCommand('make src/client/linux/libbreakpad_client.a')) + +BuildBreakpad() for i in SM.sdkInfo: sdk = SM.sdkInfo[i] @@ -16,7 +29,7 @@ for i in SM.sdkInfo: compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public', 'extensions')) compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public', 'sourcepawn')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['BREAKPAD'], 'src')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'google-breakpad', 'src')) name = 'accelerator.ext.' + sdk['ext'] extension = AMBuild.AddJob(name) @@ -30,7 +43,7 @@ for i in SM.sdkInfo: SM.PostSetupHL2Job(extension, binary, i) link = os.path.join(AMBuild.outputFolder, extension.workFolder, 'libbreakpad_client.a') - target = os.path.join(AMBuild.cache['BREAKPAD'], 'src', 'client', 'linux', 'libbreakpad_client.a') + target = os.path.join(AMBuild.outputFolder, 'google-breakpad', 'src', 'client', 'linux', 'libbreakpad_client.a') try: os.lstat(link) except: diff --git a/extension/version_auto.h b/extension/version_auto.h deleted file mode 100644 index b7b0bdd..0000000 --- a/extension/version_auto.h +++ /dev/null @@ -1,12 +0,0 @@ - -#ifndef _AUTO_VERSION_INFORMATION_H_ -#define _AUTO_VERSION_INFORMATION_H_ - -#define SM_BUILD_TAG "" -#define SM_BUILD_UNIQUEID "0:fcdef8474873" SM_BUILD_TAG -#define SM_VERSION "1.0.0" -#define SM_FULL_VERSION SM_VERSION SM_BUILD_TAG -#define SM_FILE_VERSION 1,0,0,0 - -#endif /* _AUTO_VERSION_INFORMATION_H_ */ -