leksah 0.10.0.3 → 0.10.0.4

raw patch · 3 files changed

+9/−9 lines, 3 filesdep ~leksahdep ~parsec

Dependency ranges changed: leksah, parsec

Files

• leksah.cabal +4/−4
• src/IDE/Build.hs +4/−4
• src/IDE/Command.hs +1/−1

@@ -1,5 +1,5 @@ name: leksah-version: 0.10.0.3+version: 0.10.0.4 cabal-version: >=1.8 build-type: Simple license: GPL@@ -99,7 +99,7 @@                    bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,                    filepath >=1.1.0.1 && <1.3, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,                    gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.1, old-time >=1.0.0.1 && <1.1,-                   parsec >=2.1.0.1 && <2.2, pretty >=1.0.1.0 && <1.1, process-leksah >=1.0.1.3 && <1.1,+                   parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.1, process-leksah >=1.0.1.3 && <1.1,                    regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.4,                    time >=0.1 && <1.3, ltk >= 0.10 && <0.11, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.2,                    hslogger >= 1.0.7 && <1.2, leksah-server >= 0.10 && <0.11, network >= 2.2 && <3.0,@@ -160,14 +160,14 @@                        bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,                        filepath >=1.1.0.1 && <1.3, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,                        gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.1, old-time >=1.0.0.1 && <1.1,-                       parsec >=2.1.0.1 && <2.2, pretty >=1.0.1.0 && <1.1, process-leksah >=1.0.1.3 && <1.1,+                       parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.1, process-leksah >=1.0.1.3 && <1.1,                        regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.4,                        time >=0.1 && <1.3, ltk >= 0.10 && <0.11, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.2,                        hslogger >= 1.0.7 && <1.2, leksah-server >= 0.10 && <0.11, network >= 2.2 && <3.0,                        ghc >=6.10.1 && <7.1, strict >= 0.3.2 && <0.4     else         hs-source-dirs: main-        build-depends: leksah ==0.10.0.3, base >=4.0.0.0 && <= 5+        build-depends: leksah ==0.10.0.4, base >=4.0.0.0 && <= 5      main-is: Main.hs     buildable: True

@@ -136,19 +136,19 @@ constrElem [] _ _ _  _ _ _ = trace ("constrElem: 2") EmptyChain constrElem currentTargets (current:rest)  depGraph ms noBuilds op1 op2     | elem current currentTargets && not (elem current noBuilds) =-        let dependends = case Map.lookup current depGraph of+        let dependents = case Map.lookup current depGraph of                         Nothing -> trace ("Build>>constrMakeChain: unknown package"                                             ++ show current) []                         Just deps -> deps-            withoutInstall = msDontInstallLast ms && null (delete current dependends)+            withoutInstall = msDontInstallLast ms && null (delete current dependents)             filteredOps = case op1 of                             MoComposed l -> MoComposed (filter (\e -> e /= MoInstall) l)                             MoInstall    -> MoComposed []                             other        -> other-        in trace ("constrElem1 deps: " ++ show dependends ++ " withoutInstall: " ++ show withoutInstall)+        in trace ("constrElem1 deps: " ++ show dependents ++ " withoutInstall: " ++ show withoutInstall)             $             chainFor current ms (if withoutInstall then filteredOps else op1)-                (constrElem (nub $ currentTargets ++ dependends)  rest depGraph ms noBuilds op2 op2)+                (constrElem (nub $ currentTargets ++ dependents)  rest depGraph ms noBuilds op2 op2)                 (Just EmptyChain)     | otherwise  = trace ("constrElem2 " ++ show op2) $ constrElem currentTargets rest depGraph ms noBuilds op1 op2 

@@ -409,7 +409,7 @@      ,AD "BackgroundBuildToggled" "_BackgroundBuild" (Just "Build in the background and report errors") (Just "ide_build")         backgroundBuildToggled [] True-    ,AD "MakeModeToggled" "_MakeMode" (Just "Make dependend packages") (Just "ide_make")+    ,AD "MakeModeToggled" "_MakeMode" (Just "Make dependent packages") (Just "ide_make")         makeModeToggled [] True     ,AD "DebugToggled" "_Debug" (Just "Use GHCi debugger to build and run") (Just "ide_debug")         debugToggled [] True