Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Remove ide-backend #179

Merged
merged 2 commits into from
Jan 18, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ before_install:
install:
- "./travis_long stack +RTS -N2 -RTS setup"
- "./travis_long stack build --only-snapshot"
- "./travis_long stack install ide-backend-server"
script:
- "STACK_YAML=stack_test.yaml ./travis_long stack +RTS -N1 -RTS build --test --no-run-tests"
- "./travis_long stack +RTS -N1 -RTS build --test"
- "./travis_long ./pedantic.sh"
- "./travis_long stack exec emacs24 -- -q --batch -L elisp -l elisp/tests/hie-tests.el
-f ert-run-tests-batch-and-exit"
- "./travis_long ./deploy-docs.sh"
Expand Down
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,27 @@ ifeq (,$(shell which $(emacs) 2> /dev/null))
endif

.PHONY: test
test: build-haskell test-haskell test-emacs
test: test-haskell test-emacs

.PHONY: test-emacs
test-emacs:
stack exec $(emacs) -- -q --batch -L elisp -l elisp/tests/hie-tests.el -f ert-run-tests-batch-and-exit

.PHONY: build-haskell
build-haskell:
@STACK_YAML=stack_test.yaml stack build --test --no-run-tests

.PHONY: test-haskell
test-haskell:
# stack build --test --pedantic
# stack complains about deprecations in ghc-mod as an extra dep
# build with -Werror enabled but run the tests without it because ide-backend picks it up
stack build --test
stack build --test --flag haskell-ide-engine:pedantic \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks encouraging

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should call pedantic.sh here instead, so the flags only get set in one place

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You’re right, but it requires some bash to not pass +RTS -N1 -RTS here. I’ll look the syntax for that up tomorrow and change it.

--flag hie-apply-refact:pedantic \
--flag hie-base:pedantic \
--flag hie-docs-generator:pedantic \
--flag hie-eg-plugin-async:pedantic \
--flag hie-example-plugin2:pedantic \
--flag hie-ghc-mod:pedantic \
--flag hie-ghc-tree:pedantic \
--flag hie-hare:pedantic \
--flag hie-plugin-api:pedantic

.PHONY: ghci-test
ghci-test:
Expand Down
2 changes: 0 additions & 2 deletions app/MainHie.hs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ import Haskell.Ide.ExamplePluginAsync
import Haskell.Ide.GhcModPlugin
import Haskell.Ide.GhcTreePlugin
import Haskell.Ide.HaRePlugin
import Haskell.Ide.IdeBackend

-- ---------------------------------------------------------------------

Expand All @@ -65,7 +64,6 @@ taggedPlugins =
:& Plugin (Proxy :: Proxy "ghctree") ghcTreeDescriptor
:& Plugin (Proxy :: Proxy "hare") hareDescriptor
:& Plugin (Proxy :: Proxy "base") baseDescriptor
:& Plugin (Proxy :: Proxy "ide-backend") idebackendDescriptor
:& RNil

recProxy :: Rec f t -> Proxy t
Expand Down
3 changes: 0 additions & 3 deletions haskell-ide-engine.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ executable hie
, hie-ghc-mod
, hie-ghc-tree
, hie-hare
, hie-ide-backend
, hie-plugin-api
, monad-logger
, optparse-applicative
Expand All @@ -114,7 +113,6 @@ test-suite haskell-ide-test
GhcModPluginSpec
GhcTreePluginSpec
HaRePluginSpec
IdeBackendPluginSpec
JsonStdioSpec
JsonSpec
UtilsSpec
Expand All @@ -130,7 +128,6 @@ test-suite haskell-ide-test
, hie-apply-refact
, hie-base
, hie-eg-plugin-async
, hie-ide-backend
, hie-ghc-mod
, hie-ghc-tree
, hie-hare
Expand Down
186 changes: 0 additions & 186 deletions hie-ide-backend/Haskell/Ide/IdeBackend.hs

This file was deleted.

2 changes: 0 additions & 2 deletions hie-ide-backend/Setup.hs

This file was deleted.

37 changes: 0 additions & 37 deletions hie-ide-backend/hie-ide-backend.cabal

This file was deleted.

11 changes: 11 additions & 0 deletions pedantic.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
stack +RTS -N1 -RTS build --test \
--flag hie-apply-refact:pedantic \
--flag hie-base:pedantic \
--flag hie-docs-generator:pedantic \
--flag hie-eg-plugin-async:pedantic \
--flag hie-example-plugin2:pedantic \
--flag hie-ghc-mod:pedantic \
--flag hie-ghc-tree:pedantic \
--flag hie-hare:pedantic \
--flag hie-plugin-api:pedantic \
1 change: 0 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ packages:
- hie-ghc-tree
- hie-hare
- hie-docs-generator
- hie-ide-backend
- location:
git: https://github.com/mpickering/apply-refact.git
commit: 402458652844c1a0f42b15123e0ceff761919415
Expand Down
50 changes: 0 additions & 50 deletions stack_test.yaml

This file was deleted.

Loading