From 5f551fa67a7da89bd666cf37674a42f37d3649b4 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Sat, 14 Apr 2012 01:12:24 +0100 Subject: [PATCH] Backed out changeset: 387b27fb575b (bug 5227) --- AMBuildScript | 19 +++---------------- core/AMBuilder | 2 +- core/logic/AMBuilder | 1 - extensions/bintools/AMBuilder | 3 ++- extensions/clientprefs/AMBuilder | 2 +- extensions/cstrike/AMBuilder | 3 +-- extensions/curl/AMBuilder | 2 +- extensions/geoip/AMBuilder | 2 +- extensions/mysql/AMBuilder | 2 +- extensions/regex/AMBuilder | 2 +- extensions/sdktools/AMBuilder | 2 +- extensions/sqlite/AMBuilder | 2 +- extensions/tf2/AMBuilder | 2 +- extensions/topmenus/AMBuilder | 2 +- extensions/updater/AMBuilder | 2 +- loader/AMBuilder | 2 +- sourcepawn/compiler/AMBuilder | 2 +- sourcepawn/jit/AMBuilder | 2 +- 18 files changed, 20 insertions(+), 34 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 02921000..13489592 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -2,7 +2,6 @@ import os import sys from ambuild.command import SymlinkCommand -from ambuild.command import ShellCommand class SM: def __init__(self): @@ -115,7 +114,6 @@ class SM: self.compiler.AddToListVar('CFLAGS', '-Wno-switch') self.compiler.AddToListVar('CFLAGS', '-msse') self.compiler.AddToListVar('CFLAGS', '-m32') - self.compiler.AddToListVar('CFLAGS', '-g3') self.compiler.AddToListVar('POSTLINKFLAGS', '-m32') self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions') self.compiler.AddToListVar('CXXFLAGS', '-fno-rtti') @@ -175,7 +173,9 @@ class SM: if AMBuild.options.debug == '1': self.compiler.AddToListVar('CDEFINES', 'DEBUG') self.compiler.AddToListVar('CDEFINES', '_DEBUG') - if self.vendor == 'msvc': + 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') @@ -259,19 +259,6 @@ class SM: else: return - def StripBinary(self, job, binary): - workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) - src = os.path.join('..', workFolder, binary.binaryFile) - if not binary.NeedsRelink(src): - return; - if AMBuild.target['platform'] == 'linux': - job.AddCommand(ShellCommand('objcopy --only-keep-debug ' + src + ' ' + src + '.dbg')) - job.AddCommand(ShellCommand('objcopy --strip-debug ' + src)) - job.AddCommand(ShellCommand('objcopy --add-gnu-debuglink=' + src + '.dbg ' + src)) - elif AMBuild.target['platform'] == 'darwin': - job.AddCommand(ShellCommand('dsymutil ' + src)) - job.AddCommand(ShellCommand('strip -S ' + src)) - def PreSetupHL2Job(self, job, builder, sdk): info = self.sdkInfo[sdk] sdkPath = AMBuild.cache[info['sdk']] diff --git a/core/AMBuilder b/core/AMBuilder index 14da08f6..e312017f 100644 --- a/core/AMBuilder +++ b/core/AMBuilder @@ -75,4 +75,4 @@ for i in SM.sdkInfo: SM.PostSetupHL2Job(extension, binary, i) SM.AutoVersion('core', binary) binary.SendToJob() - SM.StripBinary(extension, binary) + diff --git a/core/logic/AMBuilder b/core/logic/AMBuilder index e19cf6ae..e3da04fb 100644 --- a/core/logic/AMBuilder +++ b/core/logic/AMBuilder @@ -56,5 +56,4 @@ else: binary.AddSourceFiles('core/logic', files) SM.AutoVersion('core/logic', binary) binary.SendToJob() -SM.StripBinary(extension, binary) diff --git a/extensions/bintools/AMBuilder b/extensions/bintools/AMBuilder index 33d70e6b..2b48dbac 100644 --- a/extensions/bintools/AMBuilder +++ b/extensions/bintools/AMBuilder @@ -20,4 +20,5 @@ binary.AddSourceFiles('extensions/bintools', [ ]) SM.AutoVersion('extensions/bintools', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + + diff --git a/extensions/clientprefs/AMBuilder b/extensions/clientprefs/AMBuilder index 12921f45..09d26f0d 100644 --- a/extensions/clientprefs/AMBuilder +++ b/extensions/clientprefs/AMBuilder @@ -16,4 +16,4 @@ binary.AddSourceFiles('extensions/clientprefs', [ ]) SM.AutoVersion('extensions/clientprefs', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/cstrike/AMBuilder b/extensions/cstrike/AMBuilder index 3c4799b0..6ff16fb3 100644 --- a/extensions/cstrike/AMBuilder +++ b/extensions/cstrike/AMBuilder @@ -22,5 +22,4 @@ if AMBuild.target['platform'] in sdk['platform']: ]) SM.PostSetupHL2Job(extension, binary, 'ep2v') SM.AutoVersion('extensions/cstrike', binary) - binary.SendToJob() - SM.StripBinary(extension, binary) + binary.SendToJob() \ No newline at end of file diff --git a/extensions/curl/AMBuilder b/extensions/curl/AMBuilder index 122303bb..06a6fe6a 100644 --- a/extensions/curl/AMBuilder +++ b/extensions/curl/AMBuilder @@ -83,4 +83,4 @@ elif AMBuild.target['platform'] == 'windows': SM.AutoVersion('extensions/curl', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/geoip/AMBuilder b/extensions/geoip/AMBuilder index ccd5656f..e9df90d8 100644 --- a/extensions/geoip/AMBuilder +++ b/extensions/geoip/AMBuilder @@ -12,4 +12,4 @@ if AMBuild.target['platform'] == 'windows': binary['POSTLINKFLAGS'].append('wsock32.lib') SM.AutoVersion('extensions/geoip', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/mysql/AMBuilder b/extensions/mysql/AMBuilder index 746901a2..7342bf59 100644 --- a/extensions/mysql/AMBuilder +++ b/extensions/mysql/AMBuilder @@ -35,4 +35,4 @@ binary.AddSourceFiles('extensions/mysql', [ ]) SM.AutoVersion('extensions/mysql', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/regex/AMBuilder b/extensions/regex/AMBuilder index 4f16418e..76b37573 100644 --- a/extensions/regex/AMBuilder +++ b/extensions/regex/AMBuilder @@ -24,4 +24,4 @@ binary.AddSourceFiles('extensions/regex', [ ]) SM.AutoVersion('extensions/regex', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/sdktools/AMBuilder b/extensions/sdktools/AMBuilder index 62a875ee..cf83b474 100644 --- a/extensions/sdktools/AMBuilder +++ b/extensions/sdktools/AMBuilder @@ -49,4 +49,4 @@ for i in SM.sdkInfo: SM.PostSetupHL2Job(extension, binary, i) SM.AutoVersion('extensions/sdktools', binary) binary.SendToJob() - SM.StripBinary(extension, binary) + diff --git a/extensions/sqlite/AMBuilder b/extensions/sqlite/AMBuilder index f70a2588..cb75742f 100644 --- a/extensions/sqlite/AMBuilder +++ b/extensions/sqlite/AMBuilder @@ -37,4 +37,4 @@ elif AMBuild.target['platform'] == 'linux' or AMBuild.target['platform'] == 'dar binary.AddSourceFiles('extensions/sqlite', files) SM.AutoVersion('extensions/sqlite', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/tf2/AMBuilder b/extensions/tf2/AMBuilder index 312a76b4..40d1891a 100644 --- a/extensions/tf2/AMBuilder +++ b/extensions/tf2/AMBuilder @@ -26,4 +26,4 @@ binary.AddSourceFiles('extensions/tf2', [ SM.PostSetupHL2Job(extension, binary, 'ep2v') SM.AutoVersion('extensions/tf2', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/topmenus/AMBuilder b/extensions/topmenus/AMBuilder index 02bc4691..ce393598 100644 --- a/extensions/topmenus/AMBuilder +++ b/extensions/topmenus/AMBuilder @@ -16,4 +16,4 @@ binary.AddSourceFiles('extensions/topmenus', [ ]) SM.AutoVersion('extensions/topmenus', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/extensions/updater/AMBuilder b/extensions/updater/AMBuilder index c383b215..3e1f9711 100644 --- a/extensions/updater/AMBuilder +++ b/extensions/updater/AMBuilder @@ -15,4 +15,4 @@ binary.AddSourceFiles('extensions/updater', [ ]) SM.AutoVersion('extensions/updater', binary) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/loader/AMBuilder b/loader/AMBuilder index d4a2e7b5..0f0991b0 100644 --- a/loader/AMBuilder +++ b/loader/AMBuilder @@ -18,4 +18,4 @@ binary.AddSourceFiles('loader', [ ]) SM.AutoVersion('loader', binary) binary.SendToJob() -SM.StripBinary(loader, binary) + diff --git a/sourcepawn/compiler/AMBuilder b/sourcepawn/compiler/AMBuilder index bcbdf75c..f7982203 100644 --- a/sourcepawn/compiler/AMBuilder +++ b/sourcepawn/compiler/AMBuilder @@ -65,4 +65,4 @@ if AMBuild.target['platform'] == 'windows': binary.AddResourceFile('sourcepawn/compiler/libpawnc.rc', env) binary.SendToJob() -SM.StripBinary(extension, binary) + diff --git a/sourcepawn/jit/AMBuilder b/sourcepawn/jit/AMBuilder index 1b315d96..e3ce4282 100644 --- a/sourcepawn/jit/AMBuilder +++ b/sourcepawn/jit/AMBuilder @@ -40,4 +40,4 @@ binary.AddSourceFiles('sourcepawn/jit', [ ]) SM.AutoVersion('sourcepawn/jit', binary) binary.SendToJob() -SM.StripBinary(extension, binary) +