Mercurial > fife-parpg

annotate scons-warnings-patch.diff @ 278:6a848ab742be

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