Skip to content

Commit b92b42e

Browse files
committed
BLD: reorder scons variables by likelihood of use.
No change in scons script function.
1 parent 56bd6d2 commit b92b42e

File tree

1 file changed

+33
-21
lines changed

1 file changed

+33
-21
lines changed

SConstruct

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,49 @@ env.EnsureSConsVersion(0, 98, 1)
4242
# Customizable compile variables
4343
vars = Variables('sconsvars.py')
4444

45-
vars.Add('tests',
46-
'Fixed-string patterns for selecting unit test sources.', None)
47-
vars.Add(BoolVariable('test_installed',
48-
'build unit tests using the installed library.', False))
49-
vars.Add(EnumVariable('build',
50-
'compiler settings', 'fast',
51-
allowed_values=('debug', 'fast')))
52-
vars.Add(EnumVariable('tool',
53-
'C++ compiler toolkit to be used', 'default',
54-
allowed_values=('default', 'intelc')))
55-
vars.Add(BoolVariable('profile',
56-
'build with profiling information', False))
57-
vars.Add(BoolVariable('coverage',
58-
'build for code coverage analysis', False))
59-
vars.Add(PathVariable('prefix',
60-
'installation prefix directory', '/usr/local'))
45+
vars.Add(PathVariable(
46+
'prefix',
47+
'installation prefix directory',
48+
'/usr/local'))
6149
vars.Update(env)
62-
vars.Add(PathVariable('libdir',
63-
'object code library directory [prefix/lib]',
50+
vars.Add(PathVariable(
51+
'libdir',
52+
'installation directory for compiled library [prefix/lib]',
6453
env['prefix'] + '/lib',
6554
PathVariable.PathAccept))
66-
vars.Add(PathVariable('includedir',
55+
vars.Add(PathVariable(
56+
'includedir',
6757
'installation directory for C++ header files [prefix/include]',
6858
env['prefix'] + '/include',
6959
PathVariable.PathAccept))
70-
vars.Add(PathVariable('datadir',
60+
vars.Add(PathVariable(
61+
'datadir',
7162
'installation directory for architecture independent data [prefix/share]',
7263
env['prefix'] + '/share',
7364
PathVariable.PathAccept))
74-
vars.Add(BoolVariable('enable_objcryst',
65+
vars.Add(EnumVariable(
66+
'build',
67+
'compiler settings',
68+
'fast', allowed_values=('debug', 'fast')))
69+
vars.Add(EnumVariable(
70+
'tool',
71+
'C++ compiler toolkit to be used',
72+
'default', allowed_values=('default', 'intelc')))
73+
vars.Add(BoolVariable(
74+
'enable_objcryst',
7575
'enable objcryst support, when installed', None))
76+
vars.Add(BoolVariable(
77+
'profile',
78+
'build with profiling information', False))
79+
vars.Add(BoolVariable(
80+
'coverage',
81+
'build for code coverage analysis', False))
82+
vars.Add(
83+
'tests',
84+
'fixed-string patterns for selecting unit tests', None)
85+
vars.Add(BoolVariable(
86+
'test_installed',
87+
'build tests using the installed library.', False))
7688
vars.Update(env)
7789
env.Help(MY_SCONS_HELP % vars.GenerateHelpText(env))
7890

0 commit comments

Comments
 (0)