Mercurial > fife-parpg

annotate patches/scons-warnings-patch.diff @ 302:94470d79576f

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