Mercurial > fife-parpg

comparison patches/scons-warnings-patch.diff @ 279:d70788eaa5d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*my last final fife commint :)
author LinuxDonald@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 16 Jun 2009 18:41:47 +0000
parents
children 0aef41764e0f
comparison
equal deleted inserted replaced
278:6a848ab742be 279:d70788eaa5d2
1 Index: utils/util_scripts/path.py
2 ===================================================================
3 --- utils/util_scripts/path.py (Revision 2922)
4 +++ utils/util_scripts/path.py (Arbeitskopie)
5 @@ -29,7 +29,7 @@
6
7 from __future__ import generators
8
9 -import sys, warnings, os, fnmatch, glob, shutil, codecs, md5
10 +import sys, warnings, os, fnmatch, glob, shutil, codecs, hashlib
11
12 __version__ = '2.2'
13 __all__ = ['path']
14 Index: SConstruct
15 ===================================================================
16 --- SConstruct (Revision 2922)
17 +++ SConstruct (Arbeitskopie)
18 @@ -1,27 +1,27 @@
19 import os, sys
20 from utils.util_scripts.path import path as upath
21
22 -opts = Options('options.py', ARGUMENTS)
23 -opts.Add(BoolOption('debug', 'Build with debuginfos and without optimisations', 1))
24 -opts.Add(BoolOption('tests', 'Build testcases in unit_tests', 0))
25 -opts.Add(BoolOption('noengine', 'Prevents building of engine, use e.g. for util/test tweaking', 0))
26 -opts.Add(BoolOption('opengl', 'Compile OpenGL support', 1))
27 -opts.Add(EnumOption('script', 'Selects generated scripting language bindings', 'python', allowed_values=('python', 'lua')))
28 -opts.Add(BoolOption('profile', 'Build with profiling information', 0))
29 -opts.Add(BoolOption('projectfiles_only', "Creates IDE project files only. If defined, won't build code. " +
30 +opts = Variables('options.py', ARGUMENTS)
31 +opts.Add(BoolVariable('debug', 'Build with debuginfos and without optimisations', 1))
32 +opts.Add(BoolVariable('tests', 'Build testcases in unit_tests', 0))
33 +opts.Add(BoolVariable('noengine', 'Prevents building of engine, use e.g. for util/test tweaking', 0))
34 +opts.Add(BoolVariable('opengl', 'Compile OpenGL support', 1))
35 +opts.Add(EnumVariable('script', 'Selects generated scripting language bindings', 'python', allowed_values=('python', 'lua')))
36 +opts.Add(BoolVariable('profile', 'Build with profiling information', 0))
37 +opts.Add(BoolVariable('projectfiles_only', "Creates IDE project files only. If defined, won't build code. " +
38 "Note that normal builds generate these files also automatically.", 0))
39 -opts.Add(BoolOption('utils', 'Build utilities', 0))
40 -opts.Add(BoolOption('ext', 'Build external dependencies', 0))
41 -opts.Add(BoolOption('docs', "Generates static analysis documentation into doc-folder. If defined, won't build code", 0))
42 -opts.Add(BoolOption('zip', 'Enable ZIP archive support', 1))
43 -opts.Add(BoolOption('log', 'Enables logging for the engine', 1))
44 +opts.Add(BoolVariable('utils', 'Build utilities', 0))
45 +opts.Add(BoolVariable('ext', 'Build external dependencies', 0))
46 +opts.Add(BoolVariable('docs', "Generates static analysis documentation into doc-folder. If defined, won't build code", 0))
47 +opts.Add(BoolVariable('zip', 'Enable ZIP archive support', 1))
48 +opts.Add(BoolVariable('log', 'Enables logging for the engine', 1))
49
50 -opts.Add(BoolOption('rend_camzone', 'Enables camera zone renderer', 0))
51 -opts.Add(BoolOption('rend_grid', 'Enables grid renderer', 0))
52 +opts.Add(BoolVariable('rend_camzone', 'Enables camera zone renderer', 0))
53 +opts.Add(BoolVariable('rend_grid', 'Enables grid renderer', 0))
54
55 # Platform-specific prefix directories
56 if sys.platform == 'linux2':
57 - opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr'))
58 + opts.Add(PathVariable('PREFIX', 'Directory to install under', '/usr'))
59
60 env = Environment(options = opts, ENV = {'PATH' : os.environ['PATH']})
61 env.Replace(SCONS_ROOT_PATH=str(upath('.').abspath()))