From d604d819208f092ee5f2a1fa0cd40c1d1a2f4e14 Mon Sep 17 00:00:00 2001 From: "Joel B. Mohler" Date: Fri, 22 Aug 2014 21:21:14 -0400 Subject: [PATCH 1/2] enlarge on windows build instructions slightly --- INSTALL | 31 ++++++++++++++++++------------- doc/faq/installing_faq.rst | 2 ++ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/INSTALL b/INSTALL index 622723836cbd..a2e3dde8969a 100644 --- a/INSTALL +++ b/INSTALL @@ -163,10 +163,11 @@ Build requirements These are external packages which you will need to install before installing matplotlib. If you are building on OSX, see -:ref:`build_osx`. If you are installing dependencies with a package -manager on Linux, you may need to install the development packages -(look for a "-dev" postfix) in addition to the libraries themselves. - +:ref:`build_osx`. If you are building on Windows, see +:ref:`build_windows`. If you are installing dependencies with a +package manager on Linux, you may need to install the development +packages (look for a "-dev" postfix) in addition to the libraries +themselves. Required Dependencies ^^^^^^^^^^^^^^^^^^^^^ @@ -197,9 +198,7 @@ six 1.3 or later libpng 1.2 (or later) library for loading and saving :term:`PNG` files (`download `__). libpng requires - zlib. If you are a Windows user, you can ignore this because we - build support into the matplotlib single-click installer - + zlib. Optional GUI framework ^^^^^^^^^^^^^^^^^^^^^^ @@ -235,7 +234,7 @@ ImageMagick Optional dependencies ^^^^^^^^^^^^^^^^^^^^^ -`Pillow http://python-imaging.github.io/`__ +`Pillow `_ If Pillow is installed, matplotlib can read and write a larger selection of image file formats. @@ -295,12 +294,18 @@ the different OSX version (e.g., 10.4 and 10.5). We recommend that you build the way we do for the OSX release: get the source from the tarball or the git repository and follow the instruction in :file:`README.osx`. -.. _build_osx: +.. _build_windows: Building on Windows ------------------- -Building for source on windows can be difficult. Please see -`matplotlib-windbuild -`_ for detailed -instructions, dependency source blobs, and helper scripts. +The Python shipped from http://www.python.org is compiled with Visual Studio +2008 for versions before 3.3 and Visual Studio 2010 for 3.3 and later. Python +extensions are recommended to be compiled with the same compiler. The .NET +Framework 4.0 is required for MSBuild (you'll likely have the requisite +Framework with Visual Studio). In addition to Visual Studio `CMake +`_ is required for building libpng. + +Since there is no canonical Windows package manager the build methods for +freetype, zlib, libpng, tcl, & tk source code are documented as a build script +at `matplotlib=winbuild `. diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst index 2cf1cebb7f94..b18975982756 100644 --- a/doc/faq/installing_faq.rst +++ b/doc/faq/installing_faq.rst @@ -145,6 +145,8 @@ line script to the appropriate places. .. note:: Mac OSX users please see the :ref:`build_osx` guide. + Windows users please see the :ref:`build_windows` guide. + Then, if you want to update your matplotlib at any time, just do:: > git pull From 0407f44911234b627a1628d7a11d0b40428fcb44 Mon Sep 17 00:00:00 2001 From: "Joel B. Mohler" Date: Sat, 23 Aug 2014 16:27:16 -0400 Subject: [PATCH 2/2] fix '-' --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index a2e3dde8969a..9d44a6c60db2 100644 --- a/INSTALL +++ b/INSTALL @@ -308,4 +308,4 @@ Framework with Visual Studio). In addition to Visual Studio `CMake Since there is no canonical Windows package manager the build methods for freetype, zlib, libpng, tcl, & tk source code are documented as a build script -at `matplotlib=winbuild `. +at `matplotlib-winbuild `.