Change build to only have one place to list

o3djs files and build / selenium to use
compiled o3djs libs.

Review URL: http://codereview.chromium.org/353017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30838 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 239 insertions, 378 deletions

diff --git a/o3d/documentation/build_docs.py b/o3d/documentation/build_docs.py
index 3022922..8d56d43 100755
--- a/o3d/documentation/build_docs.py
+++ b/o3d/documentation/build_docs.py
@@ -96,65 +96,6 @@ def MakeCommandName(name):
   return name
 
 
-def UpdateGlobals(dict):
-  """Copies pairs from dict into GlobalDict."""
-  for i, v in dict.items():
-    GlobalsDict.__setitem__(i, v)
-
-
-def GetCallingNamespaces():
-  """Return the locals and globals for the function that called
-  into this module in the current call stack."""
-  try: 1/0
-  except ZeroDivisionError:
-    # Don't start iterating with the current stack-frame to
-    # prevent creating reference cycles (f_back is safe).
-    frame = sys.exc_info()[2].tb_frame.f_back
-
-  # Find the first frame that *isn't* from this file
-  while frame.f_globals.get("__name__") == __name__:
-    frame = frame.f_back
-
-  return frame.f_locals, frame.f_globals
-
-
-def ComputeExports(exports):
-  """Compute a dictionary of exports given one of the parameters
-  to the Export() function or the exports argument to SConscript()."""
-
-  loc, glob = GetCallingNamespaces()
-
-  retval = {}
-  try:
-    for export in exports:
-      if isinstance(export, types.DictType):
-        retval.update(export)
-      else:
-        try:
-          retval[export] = loc[export]
-        except KeyError:
-          retval[export] = glob[export]
-  except KeyError, x:
-    raise Error, "Export of non-existent variable '%s'"%x
-
-  return retval
-
-
-def Export(*vars):
-  """Copies the named variables to GlobalDict."""
-  for var in vars:
-    UpdateGlobals(ComputeExports(vars))
-
-
-def Import(filename):
-  """Imports a python file in a scope with 'Export' defined."""
-  scope = {'__builtins__': globals()['__builtins__'],
-           'Export': Export}
-  file = open(filename, 'r')
-  exec file in scope
-  file.close()
-
-
 def Execute(args):
   """Executes an external program."""
   # Comment the next line in for debugging.
@@ -366,11 +307,11 @@ def main(argv):
   externs_path = MakePath('externs', 'externs.js')
   o3d_extra_externs_path = MakePath('externs', 'o3d-extra-externs.js')
 
-  Import(js_list_filename)
-  Import(idl_list_filename)
+  js_list = eval(open(js_list_filename, "r").read())
+  idl_list = eval(open(idl_list_filename, "r").read())
 
-  idl_files = AppendBasePath(idl_list_basepath, GlobalsDict['O3D_IDL_SOURCES'])
-  o3djs_files = AppendBasePath(js_list_basepath, GlobalsDict['O3D_JS_SOURCES'])
+  idl_files = AppendBasePath(idl_list_basepath, idl_list)
+  o3djs_files = AppendBasePath(js_list_basepath, js_list)
 
   # we need to put base.js first?
   o3djs_files = (
@@ -380,7 +321,7 @@ def main(argv):
   docs_js_files = [os.path.join(
                        docs_js_outpath,
                        os.path.splitext(os.path.basename(f))[0] + '.js')
-                   for f in GlobalsDict['O3D_IDL_SOURCES']]
+                   for f in idl_list]
 
   DeleteOldDocs(MakePath(docs_outpath))
   BuildJavaScriptForDocsFromIDLs(idl_files, docs_js_outpath)
diff --git a/o3d/documentation/documentation.gyp b/o3d/documentation/documentation.gyp
index fbba4a6..1d697e0 100644
--- a/o3d/documentation/documentation.gyp
+++ b/o3d/documentation/documentation.gyp
@@ -75,6 +75,14 @@
                 ],
               },
             ],
+            'copies': [
+              {
+                'destination': '<(PRODUCT_DIR)/samples/o3djs',
+                'files': [
+                  '<(PRODUCT_DIR)/docs/documentation/base.js',
+                ],
+              },
+            ],
           },
         ],
       },
diff --git a/o3d/documentation/get_docs_files.py b/o3d/documentation/get_docs_files.py
index 90fcefc..c138bc1 100644
--- a/o3d/documentation/get_docs_files.py
+++ b/o3d/documentation/get_docs_files.py
@@ -10,86 +10,24 @@ import sys
 import types

 

 

-GlobalsDict = { }

-

-

-def UpdateGlobals(dict):

-  """Copies pairs from dict into GlobalDict."""

-  for i, v in dict.items():

-    GlobalsDict.__setitem__(i, v)

-

-

 def AppendBasePath(folder, filenames):

   """Appends a base path to a ist of files"""

   return [os.path.join(folder, filename) for filename in filenames]

 

 

-def GetCallingNamespaces():

-  """Return the locals and globals for the function that called

-  into this module in the current call stack."""

-  try: 1/0

-  except ZeroDivisionError:

-    # Don't start iterating with the current stack-frame to

-    # prevent creating reference cycles (f_back is safe).

-    frame = sys.exc_info()[2].tb_frame.f_back

-

-  # Find the first frame that *isn't* from this file

-  while frame.f_globals.get("__name__") == __name__:

-    frame = frame.f_back

-

-  return frame.f_locals, frame.f_globals

-

-

-def ComputeExports(exports):

-  """Compute a dictionary of exports given one of the parameters

-  to the Export() function or the exports argument to SConscript()."""

-

-  loc, glob = GetCallingNamespaces()

-

-  retval = {}

-  try:

-    for export in exports:

-      if isinstance(export, types.DictType):

-        retval.update(export)

-      else:

-        try:

-          retval[export] = loc[export]

-        except KeyError:

-          retval[export] = glob[export]

-  except KeyError, x:

-    raise Error, "Export of non-existent variable '%s'"%x

-

-  return retval

-

-

-def Export(*vars):

-  """Copies the named variables to GlobalDict."""

-  for var in vars:

-    UpdateGlobals(ComputeExports(vars))

-

-

-def Import(filename):

-  """Imports a python file in a scope with 'Export' defined."""

-  scope = {'__builtins__': globals()['__builtins__'],

-           'Export': Export}

-  file = open(filename, 'r')

-  exec file in scope

-  file.close()

-

-

 def GetIdlFiles():

   idl_list_filename = os.path.join('..', 'plugin', 'idl_list.manifest')

   idl_list_basepath = os.path.dirname(idl_list_filename)

-  Import(idl_list_filename)

-  idl_files = AppendBasePath(idl_list_basepath, GlobalsDict['O3D_IDL_SOURCES'])

+  files = eval(open(idl_list_filename, "r").read())

+  idl_files = AppendBasePath(idl_list_basepath, files)

   return idl_files

 

 

 def GetJsFiles():

   js_list_filename = os.path.join('..', 'samples', 'o3djs', 'js_list.manifest')

   js_list_basepath = os.path.dirname(js_list_filename)

-  Import(js_list_filename)

-  o3djs_files = AppendBasePath(js_list_basepath, GlobalsDict['O3D_JS_SOURCES'])

+  files = eval(open(js_list_filename, "r").read())

+  o3djs_files = AppendBasePath(js_list_basepath, files)

   return o3djs_files

 

 

diff --git a/o3d/plugin/idl_list.manifest b/o3d/plugin/idl_list.manifest
index 579778e..9b4e73b 100644
--- a/o3d/plugin/idl_list.manifest
+++ b/o3d/plugin/idl_list.manifest
@@ -28,8 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-O3D_IDL_SOURCES = [
-  'idl/bitmap.idl',
+[ 'idl/bitmap.idl',
   'idl/bounding_box.idl',
   'idl/buffer.idl',
   'idl/canvas.idl',
@@ -89,4 +88,4 @@ O3D_IDL_SOURCES = [
   'idl/raw_data.idl',
 ]
 
-Export('O3D_IDL_SOURCES')
+
diff --git a/o3d/samples/MANIFEST b/o3d/samples/MANIFEST
index c331fcc..9bdc3cd 100644
--- a/o3d/samples/MANIFEST
+++ b/o3d/samples/MANIFEST
@@ -1,239 +1,211 @@
-archive-textures.html
-assets/android.png
-assets/archive_textures.o3dtgz
-assets/block.png
-assets/brush.png
-assets/dome1.o3dtgz
-assets/dome2.o3dtgz
-assets/dome3.o3dtgz
-assets/dome4.o3dtgz
-assets/egg.png
-assets/four_pixel.png
-assets/fullscreen.png
-assets/gauge.png
-assets/gaugeback.png
-assets/gears_init.js
-assets/google-square.png
-assets/hi.jpg
-assets/iconback.png
-assets/kitty_151_idle_stand05_cff1.o3dtgz
-assets/normalmap.dds
-assets/one-pixel-white.tga
-assets/old-school-shadow.png
-assets/orange-flower.png
-assets/part1.o3dtgz
-assets/part2.o3dtgz
-assets/part3.o3dtgz
-assets/particle-anim.png
-assets/pillar.png
-assets/purple-flower.png
-assets/radar.png
-assets/ripple.png
-assets/rock_bumps.jpg
-assets/rock_texture.jpg
-assets/seven_shapes.o3dtgz
-assets/shaving_cream.jpg
-assets/shaving_cream.png
-assets/shaving_cream_300x300.jpg
-assets/square.png
-assets/stencil_frame.o3dtgz
-assets/teapot.o3dtgz
-assets/teapot_vertices.js
-assets/texture_b3.jpg
-assets/yard.o3dtgz
-beachdemo/assets/beachdemo.o3dtgz
-beachdemo/assets/beach-low-poly.o3dtgz
-beachdemo/assets/pe_fire.jpg
-beachdemo/assets/pe_mist.png
-beachdemo/assets/sky-cubemap.dds
-beachdemo/beachdemo.html
-beachdemo/beachdemo.js
-GoogleIO-2009/step01ex.html
-GoogleIO-2009/step02ex.html
-GoogleIO-2009/step03ex.html
-GoogleIO-2009/step04ex.html
-GoogleIO-2009/step05ex.html
-GoogleIO-2009/step06ex.html
-GoogleIO-2009/step07ex.html
-GoogleIO-2009/step08ex.html
-GoogleIO-2009/step09ex.html
-GoogleIO-2009/step10ex.html
-GoogleIO-2009/step11ex.html
-GoogleIO-2009/step12ex.html
-GoogleIO-2009/step13ex.html
-GoogleIO-2009/step14ex.html
-GoogleIO-2009/shaders/checker.shader
-GoogleIO-2009/assets/background.o3dtgz
-GoogleIO-2009/assets/character.o3dtgz
-GoogleIO-2009/assets/colorbar.png
-GoogleIO-2009/assets/style.css
-box2d-3d/box2d-3d.html
-box2d-3d/demos/LICENSE.txt
-box2d-3d/demos/README.o3d
-box2d-3d/demos/compound.js
-box2d-3d/demos/crank.js
-box2d-3d/demos/demo_base.js
-box2d-3d/demos/demos.js
-box2d-3d/demos/draw_world.js
-box2d-3d/demos/manager.js
-box2d-3d/demos/pendulum.js
-box2d-3d/demos/stack.js
-box2d-3d/demos/top.js
-box2d-3d/third_party/box2d/LICENSE.txt
-box2d-3d/third_party/box2d/README.o3d
-box2d-3d/third_party/box2d/box2d.js
-box2d-3d/third_party/prototype-1.6.0.2.js
-canvas-fonts.html
-checkers.html
-debugging.html
-fullscreen.html
-home-configurators/cb_images/cb_item_thumbnails.jpg
-home-configurators/cb_images/toolselector.gif
-home-configurators/cb_images/unbranded_bg.png
-home-configurators/cbassets/Agra_Rug.o3dtgz
-home-configurators/cbassets/Asimi_Rug.o3dtgz
-home-configurators/cbassets/Camden_Chair.o3dtgz
-home-configurators/cbassets/Elements_Bookshelf.o3dtgz
-home-configurators/cbassets/Ferrara_Rug.o3dtgz
-home-configurators/cbassets/House_Roofless.o3dtgz
-home-configurators/cbassets/Lounge_Chair.o3dtgz
-home-configurators/cbassets/Lounge_Chaise.o3dtgz
-home-configurators/cbassets/Lounge_Sofa.o3dtgz
-home-configurators/cbassets/Lounge_Storage_Ottoman.o3dtgz
-home-configurators/cbassets/Madison_Dining_Table.o3dtgz
-home-configurators/cbassets/Miles_Side_Chair.o3dtgz
-home-configurators/cbassets/Pullman_Bar_Stool.o3dtgz
-home-configurators/cbassets/Puzzle_TV_Stand.o3dtgz
-home-configurators/cbassets/Stow_Leather_Ottoman.o3dtgz
-home-configurators/cbassets/Tivoli_Dining_Table.o3dtgz
-home-configurators/cbassets/Tivoli_Miles_Dining_Set.o3dtgz
-home-configurators/cbassets/Troy_Chair.o3dtgz
-home-configurators/cbassets/Troy_Ottoman.o3dtgz
-home-configurators/cbassets/Troy_Sofa.o3dtgz
-home-configurators/cbassets/Troy_Storage_Ottoman.o3dtgz
-home-configurators/cbassets/Troy_Twin_Sleeper.o3dtgz
-home-configurators/deletetool.js
-home-configurators/homedesigner.html
-home-configurators/movetool.js
-home-configurators/orbittool.js
-home-configurators/pantool.js
-home-configurators/rotatetool.js
-home-configurators/viewer.js
-home-configurators/zoomtool.js
-io/README.txt
-io/actors/actor.js
-io/actors/arrow.js
-io/actors/avatar.js
-io/actors/coin.js
-io/actors/horizontalpad.js
-io/actors/mover.js
-io/actors/spikem.js
-io/actors/verticalpad.js
-io/autoincludes.js
-io/cutscenes.js
-io/dynamic_lights.js
-io/editor.html
-io/gamelogic.js
-io/init.js
-io/io.html
-io/levels/all_actors.js
-io/levels/all_actors.skp
-io/levels/all_actors.o3dtgz
-io/levels/map1.js
-io/levels/map1.skp
-io/levels/map1.o3dtgz
-io/levels/starter_level.skp
-io/sound/_MISS.mp3
-io/sound/_PUNCH.mp3
-io/sound/_SMASH.mp3
-io/sound/_woosh.mp3
-io/sound/ah.mp3
-io/sound/arrow.mp3
-io/sound/coin_3.mp3
-io/sound/music.mp3
-io/sound/page.mp3
-io/sound/soundplayer.js
-io/sound/soundplayer.swf
-io/sound/step1.mp3
-io/sound/step2.mp3
-io/sound/step3.mp3
-io/sound/ug.mp3
-io/ui/bgtile.jpg
-io/ui/book_capbottom.jpg
-io/ui/book_capleft.jpg
-io/ui/book_capright.jpg
-io/ui/book_captop.jpg
-io/ui/book_cover.jpg
-io/ui/book_innercover.jpg
-io/ui/book_page1.jpg
-io/ui/book_page2.jpg
-io/ui/book_page3.jpg
-io/ui/book_pageblank.jpg
-io/ui/covershadow.png
-io/ui/io.css
-io/ui/logo.gif
-io/ui/scrollwork.gif
-o3djs/arcball.js
-o3djs/base.js
-o3djs/camera.js
-o3djs/canvas.js
-o3djs/debug.js
-o3djs/dump.js
-o3djs/effect.js
-o3djs/element.js
-o3djs/error.js
-o3djs/event.js
-o3djs/fps.js
-o3djs/io.js
-o3djs/loader.js
-o3djs/material.js
-o3djs/math.js
-o3djs/pack.js
-o3djs/particles.js
-o3djs/performance.js
-o3djs/picking.js
-o3djs/primitives.js
-o3djs/quaternions.js
-o3djs/rendergraph.js
-o3djs/scene.js
-o3djs/serialization.js
-o3djs/shape.js
-o3djs/simple.js
-o3djs/test.js
-o3djs/texture.js
-o3djs/util.js
-pingpong/instructions.gif
-pingpong/logo.gif
-pingpong/o3dPingPong.html
-shaders/README
-shaders/billboard.shader
-shaders/binormal.shader
-shaders/bump.shader
-shaders/checker.shader
-shaders/diffuse.shader
-shaders/green-blue-checker.shader
-shaders/imposter.shader
-shaders/one-channel-texture.shader
-shaders/normal.shader
-shaders/phong-vertex-anim.shader
-shaders/phong-with-colormult.shader
-shaders/solid-color.shader
-shaders/tangent.shader
-shaders/texture-colormult.shader
-shaders/texture-only.shader
-shaders/toon.shader
-shaders/vertex-color.shader
-shaders/yuv2rgb.shader
-shadow-map.html
-simpleviewer/assets/cube.o3dtgz
-simpleviewer/simpleviewer.html
-trends/assets/clouds.jpg
-trends/assets/earth-large-with-ocean-mask.png
-trends/assets/earth-large.jpg
-trends/assets/earth.jpg
-trends/assets/energy.png
-trends/assets/moon.jpg
-trends/assets/night-large.jpg
-trends/assets/night.jpg
-trends/trends.html
-yuv2rgb.html
+[ 'archive-textures.html',
+  'assets/android.png',
+  'assets/archive_textures.o3dtgz',
+  'assets/block.png',
+  'assets/brush.png',
+  'assets/dome1.o3dtgz',
+  'assets/dome2.o3dtgz',
+  'assets/dome3.o3dtgz',
+  'assets/dome4.o3dtgz',
+  'assets/egg.png',
+  'assets/four_pixel.png',
+  'assets/fullscreen.png',
+  'assets/gauge.png',
+  'assets/gaugeback.png',
+  'assets/gears_init.js',
+  'assets/google-square.png',
+  'assets/hi.jpg',
+  'assets/iconback.png',
+  'assets/kitty_151_idle_stand05_cff1.o3dtgz',
+  'assets/normalmap.dds',
+  'assets/one-pixel-white.tga',
+  'assets/old-school-shadow.png',
+  'assets/orange-flower.png',
+  'assets/part1.o3dtgz',
+  'assets/part2.o3dtgz',
+  'assets/part3.o3dtgz',
+  'assets/particle-anim.png',
+  'assets/pillar.png',
+  'assets/purple-flower.png',
+  'assets/radar.png',
+  'assets/ripple.png',
+  'assets/rock_bumps.jpg',
+  'assets/rock_texture.jpg',
+  'assets/seven_shapes.o3dtgz',
+  'assets/shaving_cream.jpg',
+  'assets/shaving_cream.png',
+  'assets/shaving_cream_300x300.jpg',
+  'assets/square.png',
+  'assets/stencil_frame.o3dtgz',
+  'assets/teapot.o3dtgz',
+  'assets/teapot_vertices.js',
+  'assets/texture_b3.jpg',
+  'assets/yard.o3dtgz',
+  'beachdemo/assets/beachdemo.o3dtgz',
+  'beachdemo/assets/beach-low-poly.o3dtgz',
+  'beachdemo/assets/pe_fire.jpg',
+  'beachdemo/assets/pe_mist.png',
+  'beachdemo/assets/sky-cubemap.dds',
+  'beachdemo/beachdemo.html',
+  'beachdemo/beachdemo.js',
+  'GoogleIO-2009/step01ex.html',
+  'GoogleIO-2009/step02ex.html',
+  'GoogleIO-2009/step03ex.html',
+  'GoogleIO-2009/step04ex.html',
+  'GoogleIO-2009/step05ex.html',
+  'GoogleIO-2009/step06ex.html',
+  'GoogleIO-2009/step07ex.html',
+  'GoogleIO-2009/step08ex.html',
+  'GoogleIO-2009/step09ex.html',
+  'GoogleIO-2009/step10ex.html',
+  'GoogleIO-2009/step11ex.html',
+  'GoogleIO-2009/step12ex.html',
+  'GoogleIO-2009/step13ex.html',
+  'GoogleIO-2009/step14ex.html',
+  'GoogleIO-2009/shaders/checker.shader',
+  'GoogleIO-2009/assets/background.o3dtgz',
+  'GoogleIO-2009/assets/character.o3dtgz',
+  'GoogleIO-2009/assets/colorbar.png',
+  'GoogleIO-2009/assets/style.css',
+  'box2d-3d/box2d-3d.html',
+  'box2d-3d/demos/LICENSE.txt',
+  'box2d-3d/demos/README.o3d',
+  'box2d-3d/demos/compound.js',
+  'box2d-3d/demos/crank.js',
+  'box2d-3d/demos/demo_base.js',
+  'box2d-3d/demos/demos.js',
+  'box2d-3d/demos/draw_world.js',
+  'box2d-3d/demos/manager.js',
+  'box2d-3d/demos/pendulum.js',
+  'box2d-3d/demos/stack.js',
+  'box2d-3d/demos/top.js',
+  'box2d-3d/third_party/box2d/LICENSE.txt',
+  'box2d-3d/third_party/box2d/README.o3d',
+  'box2d-3d/third_party/box2d/box2d.js',
+  'box2d-3d/third_party/prototype-1.6.0.2.js',
+  'canvas-fonts.html',
+  'checkers.html',
+  'debugging.html',
+  'fullscreen.html',
+  'home-configurators/cb_images/cb_item_thumbnails.jpg',
+  'home-configurators/cb_images/toolselector.gif',
+  'home-configurators/cb_images/unbranded_bg.png',
+  'home-configurators/cbassets/Agra_Rug.o3dtgz',
+  'home-configurators/cbassets/Asimi_Rug.o3dtgz',
+  'home-configurators/cbassets/Camden_Chair.o3dtgz',
+  'home-configurators/cbassets/Elements_Bookshelf.o3dtgz',
+  'home-configurators/cbassets/Ferrara_Rug.o3dtgz',
+  'home-configurators/cbassets/House_Roofless.o3dtgz',
+  'home-configurators/cbassets/Lounge_Chair.o3dtgz',
+  'home-configurators/cbassets/Lounge_Chaise.o3dtgz',
+  'home-configurators/cbassets/Lounge_Sofa.o3dtgz',
+  'home-configurators/cbassets/Lounge_Storage_Ottoman.o3dtgz',
+  'home-configurators/cbassets/Madison_Dining_Table.o3dtgz',
+  'home-configurators/cbassets/Miles_Side_Chair.o3dtgz',
+  'home-configurators/cbassets/Pullman_Bar_Stool.o3dtgz',
+  'home-configurators/cbassets/Puzzle_TV_Stand.o3dtgz',
+  'home-configurators/cbassets/Stow_Leather_Ottoman.o3dtgz',
+  'home-configurators/cbassets/Tivoli_Dining_Table.o3dtgz',
+  'home-configurators/cbassets/Tivoli_Miles_Dining_Set.o3dtgz',
+  'home-configurators/cbassets/Troy_Chair.o3dtgz',
+  'home-configurators/cbassets/Troy_Ottoman.o3dtgz',
+  'home-configurators/cbassets/Troy_Sofa.o3dtgz',
+  'home-configurators/cbassets/Troy_Storage_Ottoman.o3dtgz',
+  'home-configurators/cbassets/Troy_Twin_Sleeper.o3dtgz',
+  'home-configurators/deletetool.js',
+  'home-configurators/homedesigner.html',
+  'home-configurators/movetool.js',
+  'home-configurators/orbittool.js',
+  'home-configurators/pantool.js',
+  'home-configurators/rotatetool.js',
+  'home-configurators/viewer.js',
+  'home-configurators/zoomtool.js',
+  'io/README.txt',
+  'io/actors/actor.js',
+  'io/actors/arrow.js',
+  'io/actors/avatar.js',
+  'io/actors/coin.js',
+  'io/actors/horizontalpad.js',
+  'io/actors/mover.js',
+  'io/actors/spikem.js',
+  'io/actors/verticalpad.js',
+  'io/autoincludes.js',
+  'io/cutscenes.js',
+  'io/dynamic_lights.js',
+  'io/editor.html',
+  'io/gamelogic.js',
+  'io/init.js',
+  'io/io.html',
+  'io/levels/all_actors.js',
+  'io/levels/all_actors.skp',
+  'io/levels/all_actors.o3dtgz',
+  'io/levels/map1.js',
+  'io/levels/map1.skp',
+  'io/levels/map1.o3dtgz',
+  'io/levels/starter_level.skp',
+  'io/sound/_MISS.mp3',
+  'io/sound/_PUNCH.mp3',
+  'io/sound/_SMASH.mp3',
+  'io/sound/_woosh.mp3',
+  'io/sound/ah.mp3',
+  'io/sound/arrow.mp3',
+  'io/sound/coin_3.mp3',
+  'io/sound/music.mp3',
+  'io/sound/page.mp3',
+  'io/sound/soundplayer.js',
+  'io/sound/soundplayer.swf',
+  'io/sound/step1.mp3',
+  'io/sound/step2.mp3',
+  'io/sound/step3.mp3',
+  'io/sound/ug.mp3',
+  'io/ui/bgtile.jpg',
+  'io/ui/book_capbottom.jpg',
+  'io/ui/book_capleft.jpg',
+  'io/ui/book_capright.jpg',
+  'io/ui/book_captop.jpg',
+  'io/ui/book_cover.jpg',
+  'io/ui/book_innercover.jpg',
+  'io/ui/book_page1.jpg',
+  'io/ui/book_page2.jpg',
+  'io/ui/book_page3.jpg',
+  'io/ui/book_pageblank.jpg',
+  'io/ui/covershadow.png',
+  'io/ui/io.css',
+  'io/ui/logo.gif',
+  'io/ui/scrollwork.gif',
+  'pingpong/instructions.gif',
+  'pingpong/logo.gif',
+  'pingpong/o3dPingPong.html',
+  'shaders/README',
+  'shaders/billboard.shader',
+  'shaders/binormal.shader',
+  'shaders/bump.shader',
+  'shaders/checker.shader',
+  'shaders/diffuse.shader',
+  'shaders/green-blue-checker.shader',
+  'shaders/imposter.shader',
+  'shaders/one-channel-texture.shader',
+  'shaders/normal.shader',
+  'shaders/phong-vertex-anim.shader',
+  'shaders/phong-with-colormult.shader',
+  'shaders/solid-color.shader',
+  'shaders/tangent.shader',
+  'shaders/texture-colormult.shader',
+  'shaders/texture-only.shader',
+  'shaders/toon.shader',
+  'shaders/vertex-color.shader',
+  'shaders/yuv2rgb.shader',
+  'shadow-map.html',
+  'simpleviewer/assets/cube.o3dtgz',
+  'simpleviewer/simpleviewer.html',
+  'trends/assets/clouds.jpg',
+  'trends/assets/earth-large-with-ocean-mask.png',
+  'trends/assets/earth-large.jpg',
+  'trends/assets/earth.jpg',
+  'trends/assets/energy.png',
+  'trends/assets/moon.jpg',
+  'trends/assets/night-large.jpg',
+  'trends/assets/night.jpg',
+  'trends/trends.html',
+  'yuv2rgb.html',
+]
diff --git a/o3d/samples/o3djs/js_list.manifest b/o3d/samples/o3djs/js_list.manifest
index c5fad39..ba639b8 100644
--- a/o3d/samples/o3djs/js_list.manifest
+++ b/o3d/samples/o3djs/js_list.manifest
@@ -27,8 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-O3D_JS_SOURCES = [
-  'arcball.js',
+[ 'arcball.js',
   'base.js',
   'camera.js',
   'canvas.js',
@@ -59,5 +58,3 @@ O3D_JS_SOURCES = [
   'util.js',
 ]
 
-Export('O3D_JS_SOURCES');
-
diff --git a/o3d/samples/samples_gen.py b/o3d/samples/samples_gen.py
index cdf8715..f65c922 100644
--- a/o3d/samples/samples_gen.py
+++ b/o3d/samples/samples_gen.py
@@ -5,6 +5,7 @@
 
 import posixpath
 import sys
+import os.path
 
 output_filename = 'samples_gen.gyp'
 try:
@@ -143,8 +144,13 @@ for asset in assets:
 
 # Add in all the MANIFEST files to be copied,
 # Skipping the ones in the assets above (if any).
-manifest = open("MANIFEST", "r")
-for item in manifest.read().splitlines():
+items = eval(open("MANIFEST", "r").read())
+if os.path.exists("../../o3d-internal/jscomp/JSCompiler_deploy.jar"):
+  # add in the o3djs files.
+  js_files = eval(open("o3djs/js_list.manifest", "r").read())
+  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]: