leksah-server 0.15.0.3 → 0.15.0.4
raw patch · 2 files changed
+9/−5 lines, 2 filesdep ~leksah-serverPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: leksah-server
API changes (from Hackage documentation)
Files
leksah-server.cabal view
@@ -1,5 +1,5 @@ name: leksah-server-version: 0.15.0.3+version: 0.15.0.4 cabal-version: >= 1.10.2 build-type: Simple license: GPL@@ -195,7 +195,7 @@ hs-source-dirs: tests main-is: TestTool.hs build-depends: base >= 4.0.0.0 && <4.9, hslogger >= 1.0.7 && <1.3,- leksah-server == 0.15.0.3,+ leksah-server == 0.15.0.4, HUnit >=1.2 && <1.3, transformers >=0.2.2.0 && <0.5, conduit >= 1.0.8 && <1.3, conduit-extra >=1.0.0.1 && <1.2, resourcet
src/IDE/Metainfo/PackageCollector.hs view
@@ -39,7 +39,7 @@ import IDE.Utils.Utils (leksahMetadataPathFileExtension, leksahMetadataSystemFileExtension)-import System.FilePath (dropFileName, (<.>), (</>))+import System.FilePath (dropFileName, takeBaseName, (<.>), (</>)) import Data.Binary.Shared (encodeFileSer) import qualified Data.Map as Map (fromListWith, fromList, keys, lookup)@@ -172,12 +172,16 @@ liftIO $ writeExtractedPackage writeAscii packageDescr liftIO $ writePackagePath (dropFileName fpSource) packageName runCabalConfigure fpSource = do- let dirPath = dropFileName fpSource+ let dirPath = dropFileName fpSource+ packageName = takeBaseName fpSource+ flagsFor "base" = ["-finteger-gmp2"]+ flagsFor _ = []+ flags = flagsFor packageName distExists <- doesDirectoryExist $ dirPath </> "dist" unless distExists $ do setCurrentDirectory dirPath E.catch (do runTool' "cabal" ["clean"] Nothing- runTool' "cabal" ["configure","--user"] Nothing+ runTool' "cabal" ("configure":"--user":flags) Nothing return ()) (\ (_e :: E.SomeException) -> do debugM "leksah-server" "Can't configure"