| 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 |
| 11 ## Get the code | 11 ## Get the code |
| 12 | 12 |
| 13 The name of the top-level directory does not matter. In our examples, we use |
| 14 "repo". This directory must not have been used before by `gclient config` as |
| 15 each directory can only house a single gclient configuration. |
| 16 |
| 13 ``` | 17 ``` |
| 14 mkdir pdfium | 18 mkdir repo |
| 19 cd repo |
| 20 gclient config --unmanaged https://pdfium.googlesource.com/pdfium.git |
| 21 gclient sync |
| 15 cd pdfium | 22 cd pdfium |
| 16 gclient config --name . --unmanaged https://pdfium.googlesource.com/pdfium.git | |
| 17 gclient sync | |
| 18 ``` | 23 ``` |
| 19 | 24 |
| 20 ## Generate the build files | 25 ## Generate the build files |
| 21 | 26 |
| 22 We use the GYP library to generate the build files. | 27 We use the GYP library to generate the build files. |
| 23 | 28 |
| 24 At this point, you have two options. The first option is to use the [Ninja] | 29 At this point, you have two options. The first option is to use the [Ninja] |
| 25 (http://martine.github.io/ninja/) build system (also included with the | 30 (http://martine.github.io/ninja/) build system (also included with the |
| 26 depot\_tools checkout). This is the default as of mid-September, 2015. | 31 depot\_tools checkout). This is the default as of mid-September, 2015. |
| 27 Previously, the second option (platform-specific build files) was the default. | 32 Previously, the second option (platform-specific build files) was the default. |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 ``` | 125 ``` |
| 121 git checkout origin/xfa | 126 git checkout origin/xfa |
| 122 git checkout -b merge_branch | 127 git checkout -b merge_branch |
| 123 git branch --set-upstream-to=origin/xfa | 128 git branch --set-upstream-to=origin/xfa |
| 124 git cherry-pick -x <commit hash> | 129 git cherry-pick -x <commit hash> |
| 125 git commit --amend # add Merge to XFA | 130 git commit --amend # add Merge to XFA |
| 126 git cl upload | 131 git cl upload |
| 127 ``` | 132 ``` |
| 128 | 133 |
| 129 Then wait for approval, and `git cl land` | 134 Then wait for approval, and `git cl land` |
| OLD | NEW |