| OLD | NEW |
| 1 # PDFium | 1 # PDFium |
| 2 | 2 |
| 3 ## Prerequisites | 3 ## Prerequisites |
| 4 | 4 |
| 5 Get the chromium depot tools via the instructions at | 5 Get the chromium depot tools via the instructions at |
| 6 http://www.chromium.org/developers/how-tos/install-depot-tools (this provides | 6 http://www.chromium.org/developers/how-tos/install-depot-tools (this provides |
| 7 the gclient utilty needed below). | 7 the gclient utilty needed below). |
| 8 | 8 |
| 9 Also install Python, Subversion, and Git and make sure they're in your path. | 9 Also install Python, Subversion, and Git and make sure they're in your path. |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 (http://build.chromium.org/p/client.pdfium/). | 34 (http://build.chromium.org/p/client.pdfium/). |
| 35 | 35 |
| 36 * On Windows: `build\gyp_pdfium` | 36 * On Windows: `build\gyp_pdfium` |
| 37 * For all other platforms: `build/gyp_pdfium` | 37 * For all other platforms: `build/gyp_pdfium` |
| 38 | 38 |
| 39 The second option is to generate platform-specific build files, i.e. Makefiles | 39 The second option is to generate platform-specific build files, i.e. Makefiles |
| 40 on Linux, sln files on Windows, and xcodeproj files on Mac. To do so, set the | 40 on Linux, sln files on Windows, and xcodeproj files on Mac. To do so, set the |
| 41 GYP\_GENERATORS environment variable appropriately (e.g. "make", "msvs", or | 41 GYP\_GENERATORS environment variable appropriately (e.g. "make", "msvs", or |
| 42 "xcode") before running the above command. | 42 "xcode") before running the above command. |
| 43 | 43 |
| 44 ### Using goma (Googlers only) |
| 45 |
| 46 If you would like to build using goma, pass `use_goma=1` to `gyp_pdfium`. If |
| 47 you installed goma in a non-standard location, you will also need to set |
| 48 `gomadir`. e.g. |
| 49 |
| 50 ``` |
| 51 build/gyp_pdfium -D use_goma=1 -D gomadir=path/to/goma |
| 52 ``` |
| 53 |
| 44 ## Building the code | 54 ## Building the code |
| 45 | 55 |
| 46 If you used Ninja, you can build the sample program by: `ninja -C out/Debug | 56 If you used Ninja, you can build the sample program by: `ninja -C out/Debug |
| 47 pdfium_test` You can build the entire product (which includes a few unit | 57 pdfium_test` You can build the entire product (which includes a few unit |
| 48 tests) by: `ninja -C out/Debug`. | 58 tests) by: `ninja -C out/Debug`. |
| 49 | 59 |
| 50 If you're not using Ninja, then building is platform-specific. | 60 If you're not using Ninja, then building is platform-specific. |
| 51 | 61 |
| 52 * On Linux: `make pdfium_test` | 62 * On Linux: `make pdfium_test` |
| 53 * On Mac: `open build/all.xcodeproj` | 63 * On Mac: `open build/all.xcodeproj` |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 ``` | 135 ``` |
| 126 git checkout origin/xfa | 136 git checkout origin/xfa |
| 127 git checkout -b merge_branch | 137 git checkout -b merge_branch |
| 128 git branch --set-upstream-to=origin/xfa | 138 git branch --set-upstream-to=origin/xfa |
| 129 git cherry-pick -x <commit hash> | 139 git cherry-pick -x <commit hash> |
| 130 git commit --amend # add Merge to XFA | 140 git commit --amend # add Merge to XFA |
| 131 git cl upload | 141 git cl upload |
| 132 ``` | 142 ``` |
| 133 | 143 |
| 134 Then wait for approval, and `git cl land` | 144 Then wait for approval, and `git cl land` |
| OLD | NEW |