summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 23:42:53 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 23:42:53 +0000
commit6cee8d02b52a4bc37ced00fbd993c0a828eb513a (patch)
tree0830efd196fa922bf905572c7a587673de639b91
parente739a367121f29e64a8c0a0b386fe487d7b52e87 (diff)
downloadchromium_src-6cee8d02b52a4bc37ced00fbd993c0a828eb513a.zip
chromium_src-6cee8d02b52a4bc37ced00fbd993c0a828eb513a.tar.gz
chromium_src-6cee8d02b52a4bc37ced00fbd993c0a828eb513a.tar.bz2
Worked around bug in directory copying support in gyp MSVS generator
by enumerating all files needing to be copied. BUG=none TEST=built on Windows TBR=gman Review URL: http://codereview.chromium.org/1695030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46012 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/samples/samples.gyp63
1 files changed, 59 insertions, 4 deletions
diff --git a/o3d/samples/samples.gyp b/o3d/samples/samples.gyp
index 57a3f87..0ff5b84 100644
--- a/o3d/samples/samples.gyp
+++ b/o3d/samples/samples.gyp
@@ -80,6 +80,9 @@
},
],
},
+ # TODO(kbr): change these back to using the directory copying
+ # syntax ("o3d-webgl/"), and roll forward gyp in DEPS, once the
+ # bug in the MSVS gyp generator causing it to crash is fixed.
{
# TODO(petersont): tie in the copying of these to the doc
# generation process, compile the sources, etc.
@@ -87,9 +90,48 @@
'type': 'none',
'copies': [
{
- 'destination': '<(PRODUCT_DIR)/samples',
+ 'destination': '<(PRODUCT_DIR)/samples/o3d-webgl',
'files': [
- 'o3d-webgl/',
+ 'o3d-webgl/archive_request.js',
+ 'o3d-webgl/base.js',
+ 'o3d-webgl/bitmap.js',
+ 'o3d-webgl/bounding_box.js',
+ 'o3d-webgl/buffer.js',
+ 'o3d-webgl/clear_buffer.js',
+ 'o3d-webgl/client.js',
+ 'o3d-webgl/draw_context.js',
+ 'o3d-webgl/draw_element.js',
+ 'o3d-webgl/draw_list.js',
+ 'o3d-webgl/draw_pass.js',
+ 'o3d-webgl/effect.js',
+ 'o3d-webgl/element.js',
+ 'o3d-webgl/event.js',
+ 'o3d-webgl/field.js',
+ 'o3d-webgl/file_request.js',
+ 'o3d-webgl/material.js',
+ 'o3d-webgl/named_object.js',
+ 'o3d-webgl/named_object_base.js',
+ 'o3d-webgl/object_base.js',
+ 'o3d-webgl/pack.js',
+ 'o3d-webgl/param.js',
+ 'o3d-webgl/param_object.js',
+ 'o3d-webgl/primitive.js',
+ 'o3d-webgl/raw_data.js',
+ 'o3d-webgl/ray_intersection_info.js',
+ 'o3d-webgl/render_node.js',
+ 'o3d-webgl/render_surface.js',
+ 'o3d-webgl/render_surface_set.js',
+ 'o3d-webgl/sampler.js',
+ 'o3d-webgl/shape.js',
+ 'o3d-webgl/state.js',
+ 'o3d-webgl/state_set.js',
+ 'o3d-webgl/stream.js',
+ 'o3d-webgl/stream_bank.js',
+ 'o3d-webgl/texture.js',
+ 'o3d-webgl/transform.js',
+ 'o3d-webgl/tree_traversal.js',
+ 'o3d-webgl/types.js',
+ 'o3d-webgl/viewport.js',
]
},
],
@@ -103,9 +145,22 @@
'type': 'none',
'copies': [
{
- 'destination': '<(PRODUCT_DIR)/samples',
+ 'destination': '<(PRODUCT_DIR)/samples/o3d-webgl-samples',
+ 'files': [
+ 'o3d-webgl-samples/culling.html',
+ 'o3d-webgl-samples/hellocube-colors.html',
+ 'o3d-webgl-samples/hellocube-textures.html',
+ 'o3d-webgl-samples/hellocube.html',
+ 'o3d-webgl-samples/helloworld.html',
+ 'o3d-webgl-samples/pool.html',
+ 'o3d-webgl-samples/primitives.html',
+ 'o3d-webgl-samples/shadow-map.html',
+ ]
+ },
+ {
+ 'destination': '<(PRODUCT_DIR)/samples/o3d-webgl-samples/simpleviewer',
'files': [
- 'o3d-webgl-samples/',
+ 'o3d-webgl-samples/simpleviewer/simpleviewer.html',
]
},
],