Incorporate msys2 tools into installer

* hptool/src/OS/Win.hs
  * call copyWinTargetExtras with the BuildConfig

* hptool/src/OS/Win/WinPaths.hs
  * Add the build source and target dest paths for msys

* hptool/src/OS/Win/WinRules.hs
  * Add a step which copies the pre-built msys folder from
    our build tree to the target tree (no installer change is
    needed here since the installer just bundles up every
    file from the target tree)

* windows-platform.sh
  * add some sanity checks to make sure the pre-built msys
    tree is available

Author: randen

hptool/src/OS/Win.hs

@@ -52,7 +52,7 @@ winOsFromConfig BuildConfig{..} = os
 
     osPackageTargetDir p = winHpPrefix </> packagePattern p
 
-    -- The ghc-7.8.3 build for Windows does not have pre-built .dyn_hi files
+    -- The ghc builds for Windows do not have pre-built .dyn_hi files
     -- (Revisit this in future versions)
     osDoShared = False
 
@@ -86,7 +86,6 @@ winOsFromConfig BuildConfig{..} = os
     whenM mp m = mp >>= \p -> when p m
 
     osTargetAction = do
-        copyWinTargetExtras
         -- Now, targetDir is actually ready to snapshot (we skipped doing
         -- this in osGhcTargetInstall).
         void $ getDirectoryFiles "" [targetDir ++ "//*"]
@@ -123,13 +122,15 @@ winOsFromConfig BuildConfig{..} = os
 
     osProduct = winProductFile hpVersion bcArch
 
-    osRules _rel _bc = do
+    osRules _rel bc = do
         winRules
 
         osProduct %> \_ -> do
             need $ [dir ghcLocalDir, targetDir, vdir ghcVirtualTarget]
                    ++ winNeeds
 
+            copyWinTargetExtras bc
+
             -- Now, it is time to make sure there are no problems with the
             -- conf files copied to
             localCommand' [] "ghc-pkg"

hptool/src/OS/Win/WinPaths.hs

@@ -106,6 +106,12 @@ winExternalWinGhciDir = winExternalSrc </> "winghci"
 winWinGhciTargetDir :: FilePath
 winWinGhciTargetDir = winTargetDir </> "winghci"
 
+winExternalMSysDir :: BuildConfig -> FilePath
+winExternalMSysDir bc = winExternalSrc </> "msys" </> bcArch bc
+
+winMSysTargetDir :: FilePath
+winMSysTargetDir = winTargetDir </> "msys"
+
 -- | ghc.exe file, relative to the install
 winGhcExeBin :: FilePath
 winGhcExeBin = "bin" </> "ghc" <.> exe

hptool/src/OS/Win/WinRules.hs

@@ -58,8 +58,8 @@ winGhcInstall destDir bc distDir = do
     return destDir
 
 
-copyWinTargetExtras :: Action ()
-copyWinTargetExtras = do
+copyWinTargetExtras :: BuildConfig -> Action ()
+copyWinTargetExtras bc = do
     -- copy icons
     let mkIconsDir = makeDirectory $ winTargetDir </> "icons"
     copyFilesAction mkIconsDir winExtrasSrc winTargetDir winIconsFiles
@@ -70,6 +70,9 @@ copyWinTargetExtras = do
     -- copy winghci pieces
     copyDirAction winExternalWinGhciDir winWinGhciTargetDir
 
+    -- copy msys(msys2) pieces
+    copyDirAction (winExternalMSysDir bc) winMSysTargetDir
+
 
 -- | These files are needed when building the installer
 copyInstExtras :: Rules ()

windows-platform.sh

@@ -92,6 +92,8 @@ if [ \! \(    -d winExternalSrc \
            -a -d winExternalSrc/doc/html \
            -a -d winExternalSrc/winghci \
            -a -e winExternalSrc/winghci/winghci.exe \
+           -a -d winExternalSrc/msys/i386/usr \
+           -a -d winExternalSrc/msys/x86_64/usr \
         \) ]
 then
     echo '***'
@@ -100,6 +102,7 @@ then
     echo '    * winghci (can copy from a previous HP release)'
     echo '    * GLUT library & DLL (e.g,. from freeglut-MinGW-2.8.1-1.mp.zip)'
     echo "    * GHC user's guide (matching the GHC in this HP)"
+    echo "    * MSys2 'usr' directory, as seen in git-for-windows(tm)"
     echo ''
     echo 'Please create a subdirectory in this directory (where this script'
     echo 'is), with the following contents and structure:'
@@ -124,7 +127,11 @@ then
             winghci/
                 winghci.exe
                 <and any other DLL, etc. needed to run this particular winghci>
-
+            msys/
+                i386/
+                        usr/{bin,lib,libexec,share,ssl}
+                x86_64/
+                        usr/{bin,lib,libexec,share,ssl}
 EOF
 
     exit 1