Hi Bo,
AFAICS you almost closed the gap between scons 1.4.X and scons 1.5.0
completely.
If we ignore all 1.5.0-specific stuff (iconv, wchar, boost), there are
only three differences left (which may be there on purpose). Please note
that the diff below was produced mechanically. I didn't even try to
understand why there is a difference!
Thanks a lot!
Michael
if platform_name in ['win32', 'cygwin']:
# the final link step needs stdc++ to succeed under mingw
# FIXME: shouldn't g++ automatically link to stdc++?
if use_vc:
- system_libs = ['ole32', 'shlwapi', 'shell32', 'advapi32', 'zdll']
+ system_libs += ['ole32', 'shlwapi', 'shell32', 'advapi32', 'zdll']
else:
- system_libs = ['shlwapi', 'stdc++', 'z']
+ system_libs += ['shlwapi', 'stdc++', 'z']
elif platform_name == 'cygwin' and env['X11']:
- system_libs = ['GL', 'Xmu', 'Xi', 'Xrender', 'Xrandr', 'Xcursor',
- 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE',
'resolv',
- 'pthread', 'z']
+ system_libs += ['GL', 'Xmu', 'Xi', 'Xrender', 'Xrandr',
+ 'Xcursor', 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11',
'SM', 'ICE',
+ 'resolv', 'pthread', 'z']
else:
- system_libs = ['z']
+ system_libs += ['z']
@@ -1344,7 +1415,7 @@
]
for lib in libs:
- if env[lib[0]] and lib[1] is not None:
+ if env[lib[0]]:
system_libs.append(lib[1])
#
@@ -2127,6 +2285,12 @@
env.Install(postinstall_script, tmp_script)
Alias('install', postinstall_script)
+ # subst and install lyx2lyx_version.py which is not in
scons_manifest.py
+ env.Depends(share_dest_dir + '/lyx2lyx/lyx2lyx_version.py',
'$BUILDDIR/common/config.h')
+ env.substFile(share_dest_dir + '/lyx2lyx/lyx2lyx_version.py',
+ '$TOP_SRCDIR/lib/lyx2lyx/lyx2lyx_version.py.in')
+ Alias('install', share_dest_dir + '/lyx2lyx/lyx2lyx_version.py')
+
# man
env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix +
'.1'),
env.subst('$TOP_SRCDIR/lyx.man'))
