diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 18:34:15 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 18:34:15 +0000 |
| commit | 57cacdcb68145bce3b1eaaa7c8c36706fec8ccca (patch) | |
| tree | c40093e156b99b04720d2eba27ddf71ba47ea1ea | |
| parent | 979563530f75f0005ccdd9704d698467a457200e (diff) | |
| download | chromium_src-57cacdcb68145bce3b1eaaa7c8c36706fec8ccca.zip chromium_src-57cacdcb68145bce3b1eaaa7c8c36706fec8ccca.tar.gz chromium_src-57cacdcb68145bce3b1eaaa7c8c36706fec8ccca.tar.bz2 | |
Fixed bug in samples conversion introduced by WebGL-related changes and
caught by Linux try bots. Need to specify a different output than the
non-WebGL target for the same asset, because otherwise multithreaded builds
choose one or the other target to execute.
BUG=none
TEST=reran build
Review URL: http://codereview.chromium.org/1723019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45837 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | o3d/samples/samples_gen.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/o3d/samples/samples_gen.py b/o3d/samples/samples_gen.py index c0386db..953f202 100644 --- a/o3d/samples/samples_gen.py +++ b/o3d/samples/samples_gen.py @@ -97,7 +97,12 @@ def write_action(asset, webgl_mode): if webgl_mode: name = name + "_webgl" output = asset['path'].replace('convert_', '') - output = posixpath.splitext(output)[0] + ".o3dtgz" + 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) @@ -125,7 +130,10 @@ def write_action(asset, webgl_mode): 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']) - output_file.write(" '<(_outputs)',\n") + if webgl_mode: + output_file.write(" '%s',\n" % output_tgz) + else: + output_file.write(" '<(_outputs)',\n") output_file.write(" ],\n") output_file.write(" },\n") |