fltkhs 0.5.0.9 → 0.5.1.0

raw patch · 2 files changed

+31/−26 lines, 2 filessetup-changedPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Setup.hs +30/−25
• fltkhs.cabal +1/−1

@@ -33,7 +33,7 @@ import qualified Distribution.Simple.UHC  as UHC import qualified Distribution.Simple.PackageIndex as PackageIndex import Distribution.PackageDescription as PD-import Distribution.InstalledPackageInfo (extraGHCiLibraries, showInstalledPackageInfo)+import Distribution.InstalledPackageInfo (ldOptions, extraGHCiLibraries, showInstalledPackageInfo) import System.Environment (getEnv, setEnv)  main :: IO ()@@ -83,6 +83,28 @@                                   _ -> ":"))                       currentLdLibraryPath) ++ value) ++replaceAllInfixes :: String -> String -> String -> String+replaceAllInfixes needle subString haystack =+  concat+    (unfoldr (\str -> if (null str)+                      then Nothing+                      else if (needle `isPrefixOf` str)+                           then Just (subString, drop (length needle) str)+                           else Just ([head str], tail str))+             haystack)+cygpath o p =+  let removeTrailingNewline = head . lines  in+  removeTrailingNewline<$>(rawSystemStdout normal "cygpath" [o,  p])++replaceMingw =+  let mingw = case buildArch of+        I386 -> "/mingw32"+        _ -> "/mingw64"+      fullMingwPath = unsafePerformIO (cygpath "-m" mingw)+  in+  replaceAllInfixes mingw fullMingwPath+ myBuildHook pkg_descr local_bld_info user_hooks bld_flags =   do let compileC = do              putStrLn "==Compiling C bindings=="@@ -104,38 +126,22 @@              rewritePaths pkg_descr =                let lib = library pkg_descr                    ld_incdirs :: Maybe ([String], [String])-                   ld_incdirs = fmap (\lib' -> (ldOptions (libBuildInfo lib'), includeDirs (libBuildInfo lib')))  lib-                   removeTrailingNewline = head . lines-                   replaceAllInfixes :: String -> String -> String -> String-                   replaceAllInfixes needle subString haystack =-                     concat-                       (unfoldr (\str -> if (null str)-                                         then Nothing-                                         else if (needle `isPrefixOf` str)-                                              then Just (subString, drop (length needle) str)-                                              else Just ([head str], tail str))-                                haystack)+                   ld_incdirs = fmap (\lib' -> (PD.ldOptions (libBuildInfo lib'), includeDirs (libBuildInfo lib')))  lib                    stdCppGccPthreadPaths ghcPath =                       [                         ((takeDirectory . takeDirectory) ghcPath) </> "mingw" </> "lib" </> "gcc" </> "x86_64-w64-mingw32" </> "5.2.0"                       , ((takeDirectory . takeDirectory) ghcPath) </> "mingw" </> "x86_64-w64-mingw32" </> "lib"                       ]-                   cygpath o p = removeTrailingNewline<$>(rawSystemStdout normal "cygpath" [o,  p])                in                do-                 let mingw = case buildArch of-                       I386 -> "/mingw32"-                       _ -> "/mingw64"-                 fullMingwPath <- cygpath "-m" mingw                  ghcPath <- rawSystemStdout normal "sh" ["-c", "which ghc"]                  cppGccPthreadPaths <- mapM (cygpath "-w") (stdCppGccPthreadPaths ghcPath)-                 let replaceMingw = replaceAllInfixes mingw fullMingwPath                  let fixedLib = maybe Nothing                                      (\(ld, incDirs) ->                                           fmap (\l' -> l' {                                                    libBuildInfo =                                                      (libBuildInfo l') {-                                                        ldOptions = fmap replaceMingw ld,+                                                        PD.ldOptions = fmap replaceMingw ld,                                                         includeDirs = fmap replaceMingw incDirs,                                                         extraLibDirs = cppGccPthreadPaths ++ (extraLibDirs (libBuildInfo l')),                                                         extraLibs = ["stdc++", "gcc", "pthread"]@@ -190,12 +196,11 @@ register :: PackageDescription -> LocalBuildInfo -> RegisterFlags -> IO () register pkg@PackageDescription { library = Just lib } lbi regFlags = do     let clbi = getComponentLocalBuildInfo lbi CLibName--    installedPkgInfoRaw <- generateRegistrationInfo--                           verbosity pkg lib lbi clbi inplace False distPref packageDb--+    installedPkgInfoRaw' <- generateRegistrationInfo verbosity pkg lib lbi clbi inplace False distPref packageDb+    let installedPkgInfoRaw =+         case buildOS of+           Windows -> installedPkgInfoRaw' { Distribution.InstalledPackageInfo.ldOptions = fmap replaceMingw (Distribution.InstalledPackageInfo.ldOptions installedPkgInfoRaw') }+           _ -> installedPkgInfoRaw'     let installedPkgInfo = installedPkgInfoRaw {                                 -- this is what this whole register code is all about                                 extraGHCiLibraries =

@@ -1,5 +1,5 @@ name : fltkhs-version : 0.5.0.9+version : 0.5.1.0 synopsis : FLTK bindings description:     Low level bindings for the FLTK GUI toolkit. For installation and quick start instruction please scroll all the way down to the README.