gyp_skia: make default GYP_GENERATORS for each platform explicit

gyp_skia

Index: gyp_skia
diff --git a/gyp_skia b/gyp_skia
index b4f9e74de9d345275644fc0d70a69ef404cf78b7..05ddd5a8b827253f93fd12961bb55aa62af6c551 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -28,6 +28,9 @@ gyp_config_dir = os.path.join(script_dir, 'gyp')
 sys.path.insert(0, os.path.join(gyp_source_dir, 'pylib'))
 import gyp
 
+ENVVAR_GYP_GENERATORS = 'GYP_GENERATORS'
+
+
 def additional_include_files(args=[]):
   # Determine the include files specified on the command line.
   # This doesn't cover all the different option formats you can use,
@@ -62,9 +65,9 @@ def get_output_dir():
   if not output_dir:
     return os.path.join(os.path.abspath(script_dir), 'out')
 
-  if (sys.platform.startswith('darwin') and 
-      (not os.getenv('GYP_GENERATORS') or 
-       'xcode' in os.getenv('GYP_GENERATORS'))):
+  if (sys.platform.startswith('darwin') and
+      (not os.getenv(ENVVAR_GYP_GENERATORS) or
+       'xcode' in os.getenv(ENVVAR_GYP_GENERATORS))):
     print 'ERROR: variable SKIA_OUT is not valid on Mac (using xcodebuild)'
     sys.exit(-1);
 
@@ -77,6 +80,18 @@ def get_output_dir():
 if __name__ == '__main__':
   args = sys.argv[1:]
 
+  if not os.getenv(ENVVAR_GYP_GENERATORS):

[epoger, 2014/03/20 19:15:26]

gyp already picks a default generator per-platform if it isn't specified; this
just makes it explicit, and keeps it under our control.

My hope is to change this to "ninja" in most cases, but for now, I just wanted
to make it explicit but unchanged.

[bungeman-skia, 2014/03/20 19:20:49]

This is what gyp does
https://code.google.com/p/gyp/source/browse/trunk/pylib/gyp/__init__.py#368 . It
adds cygwin, which may or may not be of interest to those out there who may be
using it.

+    print ('%s environment variable not set, using default' %
+           ENVVAR_GYP_GENERATORS)
+    if sys.platform.startswith('darwin'):
+      default_gyp_generators = 'xcode'
+    elif sys.platform.startswith('win'):
+      default_gyp_generators = 'msvs'
+    else:
+      default_gyp_generators = 'make'
+    os.environ[ENVVAR_GYP_GENERATORS] = default_gyp_generators
+  print '%s is "%s"' % (ENVVAR_GYP_GENERATORS, os.getenv(ENVVAR_GYP_GENERATORS))
+
   # Set CWD to the directory containing this script.
   # This allows us to launch it from other directories, in spite of gyp's
   # finickyness about the current working directory.