diff options
| author | Oliver Chang <ochang@chromium.org> | 2015-10-21 15:19:20 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2015-10-21 15:19:20 -0700 |
| commit | 5a21e14fb699453fe9d0c7bd0de12c434b102938 (patch) | |
| tree | acaf0c8a31f969c169374491838b6ef86a84052d | |
| parent | 59b10dc29ad515e26e96172e7e7d91122cb52a15 (diff) | |
| download | pdfium-5a21e14fb699453fe9d0c7bd0de12c434b102938.tar.xz | |
Merge to XFA: Change DEPS hooks paths to include 'pdfium/'.
This will break existing checkouts based on the instructions provided.
Instead of having a single pdfium directory, checkouts will now compromise of:
("repo" can be named anything)
repo/.gclient
repo/pdfium/.git
repo/pdfium/others...
To convert an existing checkout, do something like:
mkdir repo
mv pdfium repo
rm repo/pdfium/.gclient_entries # will be regenerated, with a warning
mv repo/pdfium/.gclient repo
edit repo/.gclient and change "name: '.'" to "name: 'pdfium'"
Instructions for getting a new checkout are in README.md in this CL.
R=thestig@chromium.org, tsepez@chromium.org
Review URL: https://codereview.chromium.org/1406383003 .
Review URL: https://codereview.chromium.org/1422633002 .
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | docs/build.md | 11 |
2 files changed, 12 insertions, 7 deletions
@@ -38,7 +38,7 @@ hooks = [ # A change to a .gyp, .gypi, or to GYP itself should run the generator. 'name': 'gyp', 'pattern': '.', - 'action': ['python', 'build/gyp_pdfium'], + 'action': ['python', 'pdfium/build/gyp_pdfium'], }, # Pull clang-format binaries using checked-in hashes. { @@ -49,7 +49,7 @@ hooks = [ '--platform=win32', '--no_auth', '--bucket', 'chromium-clang-format', - '-s', 'buildtools/win/clang-format.exe.sha1', + '-s', 'pdfium/buildtools/win/clang-format.exe.sha1', ], }, { @@ -60,7 +60,7 @@ hooks = [ '--platform=darwin', '--no_auth', '--bucket', 'chromium-clang-format', - '-s', 'buildtools/mac/clang-format.sha1', + '-s', 'pdfium/buildtools/mac/clang-format.sha1', ], }, { @@ -71,7 +71,7 @@ hooks = [ '--platform=linux*', '--no_auth', '--bucket', 'chromium-clang-format', - '-s', 'buildtools/linux64/clang-format.sha1', + '-s', 'pdfium/buildtools/linux64/clang-format.sha1', ], }, ] diff --git a/docs/build.md b/docs/build.md index 6fa8291228..a32f9fbc4b 100644 --- a/docs/build.md +++ b/docs/build.md @@ -10,11 +10,16 @@ Also install Python, Subversion, and Git and make sure they're in your path. ## Get the code +The name of the top-level directory does not matter. In our examples, we use +"repo". This directory must not have been used before by `gclient config` as +each directory can only house a single gclient configuration. + ``` -mkdir pdfium -cd pdfium -gclient config --name . --unmanaged https://pdfium.googlesource.com/pdfium.git +mkdir repo +cd repo +gclient config --unmanaged https://pdfium.googlesource.com/pdfium.git gclient sync +cd pdfium ``` ## Generate the build files |