linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2566
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2011-06-24 20:55:47 +0200
message:
  friendlier message for the strip command
modified:
  build_util.py
  installer/SConscript
  win32/SConscript


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'build_util.py'
--- build_util.py	2011-05-04 19:32:00 +0000
+++ build_util.py	2011-06-24 18:55:47 +0000
@@ -45,6 +45,7 @@
 			self.env['AR'] = prefix + 'ar'
 			self.env['RANLIB'] = prefix + 'ranlib'
 			self.env['RC'] = prefix + 'windres'
+			self.env['strip'] = prefix + 'strip'
 
 			if sys.platform != 'win32':
 				self.env['PROGSUFFIX'] = '.exe'

=== modified file 'installer/SConscript'
--- installer/SConscript	2010-09-22 15:23:13 +0000
+++ installer/SConscript	2011-06-24 18:55:47 +0000
@@ -21,8 +21,8 @@
 		raise Exception('makensis.exe not found in PATH - Unicode NSIS is required to build the distro')
 	if env.WhereIs('bzr') is None:
 		raise Exception('"bzr" is required to build the distro; this tree must be under bzr version control')
-	if env.WhereIs('strip') is None:
-		raise Exception('"strip" is required to build the distro; it should be part of MinGW / binutils')
+	if env.WhereIs(env['strip']) is None:
+		raise Exception('"' + env['strip'] + '" is required to build the distro; it should be part of MinGW / binutils')
 	if env.WhereIs('zip') is None:
 		raise Exception('"zip" is required to build the distro; get the one from MSYS or Cygwin')
 

=== modified file 'win32/SConscript'
--- win32/SConscript	2011-06-24 16:08:35 +0000
+++ win32/SConscript	2011-06-24 18:55:47 +0000
@@ -48,6 +48,6 @@
 
 if 'gcc' in env['TOOLS']:
 	# strip debug info to a separate PDB file
-	env.Command(target + '.pdb', target + '.exe', 'strip --only-keep-debug "$SOURCE" -o "$TARGET"')
+	env.Command(target + '.pdb', target + '.exe', Action(env['strip'] + ' --only-keep-debug "$SOURCE" -o "$TARGET"', 'Extracting debugging symbols to $TARGET'))
 
 Return('ret')