haskell/haskell-ide-engine
1
1
Fork 0
mirror of https://github.com/haskell/haskell-ide-engine.git synced 2024-09-11 11:05:30 +03:00
Code Issues Projects Releases Wiki Activity

Add hie-bios submodule

Browse Source
This commit is contained in:
fendor 2019-10-01 12:04:50 +02:00
parent d7403d270e
commit 54becfd9de
15 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -27,3 +27,7 @@
url = https://github.com/alanz/ghc-mod.git
#url = https://github.com/mpickering/ghc-mod.git
[submodule "hie-bios"]
path = hie-bios
url = https://github.com/mpickering/hie-bios/
branch = multi-cradle

1
cabal.project
View File

@ -1,6 +1,7 @@
packages:
./
./hie-plugin-api/
./hie-bios/
./submodules/HaRe
./submodules/cabal-helper/

2
haskell-ide-engine.cabal
View File

@ -96,7 +96,7 @@ library
, vector
, versions
, yaml >= 0.8.31
, hie-bios == 0.2.1
, hie-bios
, bytestring-trie
, unliftio
if impl(ghc < 8.4)

1
hie-bios Submodule

@ -0,0 +1 @@
Subproject commit 28b592ae88b29bc11c11343c5a364949ae497a4f

11
hie-plugin-api/Haskell/Ide/Engine/ModuleCache.hs
View File

@ -165,11 +165,14 @@ loadCradle iniDynFlags (NewCradle fp) = do
-- This is a fix for: https://github.com/mpickering/haskell-ide-engine/issues/10
compOpts <- liftIO $ BIOS.getCompilerOptions fp cradle
case compOpts of
Left err -> liftIO $ GHCIO.throwIO err
Right (BIOS.CompilerOptions xs) -> do
BIOS.CradleNone -> return ()
BIOS.CradleFail err -> liftIO $ GHCIO.throwIO err
BIOS.CradleSuccess opts -> do
let
opts' = BIOS.CompilerOptions
(if isStackCradle cradle then xs ++ [fp] else xs)
opts' = opts
{ BIOS.componentOptions =
BIOS.componentOptions opts ++ [fp | isStackCradle cradle]
}
targets <- BIOS.initSession opts'
GHC.setTargets targets

3
stack-8.2.2.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -38,7 +39,7 @@ extra-deps:
- unix-time-0.4.7
- ghc-boot-8.2.2
## introduced by hie-bios
- hie-bios-0.2.1
#- hie-bios-0.2.1
- extra-1.6.18
- unix-compat-0.5.2
- yaml-0.11.1.2

3
stack-8.4.2.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -37,7 +38,7 @@ extra-deps:
- unix-time-0.4.7
- windns-0.1.0.0
- yi-rope-0.11
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
# - hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack-8.4.3.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -35,7 +36,7 @@ extra-deps:
# To make build work in windows 7
- unix-time-0.4.7
- temporary-1.2.1.1
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
# - hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack-8.4.4.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -35,7 +36,7 @@ extra-deps:
# To make build work in windows 7
- unix-time-0.4.7
- temporary-1.2.1.1
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
#- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack-8.6.1.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -41,7 +42,7 @@ extra-deps:
- temporary-1.2.1.1
# To make build work in windows 7
- unix-time-0.4.7
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
# - hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack-8.6.2.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -34,7 +35,7 @@ extra-deps:
- temporary-1.2.1.1
# To make build work in windows 7
- unix-time-0.4.7
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
#- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack-8.6.3.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -35,7 +36,7 @@ extra-deps:
- temporary-1.2.1.1
# To make build work in windows 7
- unix-time-0.4.7
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
# - hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack-8.6.4.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -33,7 +34,7 @@ extra-deps:
- temporary-1.2.1.1
# To make build work in windows 7
- unix-time-0.4.7
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
# - hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack-8.6.5.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod
@ -31,7 +32,7 @@ extra-deps:
- rope-utf16-splay-0.3.1.0
- syz-0.2.0.0
- temporary-1.2.1.1
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
# - hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb

3
stack.yaml
View File

@ -4,6 +4,7 @@ packages:
- hie-plugin-api
extra-deps:
- ./hie-bios
- ./submodules/HaRe
- ./submodules/cabal-helper
- ./submodules/ghc-mod/ghc-project-types
@ -27,7 +28,7 @@ extra-deps:
- monad-dijkstra-0.1.1.2@rev:1
- syz-0.2.0.0
- temporary-1.2.1.1
- hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
# - hie-bios-0.2.1@sha256:5f98a3516ce65e0a3ffd88bf6fb416b04cc084371d0fbf0e1762780de1d652ce,3219
- extra-1.6.18@sha256:5f1fff126f0ae47b701fff5aa8462dc63cb44465d5a724b0afd20a3d731903af
- unix-compat-0.5.2@sha256:16763f1fae4a25abf61ac6195eb530ce838474bd04d86c7d353340aee8716bbb
- yaml-0.11.1.2@sha256:cbc4ddb233c564967aad27ee47c1cd8fd6a06b9183353e76fe66c9be7c9dfd76