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

Side by Side Diff: gyp_skia

Issue 317903002: Change default generators on windows to include msvs-ninja rather than msvs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 6 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
« no previous file with comments | « no previous file | no next file » | 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 # Copyright 2011 The Android Open Source Project 3 # Copyright 2011 The Android Open Source Project
4 # 4 #
5 # Use of this source code is governed by a BSD-style license that can be 5 # Use of this source code is governed by a BSD-style license that can be
6 # found in the LICENSE file. 6 # found in the LICENSE file.
7 7
8 # This script is a wrapper which invokes gyp with the correct --depth argument, 8 # This script is a wrapper which invokes gyp with the correct --depth argument,
9 # and supports the automatic regeneration of build files if all.gyp is 9 # and supports the automatic regeneration of build files if all.gyp is
10 # changed (Linux-only). 10 # changed (Linux-only).
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 if __name__ == '__main__': 78 if __name__ == '__main__':
79 args = sys.argv[1:] 79 args = sys.argv[1:]
80 80
81 if not os.getenv(ENVVAR_GYP_GENERATORS): 81 if not os.getenv(ENVVAR_GYP_GENERATORS):
82 print ('%s environment variable not set, using default' % 82 print ('%s environment variable not set, using default' %
83 ENVVAR_GYP_GENERATORS) 83 ENVVAR_GYP_GENERATORS)
84 if sys.platform.startswith('darwin'): 84 if sys.platform.startswith('darwin'):
85 default_gyp_generators = 'ninja,xcode' 85 default_gyp_generators = 'ninja,xcode'
86 elif sys.platform.startswith('win'): 86 elif sys.platform.startswith('win'):
87 default_gyp_generators = 'ninja,msvs' 87 default_gyp_generators = 'ninja,msvs-ninja'
88 elif sys.platform.startswith('cygwin'): 88 elif sys.platform.startswith('cygwin'):
89 default_gyp_generators = 'ninja,msvs' 89 default_gyp_generators = 'ninja,msvs-ninja'
90 else: 90 else:
91 default_gyp_generators = 'ninja' 91 default_gyp_generators = 'ninja'
92 os.environ[ENVVAR_GYP_GENERATORS] = default_gyp_generators 92 os.environ[ENVVAR_GYP_GENERATORS] = default_gyp_generators
93 print '%s is "%s"' % (ENVVAR_GYP_GENERATORS, os.getenv(ENVVAR_GYP_GENERATORS)) 93 print '%s is "%s"' % (ENVVAR_GYP_GENERATORS, os.getenv(ENVVAR_GYP_GENERATORS))
94 94
95 # Set CWD to the directory containing this script. 95 # Set CWD to the directory containing this script.
96 # This allows us to launch it from other directories, in spite of gyp's 96 # This allows us to launch it from other directories, in spite of gyp's
97 # finickyness about the current working directory. 97 # finickyness about the current working directory.
98 # See http://b.corp.google.com/issue?id=5019517 ('Linux make build 98 # See http://b.corp.google.com/issue?id=5019517 ('Linux make build
99 # (from out dir) no longer runs skia_gyp correctly') 99 # (from out dir) no longer runs skia_gyp correctly')
(...skipping 28 matching lines...) Expand all
128 128
129 print 'Updating projects from gyp files...' 129 print 'Updating projects from gyp files...'
130 sys.stdout.flush() 130 sys.stdout.flush()
131 131
132 if '--dry-run' in args: 132 if '--dry-run' in args:
133 args.remove('--dry-run') 133 args.remove('--dry-run')
134 print gyp_source_dir, ' '.join(args) 134 print gyp_source_dir, ' '.join(args)
135 else: 135 else:
136 # Off we go... 136 # Off we go...
137 sys.exit(gyp.main(args)) 137 sys.exit(gyp.main(args))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698