mail[Wesnoth-commits] r28844 - /trunk/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by paniemin on August 22, 2008 - 18:53:
Author: suokko
Date: Fri Aug 22 18:53:42 2008
New Revision: 28844

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28844&view=rev
Log:
* Made distcc take parelization level as parameter
* Changed localedef --force to posix compliance -c switch

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=28844&r1=28843&r2=28844&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Fri Aug 22 18:53:42 2008
@@ -80,7 +80,7 @@
     PathOption('gettextdir', 'Root directory of Gettext\'s installation.', 
"", OptionalPath), 
     PathOption('gtkdir', 'Directory where GTK SDK is installed.', "", 
OptionalPath),
     ('host', 'Cross-compile host.', ''),
-    BoolOption('distcc', "Use distcc", False),
+    EnumOption('distcc', "Use distcc", "0", 
["0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16"]),
     BoolOption('ccache', "Use ccache", False),
     ('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
     BoolOption("fast", "Make scons faster at cost of less precise dependency 
tracking.", False)
@@ -107,7 +107,9 @@
     env['CXX'] = env['cxxtool']
     env['ENV']['HOME'] = os.environ['HOME']
 
-if env['distcc']: env.Tool('distcc')
+if env['distcc']: 
+    env.Tool('distcc')
+    SetOption("num_jobs", env['distcc'])
 if env['ccache']: env.Tool('ccache')
 
 
@@ -358,7 +360,7 @@
 #
 
 if env["nls"] and env['PLATFORM'] != 'win32':
-    env.Command(Dir("locales/C"), [], "-mkdir -p locales;echo | localedef 
--force \"$TARGET\" 2> /dev/null")
+    env.Command(Dir("locales/C"), [], "-mkdir -p locales;echo | localedef -c 
\"$TARGET\" 2> /dev/null")
     language_cfg_re = re.compile(r"data/languages/(.*)\.cfg")
     language_cfgs = glob("data/languages/*.cfg")
     languages = Flatten(map(language_cfg_re.findall, language_cfgs))




Related Messages


Powered by MHonArc, Updated Fri Aug 22 19:02:05 2008