linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2799
committer: Jacek Sieka <arnetheduck@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2012-01-08 11:19:19 +0100
message:
  Simplify test/utils builds
modified:
  SConstruct
  test/SConscript
  utils/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 'SConstruct'
--- SConstruct	2011-12-31 11:50:24 +0000
+++ SConstruct	2012-01-08 10:19:19 +0000
@@ -83,8 +83,6 @@
 	BoolVariable('i18n', 'Rebuild i18n files', 'no'),
 	BoolVariable('help', 'Build help files (requires i18n=1)', 'yes'),
 	BoolVariable('webhelp', 'Build help files for the web (requires help=1)', 'no'),
-	BoolVariable('test', 'Build test suite', 'no'),
-	BoolVariable('utils', 'Build utils suite', 'no'),
 	('prefix', 'Prefix to use when cross compiling', ''),
 	EnumVariable('arch', 'Target architecture', 'x86', ['x86', 'x64', 'ia64']),
 	BoolVariable('msvcproj', 'Build MSVC project files', 'no'),
@@ -262,14 +260,11 @@
 dev.dwt = dev.build('dwt/')
 dev.client = dev.build('dcpp/')
 dev.help = dev.build('help/')
-if dev.env['test']:
-	dev.test = dev.build('test/')
-	env.Default(dev.test)
-elif dev.env['utils']:
-	dev.utils = dev.build('utils/')
-	env.Default(dev.utils)
-else:
-	dev.win32 = dev.build('win32/')
+dev.test = dev.build('test/')
+dev.utils = dev.build('utils/')
+dev.win32 = dev.build('win32/')
+
+Default(dev.win32)
 	
 dev.installer = dev.build('installer/')
 

=== modified file 'test/SConscript'
--- test/SConscript	2012-01-01 20:42:31 +0000
+++ test/SConscript	2012-01-08 10:19:19 +0000
@@ -45,4 +45,6 @@
 
 ret = env.Command(dev.get_target(source_path, 'gtest.passed', in_bin=False), ret[0].abspath, runUnitTest)
 
+env.Help("\nYou can run the test suite by running 'scons test'\n")
+
 Return('ret')

=== modified file 'utils/SConscript'
--- utils/SConscript	2012-01-01 20:42:31 +0000
+++ utils/SConscript	2012-01-08 10:19:19 +0000
@@ -43,4 +43,6 @@
 	sources = dev.get_sources(source_path, str(f))
 	ret.append(env.Program(dev.get_target(source_path, os.path.basename(str(f)).replace('.cpp', ''), in_bin = False), [sources, dev.client, dev.dwarf, dev.zlib, dev.boost, dev.bzip2, dev.geoip, dev.miniupnpc, dev.natpmp, dev.intl]))
 
+env.Help("\nYou can build addition utilities by running 'scons utils'\n")
+
 Return('ret')