Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Side by Side Diff: pylib/gyp/generator/scons.py

Issue 256020: Make scons 'loadable_module' output consistent with make output location... (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: '' Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « pylib/gyp/generator/make.py ('k') | test/module/gyptest-default.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 2
3 3
4 import gyp 4 import gyp
5 import gyp.common 5 import gyp.common
6 import gyp.SCons as SCons 6 import gyp.SCons as SCons
7 import os.path 7 import os.path
8 import pprint 8 import pprint
9 import re 9 import re
10 10
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 env.Precious(*result) 704 env.Precious(*result)
705 return result 705 return result
706 706
707 def GypLibrary(env, target, source, *args, **kw): 707 def GypLibrary(env, target, source, *args, **kw):
708 source = compilable_files(env, source) 708 source = compilable_files(env, source)
709 result = env.Library('$LIB_DIR/' + str(target), source, *args, **kw) 709 result = env.Library('$LIB_DIR/' + str(target), source, *args, **kw)
710 return result 710 return result
711 711
712 def GypLoadableModule(env, target, source, *args, **kw): 712 def GypLoadableModule(env, target, source, *args, **kw):
713 source = compilable_files(env, source) 713 source = compilable_files(env, source)
714 result = env.LoadableModule(target, source, *args, **kw) 714 result = env.LoadableModule('$TOP_BUILDDIR/' + str(target), source, *args,
715 **kw)
715 return result 716 return result
716 717
717 def GypStaticLibrary(env, target, source, *args, **kw): 718 def GypStaticLibrary(env, target, source, *args, **kw):
718 source = compilable_files(env, source) 719 source = compilable_files(env, source)
719 result = env.StaticLibrary('$LIB_DIR/' + str(target), source, *args, **kw) 720 result = env.StaticLibrary('$LIB_DIR/' + str(target), source, *args, **kw)
720 return result 721 return result
721 722
722 def GypSharedLibrary(env, target, source, *args, **kw): 723 def GypSharedLibrary(env, target, source, *args, **kw):
723 source = compilable_files(env, source) 724 source = compilable_files(env, source)
724 result = env.SharedLibrary('$LIB_DIR/' + str(target), source, *args, **kw) 725 result = env.SharedLibrary('$LIB_DIR/' + str(target), source, *args, **kw)
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 bf, target = gyp.common.BuildFileAndTarget('', t)[:2] 973 bf, target = gyp.common.BuildFileAndTarget('', t)[:2]
973 target_filename = TargetFilename(target, bf, options.suffix) 974 target_filename = TargetFilename(target, bf, options.suffix)
974 tpath = gyp.common.RelativePath(target_filename, output_dir) 975 tpath = gyp.common.RelativePath(target_filename, output_dir)
975 sconscript_files[target] = tpath 976 sconscript_files[target] = tpath
976 977
977 output_filename = output_path(output_filename) 978 output_filename = output_path(output_filename)
978 if sconscript_files: 979 if sconscript_files:
979 GenerateSConscriptWrapper(build_file, data[build_file], basename, 980 GenerateSConscriptWrapper(build_file, data[build_file], basename,
980 output_filename, sconscript_files, 981 output_filename, sconscript_files,
981 default_configuration) 982 default_configuration)
OLDNEW
« no previous file with comments | « pylib/gyp/generator/make.py ('k') | test/module/gyptest-default.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698