1.1 --- a/AMBuildScript Sat Apr 14 00:31:50 2012 +0100
1.2 +++ b/AMBuildScript Sat Apr 14 01:12:24 2012 +0100
1.3 @@ -2,7 +2,6 @@
1.4 import os
1.5 import sys
1.6 from ambuild.command import SymlinkCommand
1.7 -from ambuild.command import ShellCommand
1.8
1.9 class SM:
1.10 def __init__(self):
1.11 @@ -115,7 +114,6 @@
1.12 self.compiler.AddToListVar('CFLAGS', '-Wno-switch')
1.13 self.compiler.AddToListVar('CFLAGS', '-msse')
1.14 self.compiler.AddToListVar('CFLAGS', '-m32')
1.15 - self.compiler.AddToListVar('CFLAGS', '-g3')
1.16 self.compiler.AddToListVar('POSTLINKFLAGS', '-m32')
1.17 self.compiler.AddToListVar('CXXFLAGS', '-fno-exceptions')
1.18 self.compiler.AddToListVar('CXXFLAGS', '-fno-rtti')
1.19 @@ -175,7 +173,9 @@
1.20 if AMBuild.options.debug == '1':
1.21 self.compiler.AddToListVar('CDEFINES', 'DEBUG')
1.22 self.compiler.AddToListVar('CDEFINES', '_DEBUG')
1.23 - if self.vendor == 'msvc':
1.24 + if self.vendor == 'gcc' or self.vendor == 'clang':
1.25 + self.compiler.AddToListVar('CFLAGS', '-g3')
1.26 + elif self.vendor == 'msvc':
1.27 self.compiler.AddToListVar('CFLAGS', '/Od')
1.28 self.compiler.AddToListVar('CFLAGS', '/RTC1')
1.29
1.30 @@ -259,19 +259,6 @@
1.31 else:
1.32 return
1.33
1.34 - def StripBinary(self, job, binary):
1.35 - workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
1.36 - src = os.path.join('..', workFolder, binary.binaryFile)
1.37 - if not binary.NeedsRelink(src):
1.38 - return;
1.39 - if AMBuild.target['platform'] == 'linux':
1.40 - job.AddCommand(ShellCommand('objcopy --only-keep-debug ' + src + ' ' + src + '.dbg'))
1.41 - job.AddCommand(ShellCommand('objcopy --strip-debug ' + src))
1.42 - job.AddCommand(ShellCommand('objcopy --add-gnu-debuglink=' + src + '.dbg ' + src))
1.43 - elif AMBuild.target['platform'] == 'darwin':
1.44 - job.AddCommand(ShellCommand('dsymutil ' + src))
1.45 - job.AddCommand(ShellCommand('strip -S ' + src))
1.46 -
1.47 def PreSetupHL2Job(self, job, builder, sdk):
1.48 info = self.sdkInfo[sdk]
1.49 sdkPath = AMBuild.cache[info['sdk']]
2.1 --- a/core/AMBuilder Sat Apr 14 00:31:50 2012 +0100
2.2 +++ b/core/AMBuilder Sat Apr 14 01:12:24 2012 +0100
2.3 @@ -75,4 +75,4 @@
2.4 SM.PostSetupHL2Job(extension, binary, i)
2.5 SM.AutoVersion('core', binary)
2.6 binary.SendToJob()
2.7 - SM.StripBinary(extension, binary)
2.8 +
3.1 --- a/core/logic/AMBuilder Sat Apr 14 00:31:50 2012 +0100
3.2 +++ b/core/logic/AMBuilder Sat Apr 14 01:12:24 2012 +0100
3.3 @@ -56,5 +56,4 @@
3.4 binary.AddSourceFiles('core/logic', files)
3.5 SM.AutoVersion('core/logic', binary)
3.6 binary.SendToJob()
3.7 -SM.StripBinary(extension, binary)
3.8
4.1 --- a/extensions/bintools/AMBuilder Sat Apr 14 00:31:50 2012 +0100
4.2 +++ b/extensions/bintools/AMBuilder Sat Apr 14 01:12:24 2012 +0100
4.3 @@ -20,4 +20,5 @@
4.4 ])
4.5 SM.AutoVersion('extensions/bintools', binary)
4.6 binary.SendToJob()
4.7 -SM.StripBinary(extension, binary)
4.8 +
4.9 +
5.1 --- a/extensions/clientprefs/AMBuilder Sat Apr 14 00:31:50 2012 +0100
5.2 +++ b/extensions/clientprefs/AMBuilder Sat Apr 14 01:12:24 2012 +0100
5.3 @@ -16,4 +16,4 @@
5.4 ])
5.5 SM.AutoVersion('extensions/clientprefs', binary)
5.6 binary.SendToJob()
5.7 -SM.StripBinary(extension, binary)
5.8 +
6.1 --- a/extensions/cstrike/AMBuilder Sat Apr 14 00:31:50 2012 +0100
6.2 +++ b/extensions/cstrike/AMBuilder Sat Apr 14 01:12:24 2012 +0100
6.3 @@ -22,5 +22,4 @@
6.4 ])
6.5 SM.PostSetupHL2Job(extension, binary, 'ep2v')
6.6 SM.AutoVersion('extensions/cstrike', binary)
6.7 - binary.SendToJob()
6.8 - SM.StripBinary(extension, binary)
6.9 + binary.SendToJob()
6.10 \ No newline at end of file
7.1 --- a/extensions/curl/AMBuilder Sat Apr 14 00:31:50 2012 +0100
7.2 +++ b/extensions/curl/AMBuilder Sat Apr 14 01:12:24 2012 +0100
7.3 @@ -83,4 +83,4 @@
7.4
7.5 SM.AutoVersion('extensions/curl', binary)
7.6 binary.SendToJob()
7.7 -SM.StripBinary(extension, binary)
7.8 +
8.1 --- a/extensions/geoip/AMBuilder Sat Apr 14 00:31:50 2012 +0100
8.2 +++ b/extensions/geoip/AMBuilder Sat Apr 14 01:12:24 2012 +0100
8.3 @@ -12,4 +12,4 @@
8.4 binary['POSTLINKFLAGS'].append('wsock32.lib')
8.5 SM.AutoVersion('extensions/geoip', binary)
8.6 binary.SendToJob()
8.7 -SM.StripBinary(extension, binary)
8.8 +
9.1 --- a/extensions/mysql/AMBuilder Sat Apr 14 00:31:50 2012 +0100
9.2 +++ b/extensions/mysql/AMBuilder Sat Apr 14 01:12:24 2012 +0100
9.3 @@ -35,4 +35,4 @@
9.4 ])
9.5 SM.AutoVersion('extensions/mysql', binary)
9.6 binary.SendToJob()
9.7 -SM.StripBinary(extension, binary)
9.8 +
10.1 --- a/extensions/regex/AMBuilder Sat Apr 14 00:31:50 2012 +0100
10.2 +++ b/extensions/regex/AMBuilder Sat Apr 14 01:12:24 2012 +0100
10.3 @@ -24,4 +24,4 @@
10.4 ])
10.5 SM.AutoVersion('extensions/regex', binary)
10.6 binary.SendToJob()
10.7 -SM.StripBinary(extension, binary)
10.8 +
11.1 --- a/extensions/sdktools/AMBuilder Sat Apr 14 00:31:50 2012 +0100
11.2 +++ b/extensions/sdktools/AMBuilder Sat Apr 14 01:12:24 2012 +0100
11.3 @@ -49,4 +49,4 @@
11.4 SM.PostSetupHL2Job(extension, binary, i)
11.5 SM.AutoVersion('extensions/sdktools', binary)
11.6 binary.SendToJob()
11.7 - SM.StripBinary(extension, binary)
11.8 +
12.1 --- a/extensions/sqlite/AMBuilder Sat Apr 14 00:31:50 2012 +0100
12.2 +++ b/extensions/sqlite/AMBuilder Sat Apr 14 01:12:24 2012 +0100
12.3 @@ -37,4 +37,4 @@
12.4 binary.AddSourceFiles('extensions/sqlite', files)
12.5 SM.AutoVersion('extensions/sqlite', binary)
12.6 binary.SendToJob()
12.7 -SM.StripBinary(extension, binary)
12.8 +
13.1 --- a/extensions/tf2/AMBuilder Sat Apr 14 00:31:50 2012 +0100
13.2 +++ b/extensions/tf2/AMBuilder Sat Apr 14 01:12:24 2012 +0100
13.3 @@ -26,4 +26,4 @@
13.4 SM.PostSetupHL2Job(extension, binary, 'ep2v')
13.5 SM.AutoVersion('extensions/tf2', binary)
13.6 binary.SendToJob()
13.7 -SM.StripBinary(extension, binary)
13.8 +
14.1 --- a/extensions/topmenus/AMBuilder Sat Apr 14 00:31:50 2012 +0100
14.2 +++ b/extensions/topmenus/AMBuilder Sat Apr 14 01:12:24 2012 +0100
14.3 @@ -16,4 +16,4 @@
14.4 ])
14.5 SM.AutoVersion('extensions/topmenus', binary)
14.6 binary.SendToJob()
14.7 -SM.StripBinary(extension, binary)
14.8 +
15.1 --- a/extensions/updater/AMBuilder Sat Apr 14 00:31:50 2012 +0100
15.2 +++ b/extensions/updater/AMBuilder Sat Apr 14 01:12:24 2012 +0100
15.3 @@ -15,4 +15,4 @@
15.4 ])
15.5 SM.AutoVersion('extensions/updater', binary)
15.6 binary.SendToJob()
15.7 -SM.StripBinary(extension, binary)
15.8 +
16.1 --- a/loader/AMBuilder Sat Apr 14 00:31:50 2012 +0100
16.2 +++ b/loader/AMBuilder Sat Apr 14 01:12:24 2012 +0100
16.3 @@ -18,4 +18,4 @@
16.4 ])
16.5 SM.AutoVersion('loader', binary)
16.6 binary.SendToJob()
16.7 -SM.StripBinary(loader, binary)
16.8 +
17.1 --- a/sourcepawn/compiler/AMBuilder Sat Apr 14 00:31:50 2012 +0100
17.2 +++ b/sourcepawn/compiler/AMBuilder Sat Apr 14 01:12:24 2012 +0100
17.3 @@ -65,4 +65,4 @@
17.4 binary.AddResourceFile('sourcepawn/compiler/libpawnc.rc', env)
17.5
17.6 binary.SendToJob()
17.7 -SM.StripBinary(extension, binary)
17.8 +
18.1 --- a/sourcepawn/jit/AMBuilder Sat Apr 14 00:31:50 2012 +0100
18.2 +++ b/sourcepawn/jit/AMBuilder Sat Apr 14 01:12:24 2012 +0100
18.3 @@ -40,4 +40,4 @@
18.4 ])
18.5 SM.AutoVersion('sourcepawn/jit', binary)
18.6 binary.SendToJob()
18.7 -SM.StripBinary(extension, binary)
18.8 +
