summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--README.md39
2 files changed, 4 insertions, 37 deletions
diff --git a/DEPS b/DEPS
index 425c71d6e3..465a190edd 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ vars = {
'pdfium_git': 'https://pdfium.googlesource.com',
'buildtools_revision': 'c2f259809d5ede3275df5ea0842f0431990c4f98',
- 'clang_revision': '9dc1904d214a77f081362c1b848b5f28d2192748',
+ 'clang_revision': '87058e09f9c547eb5d00cb8ca666c6aec203a117',
'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271',
'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038',
diff --git a/README.md b/README.md
index 89096cd00d..24fc1f3d7b 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,8 @@
## News
-As of 2016-02-04, the XFA branch is deprecated. Instead, see
-[the section on configuration](#BuildConfig) below.
-
-As of 2016-04-15, Visual Studio toolchain from depot_tools will be used as the
-default. Set DEPOT_TOOLS_WIN_TOOLCHAIN=0 if you need to use system toolchain.
-See [Windows development subsection](#WinDev) for details.
-
+As of 2016-02-04, the XFA branch is deprecated. Instead, see the section on
+configuration below.
## Prerequisites
@@ -18,34 +13,6 @@ the gclient utilty needed below).
Also install Python, Subversion, and Git and make sure they're in your path.
-###<a name="WinDev"></a> Windows development
-
-PDFium uses similar Windows toolchain as Chromium:
-
-#### Open source contributors:
-Visual Studio 2015 Update 2 or later is highly recommended.
-
-Run `set DEPOT_TOOLS_WIN_TOOLCHAIN=0`, or set that variable in your global
-environment.
-
-Compilation is done through ninja, **not** Visual Studio.
-
-#### Google employees
-
-Run: `download_from_google_storage --config` and follow the
-authentication instructions. **Note that you must authenticate with your
-@google.com credentials**. Enter "0" if asked for a project-id.
-
-Once you've done this, the toolchain will be installed automatically for
-you in Step 3, below (near the end of the step).
-
-The toolchain will be in `depot_tools\win_toolchain`, and windbg can be
-found in `depot_tools\win_toolchain\vs2013_files\win8sdk\Debuggers`.
-
-If you want the IDE for debugging and editing, you will need to install
-it separately, but this is optional and not needed to build PDFium.
-
-
## Get the code
The name of the top-level directory does not matter. In our examples, we use
@@ -79,7 +46,7 @@ on Linux, sln files on Windows, and xcodeproj files on Mac. To do so, set the
GYP\_GENERATORS environment variable appropriately (e.g. "make", "msvs", or
"xcode") before running the above command.
-###<a name="BuildConfig"></a> Selecting build configuration
+### Selecting build configuration
PDFium may be built either with or without JavaScript support, and with
or without XFA forms support. Both of these features are enabled by