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


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

Header


Content

Posted by esr on March 23, 2008 - 14:43:
Author: esr
Date: Sun Mar 23 14:43:38 2008
New Revision: 25016

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25016&view=rev
Log:
Correct a documentation comment.

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25016&r1=25015&r2=25016&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sun Mar 23 14:43:38 2008
@@ -25,7 +25,6 @@
 opts.Add(BoolOption('profile', 'Set to build for debugging', False))
 opts.Add(BoolOption('strict', 'Set to strict compilation', False))
 opts.Add(BoolOption('tests', 'Set to enable static building of Wesnoth', 
False))
-opts.Add(BoolOption('python','Clear to disable Python support', True))
 opts.Add(BoolOption('lite', 'Set to build lite version of wesnoth (no music 
or large images)', False))
 opts.Add(BoolOption('smallgui', 'Set for GUI reductions for resolutions down 
to 800x480 (eeePC, Nokia 8x0), resize images before installing', False))
 opts.Add(BoolOption('tinygui', 'Set for GUI reductions for resolutions down 
to 320x240 (PDAs), resize images before installing', False))
@@ -57,14 +56,17 @@
 # Configuration
 #
 
+#The 'install' target installs whatever you currently have built.  If
+#you have built wmllint/wmlscope/wmlindent the Python helper modules
+#will also be installed.
+
 Help("""\
 Available build targets include:
 
-    all wesnoth wesnoth_editor wesnothd campaignd exploder cutter
-
-The 'install' target installs whatever you currently have built.
-If you have built tools and Python is available the Python helper modules
-will also be installed.
+    wesnoth wesnoth_editor wesnothd campaignd exploder cutter
+    all = all installables
+    test = unit test binary
+    tags = build tags for Emacs.
 
 """ + opts.GenerateHelpText(env))
 conf = Configure(env)
@@ -139,9 +141,10 @@
         print "Needed SDL network lib and didn't find it; exiting!"
         Exit(1)
 
-if "all" not in targets and "wesnoth" not in targets:
-    print "*** Game build disabled, suppressing Python support."
-    env["python"] = False
+if "all" in targets or "wesnoth" in targets:
+    if not conf.CheckLib('python'+sys.version[:3]):
+        print "Needed Python lib for game and didn't find it; exiting!"
+        Exit(1)
 
 env = conf.Finish()
 




Related Messages


Powered by MHonArc, Updated Sun Mar 23 15:02:27 2008