diff options
author | 2015-04-02 12:16:36 -0700 | |
---|---|---|
committer | 2015-04-02 12:16:36 -0700 | |
commit | 4808757d7a8bbe8c773a312a894738e9ff701b5f (patch) | |
tree | 62eb6866702dbd1df89964c7659e39bda2bfdea3 /site | |
parent | 07342361a3cda94376230b37d9e863052449653c (diff) |
Remove all code related to NaCl
BUG=skia:3600
DOCS_PREVIEW= https://skia.org/?cl=1036283002
Review URL: https://codereview.chromium.org/1036283002
Diffstat (limited to 'site')
-rw-r--r-- | site/dev/contrib/c++11.md | 6 | ||||
-rw-r--r-- | site/dev/contrib/cqkeywords.md | 2 | ||||
-rw-r--r-- | site/user/quick/nacl.md | 93 |
3 files changed, 2 insertions, 99 deletions
diff --git a/site/dev/contrib/c++11.md b/site/dev/contrib/c++11.md index 4f175b302a..0df1506fce 100644 --- a/site/dev/contrib/c++11.md +++ b/site/dev/contrib/c++11.md @@ -61,12 +61,8 @@ are using, but they've never been a problem. A few miscellaneous compile-only bots are actually our current overall weak link: -- Our NaCl builds use an old non-PNaCl toolchain, which is based on GCC - 4.4. GCC 4.4 has some support for C++11, but it's not nearly complete. - There is no upgrade path except PNaCl; even the very latest NaCl toolchain - is GCC 4.4, while PNaCl is based on Clang 3.4 (with complete C++11 support). - Our iOS builds are driven from a Mac 10.7 machine using some unknown old Clang. Who knows how old that is or what it supports? It's probably due for an update. -If we were to eliminate the problems of the NaCl and iOS bots, our ability to +If we were to eliminate the problems of iOS bots, our ability to use C++11 would match Mozilla's list nearly identically. diff --git a/site/dev/contrib/cqkeywords.md b/site/dev/contrib/cqkeywords.md index 6c834e235e..a8b7ad453d 100644 --- a/site/dev/contrib/cqkeywords.md +++ b/site/dev/contrib/cqkeywords.md @@ -25,7 +25,7 @@ Here are some real world examples: CQ_INCLUDE_TRYBOTS=tryserver.chromium:linux_layout_rel - CQ_INCLUDE_TRYBOTS=tryserver.skia:Build-Ubuntu13.10-GCC4.8-NaCl-Release-Trybot + CQ_INCLUDE_TRYBOTS=tryserver.skia:Build-Mac10.9-Clang-x86_64-Debug CQ_EXCLUDE_TRYBOTS diff --git a/site/user/quick/nacl.md b/site/user/quick/nacl.md deleted file mode 100644 index 2d88d8878e..0000000000 --- a/site/user/quick/nacl.md +++ /dev/null @@ -1,93 +0,0 @@ -NaCl (Experimental) -=================== - -Important Notes ---------------- - - * This process has only been verified to work on Linux - * Skia for NaCl is new and currently under development. Therefore, some features are not (yet) supported: - * GPU backend - * Fonts - Currently, NaCl has no way to access system fonts. This means - that text drawn in Skia will not display. A Pepper font API is in the - works and should be available in the near future, but for now your best - bet is to either package font data with your nexe or to send font data - from javascript to your plugin at runtime. Note that this will be the - case with any graphics library in NaCl until the font API is finished. - -Prerequisites -------------- - -Execute the following commands in whatever directory you want to hold the NaCl SDK directory: - - wget http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip - unzip nacl_sdk.zip - rm nacl_sdk.zip - nacl_sdk/naclsdk update pepper_32 - export NACL_SDK_ROOT=/path/to/nacl_sdk - -Check out the Skia source -------------------------- - -We use the "gclient" script (part of the depot_tools toolkit) to manage the -Skia source code. Follow the instructions at -http://www.chromium.org/developers/how-tos/depottools to get the gclient -script from depot_tools. - -Instead of checking out trunk directly you will use gclient to checkout the -nacl directory, which will automatically pull the trunk directory for you. -Execute the following commands in whatever directory you want to be the root -for your Skia on NaCl development: - - gclient config https://skia.googlesource.com/skia.git - gclient sync - -Building the Skia libraries for NaCl ------------------------------------- - -The nacl_make script is used to compile Skia targets for NaCl. It sets the -appropriate environment variables, calls GYP to generate makefiles, and runs -Make to build both 32 and 64-bit targets as required by NaCl. To build the -Skia libraries, run the following from the trunk directory: - - platform_tools/nacl/nacl_make skia_lib - -This will result in a set of static libraries being built into the out/nacl32 -and out/nacl64 directories. You can use these libraries in external NaCl -apps. - -Building and running Skia's Apps in NaCl (Experimental) -------------------------------------------------------- - -It is possible to run some of Skia's console apps in the browser. - -### Skia Unit Tests - -Build Skia tests from the trunk directory: - - platform_tools/nacl/bin/nacl_make tests - -This will build the tests executable. We include a tiny HTTP server (borrowed -from the NaCl SDK) in order to run the apps: - - cd platform_tools/nacl - ./httpd.py - -The HTTP server runs on port 5103 by default. In Chrome, navigate to -`http://localhost:5103/` and click on the link for "unit tests." After the -module downloads, you should see the tests begin to run. - -### Sample App - -The sample app relies on the GPU backend. Therefore, it will compile but will not yet run. - - platform_tools/nacl/bin/nacl_make SampleApp - -You can access the sample app at http://localhost:5103/SampleApp. - -### Debugger - -The debugger is currently in a partially-working state: - - platform_tools/nacl/bin/nacl_make debugger - -You can access it at http://localhost:5103/debugger. |