Reorganized dependencies in generated samples_gen.gyp so that the...

samples/samples_gen.py

 #!/usr/bin/env python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import posixpath
 import sys
 import os.path
 
 output_filename = 'samples_gen.gyp'
@@ skipping 63 matching lines @@
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
   ],
   'targets': [
     {
-      'target_name': 'build_samples',
+      'target_name': 'convert_samples',
       'type': 'none',
       'dependencies': [
         '../converter/converter.gyp:o3dConverter',
       ],
       'actions': [\n""")
 
 def write_action(asset, webgl_mode):
   filename = posixpath.splitext(posixpath.basename(asset['path']))[0]
   filename = filename.replace('.','_')
   filename = filename.replace('-','_')
   filename = filename.lower()
   name = "convert_" + filename
   if webgl_mode:
     name = name + "_webgl"
   output = asset['path'].replace('convert_', '')
   output_base = posixpath.splitext(output)[0]
   output_tgz = output_base + ".o3dtgz"
   output_json = output_base + "/scene.json"
   output = output_tgz
   if webgl_mode:
     output = output_json
   output_dir = posixpath.dirname(output)
   output_file.write("        {\n")
   output_file.write("          'action_name': '%s',\n" % name)
   output_file.write("          'inputs': [\n")
   output_file.write("            '<(PRODUCT_DIR)/o3dConverter',\n")
-  output_file.write("            '../o3d_assets/samples/%s',\n" % asset['path'])
+  # TODO(kbr): there are a couple of problems with gyp's MSVC
+  # generator which require this workaround right now. First, if two
+  # actions have the same inputs then gyp will arbitrarily hang the
+  # custom build rule off the second input, and the collision will
+  # currently cause one or the other rule to be dropped. Second, if we
+  # just insert a fake second input, without removing the .zip, then
+  # for some reason the .zip ends up in an "_excluded_files" folder in
+  # the project and the non-WebGL version of the asset won't be built.
+  # Here we use a different input for the WebGL version of the assets.
+  if webgl_mode:
+    output_file.write("            '../o3d_assets/samples/%s.fake_webgl_input.txt',\n" % asset['path'])
+  else:
+    output_file.write("            '../o3d_assets/samples/%s',\n" % asset['path'])
   output_file.write("          ],\n")
   output_file.write("          'outputs': [\n")
   if sys.platform[:5] == 'linux':
     # TODO(gspencer): This is a HACK!  We shouldn't need to put the
     # absolute path here, but currently on Linux (scons), it is unable
     # to copy generated items out of the source tree (because the
     # repository mojo fails to find it and puts in the wrong path).
     output_file.write("            '%s',\n" % posixpath.abspath(output))
   else:
     output_file.write("            '../samples/%s',\n" % output)
   output_file.write("          ],\n")
   output_file.write("          'action': [\n")
   output_file.write("            '<(PRODUCT_DIR)/o3dConverter',\n")
   output_file.write("            '--no-condition',\n")
   output_file.write("            '--up-axis=%s',\n" % asset['up'])
   if webgl_mode:
     output_file.write("            '--no-binary',\n")
     output_file.write("            '--no-archive',\n")
     output_file.write("            '--convert-dds-to-png',\n")
     output_file.write("            '--convert-cg-to-glsl',\n")
   output_file.write("            '../o3d_assets/samples/%s',\n" % asset['path'])
   if webgl_mode:
     output_file.write("            '../samples/%s',\n" % output_tgz)
   else:
     output_file.write("            '<(_outputs)',\n")
   output_file.write("          ],\n")
   output_file.write("        },\n")
 
 for asset in assets:
-  write_action(asset, False);
+  write_action(asset, False)
   if asset.has_key('webgl'):
-    write_action(asset, True);
+    write_action(asset, True)
 
-output_file.write("      ],\n")
+output_file.write("""      ],
+    },
+    {
+      'target_name': 'copy_samples',
+      'type': 'none',
+      'dependencies': [
+        'convert_samples',
+      ],
+      'copies': [\n""")
 
 # Coalesce copies by directory so we don't have tons of copies rules
 # to parse.
 copies = {}
 for asset in assets:
   output = asset['path'].replace('convert_', '')
   output = posixpath.splitext(output)[0] + ".o3dtgz"
   output_dir = posixpath.dirname(output)
   if output_dir in copies:
     # Make sure we don't add any twice.
@@ skipping 11 matching lines @@
   js_files = ["o3djs/" + f for f in js_files]
   items = items + js_files
 for item in items:
   item_dir = posixpath.dirname(item)
   if item_dir in copies:
     if not item in copies[item_dir]:
       copies[item_dir] += [item]
   else:
     copies[item_dir] = [item]
 
-output_file.write("      'copies': [\n")
 for (dir, paths) in copies.items():
   output_file.write("        {\n")
   output_file.write("          'destination': " \
                     "'<(PRODUCT_DIR)/samples/%s',\n" % dir)
   output_file.write("          'files': [\n")
   for path in paths:
     if sys.platform[:5] == 'linux':
       # TODO(gspencer): This is a HACK!  We shouldn't need to put the
       # absolute path here, but currently on Linux (scons), it is unable
       # to copy generated items out of the source tree (because the
       # repository mojo fails to find it and puts in the wrong path).
       output_file.write("            '%s',\n" % posixpath.abspath(path))
     else:
       output_file.write("            '../samples/%s',\n" % path)
   output_file.write("          ],\n")
   output_file.write("        },\n")
 
 output_file.write("      ],\n")
 output_file.write("    },\n")
+output_file.write("""    {
+      'target_name': 'build_samples',
+      'type': 'none',
+      'dependencies': [
+        'copy_samples',
+      ],
+    },\n""")
 output_file.write("  ],\n")
 output_file.write("}\n")
 
 print output_filename
 sys.exit(0)