pylib/gyp/generator/ninja.py - Issue 629543002: Add Ninja support for MSVS $(TargetExt), $(TargetFileName) and $(TargetPath) macros.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pylib/gyp/generator/ninja.py

Issue 629543002: Add Ninja support for MSVS $(TargetExt), $(TargetFileName) and $(TargetPath) macros. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk

Patch Set: Reuse dictionary from MSVSUtil. Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pylib/gyp/generator/ninja.py

diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py

index 677ce3c2650737acb52945887c745323d1969a0d..63c12286c2b58fbe7c4fcf52fb80cbe2b9ea4f7a 100644

--- a/pylib/gyp/generator/ninja.py

+++ b/pylib/gyp/generator/ninja.py

@@ -1526,12 +1526,13 @@ def CalculateVariables(default_variables, params):

generator_extra_sources_for_rules = getattr(xcode_generator,

'generator_extra_sources_for_rules', [])

elif flavor == 'win':

+ exts = gyp.MSVSUtil.TARGET_TYPE_EXT

default_variables.setdefault('OS', 'win')

- default_variables['EXECUTABLE_SUFFIX'] = '.exe'

+ default_variables['EXECUTABLE_SUFFIX'] = '.' + exts['executable']

default_variables['STATIC_LIB_PREFIX'] = ''

- default_variables['STATIC_LIB_SUFFIX'] = '.lib'

+ default_variables['STATIC_LIB_SUFFIX'] = '.' + exts['static_library']

default_variables['SHARED_LIB_PREFIX'] = ''

- default_variables['SHARED_LIB_SUFFIX'] = '.dll'

+ default_variables['SHARED_LIB_SUFFIX'] = '.' + exts['shared_library']

# Copy additional generator configuration data from VS, which is shared

# by the Windows Ninja generator.

« no previous file with comments | « pylib/gyp/MSVSUtil.py ('k') | pylib/gyp/msvs_emulation.py » ('j') | no next file with comments »