anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scons: fix rebuildTargetOnly for lyx msvs projects

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14180 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2006-06-22 15:46:35 +00:00
parent dbc5bf6f8a
commit b6e42797d4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development/scons/SConstruct
View File

@ -2065,7 +2065,7 @@ if build_lyx:
if build_msvs_projects: if build_msvs_projects:
def build_project(target, dir, full_target = None, def build_project(target, dir, full_target = None,
src_pattern = lyx_ext, include = [], resource = None, rebuild = True): src_pattern = lyx_ext, include = [], resource = None, rebuildTargetOnly = True):
''' build mavs project files ''' build mavs project files
target: alias (correspond to directory name) target: alias (correspond to directory name)
dir: source directory or directories (a list) dir: source directory or directories (a list)
@ -2073,7 +2073,7 @@ if build_msvs_projects:
src_pattern: glob pattern src_pattern: glob pattern
include: files to include into source include: files to include into source
resource: directory or directories with resource (.ui) files resource: directory or directories with resource (.ui) files
rebuild: whether or not only rebuild this target rebuildTargetOnly: whether or not only rebuild this target
For non-debug-able targets like static libraries, target (alias) is For non-debug-able targets like static libraries, target (alias) is
enough to build the target. For executable targets, msvs need to know enough to build the target. For executable targets, msvs need to know
@ -2084,7 +2084,7 @@ if build_msvs_projects:
build_dir = env.subst('$TOP_SRCDIR/'+resource)) build_dir = env.subst('$TOP_SRCDIR/'+resource))
else: else:
res = [] res = []
if rebuild: if rebuildTargetOnly:
cmds = 'faststart=yes rebuild='+target cmds = 'faststart=yes rebuild='+target
else: else:
cmds = 'faststart=yes' cmds = 'faststart=yes'
@ -2143,10 +2143,10 @@ if build_msvs_projects:
# #
build_project('qt4', 'src/frontends/qt4', resource = 'src/frontends/qt4/ui') build_project('qt4', 'src/frontends/qt4', resource = 'src/frontends/qt4/ui')
# #
build_project('client', 'src/client', rebuild=False, build_project('client', 'src/client', rebuildTargetOnly = False,
full_target = File(env.subst('$BUILDDIR/common/client/lyxclient$PROGSUFFIX')).abspath) full_target = File(env.subst('$BUILDDIR/common/client/lyxclient$PROGSUFFIX')).abspath)
# #
build_project('tex2lyx', 'src/tex2lyx', rebuild=False, build_project('tex2lyx', 'src/tex2lyx', rebuildTargetOnly = False,
full_target = File(env.subst('$BUILDDIR/common/tex2lyx/tex2lyx$PROGSUFFIX')).abspath) full_target = File(env.subst('$BUILDDIR/common/tex2lyx/tex2lyx$PROGSUFFIX')).abspath)
# #
build_project('lyxbase', 'src') build_project('lyxbase', 'src')
@ -2155,11 +2155,13 @@ if build_msvs_projects:
build_project('lyx', ['src', 'src/support', 'src/mathed', 'src/insets', build_project('lyx', ['src', 'src/support', 'src/mathed', 'src/insets',
'src/frontends', 'src/graphics', 'src/frontends/controllers', 'src/frontends', 'src/graphics', 'src/frontends/controllers',
'src/frontends/qt3'], resource = 'src/frontends/qt3/ui', 'src/frontends/qt3'], resource = 'src/frontends/qt3/ui',
rebuildTargetOnly = False,
full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath) full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath)
else: else:
build_project('lyx', ['src', 'src/support', 'src/mathed', 'src/insets', build_project('lyx', ['src', 'src/support', 'src/mathed', 'src/insets',
'src/frontends', 'src/graphics', 'src/frontends/controllers', 'src/frontends', 'src/graphics', 'src/frontends/controllers',
'src/frontends/qt4'], resource = 'src/frontends/qt4/ui', 'src/frontends/qt4'], resource = 'src/frontends/qt4/ui',
rebuildTargetOnly = False,
full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath) full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath)