WIP: More windows updates

2 files changed, 14 insertions, 25 deletions

diff --git a/README b/README
index 45ffadff..f991c0c8 100644
--- a/README
+++ b/README
@@ -36,13 +36,14 @@ On OSX you will need to have install the following software:
 Windows
 -------
 The initial setup on Windows is a little bit longer, but only a few programs are required.
-  * Python2.7: https://www.python.org/downloads/
-     IMPORTANT : Chose the 2.7 version. The 3.x versions are *not* supported
-  * CMake: http://www.cmake.org/cmake/resources/software.html
-  * Git: http://git-scm.com/download/win
-     IMPORTANT: Select the install option "Checkout as-is, Commit as-is"
-  * Msys/MinGW: http://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download
-     Install it with all the options enabled
+  * Msys2: http://msys2.github.io/
+     Follow the installation instructions on the page.
+     Every instruction that follows is to be run within the "MinGW-w64 Win32 Shell" (or
+     "MinGW-w64 Win64 Shell" when doing 64bit builds) unless instructed otherwise.
+  * Install git: pacman -S git
+  * Install the mingw64 python:
+       * For 32bit setups: pacman -S mingw-w64-i686-python2
+       * For 64bit setups: pacman -S mingw-w64-x86_64-python2
   * WiX 3.5: http://wix.codeplex.com/releases/view/60102
 
 The Direct Show plugins still needs to be built using Microsoft's compiler and their SDK,
@@ -51,23 +52,6 @@ You need to install the following software:
   * Microsoft SDK 7.1: http://www.microsoft.com/en-us/download/details.aspx?id=8279
   * Windows Driver Kit 7.1.0: http://msdn.microsoft.com/en-us/windows/hardware/hh852365
 
-cerbero must be run in the MingGW shell, which is accessible from the main menu or desktop 
-(if it is not, go to Mingw Installation manager, select MSYS Base Development and install
-msys-bash  lnk).
-
-The last step is making python and git available from the shell, for which you will need
-to create a .profile file:
-
-If you use 64-bit Windows, please execute:
-
-echo 'export PATH="$PATH:/c/Python27:/c/Program Files (x86)/Git/bin:/c/MinGW/bin/"' > ~/.profile
-
-If you use 32-bit Windows, please execute:
-
-echo 'export PATH="$PATH:/c/Python27:/c/Program Files/Git/bin:/c/MinGW/bin/"' > ~/.profile
-
-Note that inside the shell, / is mapped to c:\Mingw\msys\1.0\
-
 *****
 Usage
 *****
diff --git a/cerbero/bootstrap/windows.py b/cerbero/bootstrap/windows.py
index 94e99e1d..98a22836 100644
--- a/cerbero/bootstrap/windows.py
+++ b/cerbero/bootstrap/windows.py
@@ -44,7 +44,12 @@ class WindowsBootstrapper(BootstrapperBase):
     Installs the mingw-w64 compiler toolchain and headers for Directx and
     Python
     '''
-
+    # PORTING NOTES
+    # on windows, use pacman to install the toolchain, headers, etc...
+    #  * pacman -S --noconfirm mingw-w64-{i686|x86_64}-toolchain
+    #    Provides: isl, mpc, mpfr, binutils, crtgit, gcc, gcc-libs, gdb, headers,
+    #              libwinpthread, make, pkg-config, tools
+    
     def start(self):
         if not git.check_line_endings(self.config.platform):
             raise ConfigurationError("git is configured to use automatic line "