summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 20:35:53 +0000
committerncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 20:35:53 +0000
commit484c8e1091e758544ea2442fc655af72e279e2e8 (patch)
tree7f9539afd70601647867c0def062033f115296e5 /ppapi
parentd59a369dec0c9e07910d922ce2198d30c7135996 (diff)
downloadchromium_src-484c8e1091e758544ea2442fc655af72e279e2e8.zip
chromium_src-484c8e1091e758544ea2442fc655af72e279e2e8.tar.gz
chromium_src-484c8e1091e758544ea2442fc655af72e279e2e8.tar.bz2
Add a config file listing NaCl's scons files in the Chrome repo.
This is the first part of a multistep change to make it easier to maintain the Chrome-side portion of NaCl's build. The config file is currently unused. Also removed a duplicated file: ppapi/native_client/tests/nacl.scons BUG= http://code.google.com/p/chromium/issues/detail?id=122714 TEST= none Review URL: https://chromiumcodereview.appspot.com/10024046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/ppapi_scons_files.py69
-rw-r--r--ppapi/native_client/tests/nacl.scons61
2 files changed, 69 insertions, 61 deletions
diff --git a/ppapi/native_client/ppapi_scons_files.py b/ppapi/native_client/ppapi_scons_files.py
new file mode 100644
index 0000000..5d8163e
--- /dev/null
+++ b/ppapi/native_client/ppapi_scons_files.py
@@ -0,0 +1,69 @@
+# Copyright (c) 2012 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.
+
+
+trusted_scons_files = [
+ 'src/shared/ppapi/build.scons',
+ 'src/shared/ppapi_proxy/build.scons',
+ 'src/trusted/plugin/build.scons',
+ 'tests/ppapi_geturl/build.scons',
+ 'tests/ppapi_messaging/build.scons',
+ 'tests/ppapi_browser/ppb_file_system/build.scons',
+ 'tests/ppapi_tests/build.scons', # Build PPAPI tests from Chrome as a .so
+]
+
+
+untrusted_scons_files = [
+ 'src/shared/ppapi/nacl.scons',
+ 'src/shared/ppapi_proxy/nacl.scons',
+]
+
+
+untrusted_irt_scons_files = [
+ 'src/shared/ppapi_proxy/nacl.scons',
+]
+
+
+nonvariant_test_scons_files = [
+ 'tests/ppapi/nacl.scons',
+ 'tests/ppapi_browser/bad/nacl.scons',
+ 'tests/ppapi_browser/crash/nacl.scons',
+ 'tests/ppapi_browser/extension_mime_handler/nacl.scons',
+ 'tests/ppapi_browser/manifest/nacl.scons',
+ 'tests/ppapi_browser/ppb_core/nacl.scons',
+ 'tests/ppapi_browser/ppb_dev/nacl.scons',
+ 'tests/ppapi_browser/ppb_file_system/nacl.scons',
+ 'tests/ppapi_browser/ppb_graphics2d/nacl.scons',
+ 'tests/ppapi_browser/ppb_graphics3d/nacl.scons',
+ 'tests/ppapi_browser/ppb_image_data/nacl.scons',
+ 'tests/ppapi_browser/ppb_instance/nacl.scons',
+ 'tests/ppapi_browser/ppb_memory/nacl.scons',
+ 'tests/ppapi_browser/ppb_pdf/nacl.scons',
+ 'tests/ppapi_browser/ppb_scrollbar/nacl.scons',
+ 'tests/ppapi_browser/ppb_url_loader/nacl.scons',
+ 'tests/ppapi_browser/ppb_url_request_info/nacl.scons',
+ 'tests/ppapi_browser/ppb_var/nacl.scons',
+ 'tests/ppapi_browser/ppb_widget/nacl.scons',
+ 'tests/ppapi_browser/ppp_input_event/nacl.scons',
+ 'tests/ppapi_browser/ppp_instance/nacl.scons',
+ 'tests/ppapi_browser/progress_events/nacl.scons',
+ 'tests/ppapi_browser/stress_many_nexes/nacl.scons',
+ 'tests/ppapi_example_2d/nacl.scons',
+ 'tests/ppapi_example_audio/nacl.scons',
+ 'tests/ppapi_example_events/nacl.scons',
+ # TODO(dspringer): re-enable test once the 3D ABI has stabilized. See
+ # http://code.google.com/p/nativeclient/issues/detail?id=2060
+ # 'tests/ppapi_example_gles2/nacl.scons',
+ 'tests/ppapi_example_post_message/nacl.scons',
+ 'tests/ppapi_geturl/nacl.scons',
+ 'tests/ppapi_gles_book/nacl.scons',
+ 'tests/ppapi_messaging/nacl.scons',
+ # Broken by Chrome change
+ # http://code.google.com/p/nativeclient/issues/detail?id=2480
+ #'tests/ppapi_simple_tests/nacl.scons',
+ 'tests/ppapi_test_example/nacl.scons',
+ 'tests/ppapi_test_lib/nacl.scons',
+ 'tests/ppapi_tests/nacl.scons',
+]
+
diff --git a/ppapi/native_client/tests/nacl.scons b/ppapi/native_client/tests/nacl.scons
deleted file mode 100644
index df9786e..0000000
--- a/ppapi/native_client/tests/nacl.scons
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- python -*-
-# Copyright 2012 The Native Client 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('env')
-
-# This command is placed in its own nacl.cons file because:
-# 1) It gives it access to the same environment as the tests
-# 2) Sicking it in an arbitrary test's .scons file would be cryptic
-binary = env.DownloadedChromeBinary()
-node = env.Command(binary,
- [env.File('${SCONSTRUCT_DIR}/DEPS')],
- '${PYTHON} build/download_chrome.py '
- '--arch=%s --dst=${CHROME_DOWNLOAD_DIR}' %
- env.ChromeBinaryArch())
-# This stops Scons from deleting the file before running the step above.
-env.NoClean(binary)
-env.Precious(binary)
-env.Alias('download_chrome', node)
-
-################################################################################
-## Support
-## scons MODE=nacl html_examples
-## to build all examples linked from scons-out/.../staging/examples.html
-################################################################################
-
-html_examples = env.Replicate('${STAGING_DIR}', 'examples.html')
-env.Default(html_examples)
-example_nexes = [
- # PPAPI Nexe Examples
- 'ppapi_basic_object', # basic_object.html
- 'ppapi_example_events', # ppapi_example_events.html
- 'ppapi_example_2d', # ppapi_example_2d.html
- 'ppapi_example_audio', # ppapi_example_audio.html
- 'ppapi_geturl', # ppapi_geturl.html
- 'ppapi_progress_events', # ppapi_progress_events.html
- 'earth_c', # earth_c.html
- 'earth_cc', # earth_cc.html
- 'ppapi_bad', # ppapi_bad.html
- #TODO(polina): follow ppapi_bad's example to pull in all nexes
- #'ppapi_crash' # ppapi_crash.html
- # PPAPI Proxy Tests
- 'ppapi_ppb_audio', # ppapi_ppb_audio.html
- 'ppapi_ppb_core', # ppapi_ppb_core.html
- 'ppapi_ppb_graphics2d', # ppapi_ppb_graphics2d.html
- 'ppapi_ppb_file_system', # ppapi_ppb_file_system.html
- 'ppapi_ppb_image_data', # ppapi_ppb_image_data.html
- 'ppapi_ppb_instance', # ppapi_ppb_instance_data.html
- 'ppapi_ppb_memory', # ppapi_ppb_memory.html
- 'ppapi_messaging', # ppapi_messaging.html
- 'ppapi_ppb_scrollbar', # ppapi_ppb_scrollbar.html
- 'ppapi_ppb_url_request_info', # ppapi_ppb_url_request_info.html
- 'ppapi_ppp_instance', # ppapi_ppp_instance.html
- ]
-
-prog_suffix = env['PROGSUFFIX']
-env.Depends(html_examples,
- [ env.Alias(nexe + prog_suffix) for nexe in example_nexes ])
-env.Alias('html_examples', html_examples) # scons --mode=nacl examples_html
-env.Alias('examples_html', html_examples) # scons --mode=nacl html_examples