This repository has been archived by the owner on Mar 10, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move to Stack for build system and support 7.10
- Loading branch information
Adam C. Foltzer
committed
Feb 12, 2016
1 parent
843196a
commit 3baa282
Showing
16 changed files
with
302 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| .cabal-sandbox | ||
| cabal.sandbox.config | ||
| Config.mk | ||
| .stack-work | ||
| /docs.tar | ||
| /docs/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule gec
updated
11 files
| +1 −0 | .gitignore | |
| +40 −3 | .travis.yml | |
| +5 −10 | Makefile | |
| +5 −4 | gec.cabal | |
| +1 −1 | src/GEC/Datagram/Pure.hs | |
| +2 −4 | src/GEC/KeyExchange.hs | |
| +4 −2 | src/GEC/KeyExchange/Pure.hs | |
| +39 −0 | stack-7.10.yaml | |
| +40 −0 | stack-8.0.yaml | |
| +11 −0 | stack.mk | |
| +40 −0 | stack.yaml |
Submodule gidl
updated
30 files
| +1 −0 | .gitignore | |
| +46 −36 | .travis.yml | |
| +48 −39 | Makefile | |
| +0 −34 | Makefile.sandbox | |
| +15 −12 | README.md | |
| +8 −6 | gidl.cabal | |
| +66 −21 | src/Gidl.hs | |
| +12 −6 | src/Gidl/Backend/Haskell.hs | |
| +2 −1 | src/Gidl/Backend/Haskell/Test.hs | |
| +42 −24 | src/Gidl/Backend/Ivory.hs | |
| +10 −10 | src/Gidl/Backend/Ivory/Schema.hs | |
| +2 −2 | src/Gidl/Backend/Ivory/Test.hs | |
| +24 −10 | src/Gidl/Backend/Ivory/Types.hs | |
| +13 −3 | src/Gidl/Backend/Rpc.hs | |
| +59 −28 | src/Gidl/Backend/Tower.hs | |
| +3 −3 | src/Gidl/Backend/Tower/Schema.hs | |
| +1 −1 | src/Gidl/Backend/Tower/Server.hs | |
| +12 −9 | src/Gidl/Parse.hs | |
| +43 −0 | stack-7.10.yaml | |
| +44 −0 | stack-8.0.yaml | |
| +10 −0 | stack.mk | |
| +42 −0 | stack.yaml | |
| +0 −5 | support/ivory/Makefile | |
| +5 −0 | support/ivory/Makefile.template | |
| +4 −4 | support/ivory/Unpack.hs.template | |
| +1 −5 | support/rpc/Makefile | |
| +15 −15 | support/tower/Attr.hs.template | |
| +1 −1 | support/tower/CodeGen.hs.template | |
| +0 −8 | support/tower/Makefile | |
| +6 −0 | support/tower/Makefile.template |
Submodule ivory-tower-posix
updated
18 files
| +1 −0 | .gitignore | |
| +33 −13 | .travis.yml | |
| +9 −5 | Makefile | |
| +0 −8 | Makefile.deps | |
| +0 −34 | Makefile.sandbox | |
| +1 −0 | ivory-tower-posix.cabal | |
| +9 −7 | src/Ivory/OS/Posix/Tower.hs | |
| +11 −11 | src/Ivory/OS/Posix/Tower/EventLoop.hs | |
| +3 −3 | src/Ivory/OS/Posix/Tower/IO.hs | |
| +8 −8 | src/Ivory/OS/Posix/Tower/Serial.hs | |
| +2 −2 | src/Ivory/OS/Posix/Tower/Signal.hs | |
| +56 −0 | stack-7.10.yaml | |
| +56 −0 | stack-8.0.yaml | |
| +11 −0 | stack.mk | |
| +52 −0 | stack.yaml | |
| +1 −1 | tests/Depends.hs | |
| +1 −1 | tests/Handlers.hs | |
| +1 −1 | tests/Tick.hs |
Submodule ivory-tower-stm32
updated
54 files
Submodule ivorylang-org
updated
4 files
| +1 −0 | .gitignore | |
| +9 −15 | Makefile | |
| +1 −1 | site.hs | |
| +39 −0 | stack.yaml |
Submodule smaccmpilot-org
updated
6 files
| +1 −0 | .gitignore | |
| +9 −17 | Makefile | |
| +9 −9 | README.md | |
| +1 −1 | pages/software/gcs-overview.md | |
| +2 −2 | site.hs | |
| +38 −0 | stack.yaml |
Submodule smaccmpilot-stm32f4
updated
145 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html | ||
|
|
||
| # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) | ||
| resolver: lts-5.1 | ||
|
|
||
| # Local packages, usually specified by relative directory name | ||
| packages: | ||
| - gec/ | ||
| - gidl/ | ||
| - ivory/ivory/ | ||
| - ivory/ivory-artifact/ | ||
| - ivory/ivory-backend-c/ | ||
| - ivory/ivory-eval/ | ||
| - ivory/ivory-examples/ | ||
| - ivory/ivory-hw/ | ||
| - ivory/ivory-model-check/ | ||
| - ivory/ivory-opts/ | ||
| - ivory/ivory-quickcheck/ | ||
| - ivory/ivory-serialize/ | ||
| - ivory/ivory-stdlib/ | ||
| #- ivory-rtverification/rtv-example/ | ||
| #- ivory-rtverification/rtv-lib/ | ||
| - ivory-tower-posix/ | ||
| - ivory-tower-stm32/ivory-bsp-stm32/ | ||
| - ivory-tower-stm32/ivory-bsp-tests/ | ||
| - ivory-tower-stm32/ivory-freertos-bindings/ | ||
| - ivory-tower-stm32/tower-freertos-stm32/ | ||
| - ivory-tower-stm32/tower-freertos-stm32-tests/ | ||
| #- ivorylang-org/ | ||
| #- smaccmpilot-org/ | ||
| - smaccmpilot-stm32f4/src/ivory-geo/ | ||
| - smaccmpilot-stm32f4/src/ivory-px4-hw/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-client/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-schema/smaccm-comm-schema-native/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-schema/smaccm-comm-schema-tower/ | ||
| - smaccmpilot-stm32f4/src/smaccm-commsec/ | ||
| - smaccmpilot-stm32f4/src/smaccm-datalink/ | ||
| - smaccmpilot-stm32f4/src/smaccm-flight/ | ||
| - smaccmpilot-stm32f4/src/smaccm-ins/ | ||
| - tower/tower/ | ||
| - tower/tower-aadl/ | ||
| - tower/tower-config/ | ||
| - tower/tower-hal/ | ||
| - tower-camkes-odroid/ | ||
| # estimator with relaxed version bounds; remove when pushed to Hackage | ||
| - location: | ||
| git: https://github.com/GaloisInc/estimator.git | ||
| commit: 4818515e8a05d7d9c54e51d7ac7fa21580336366 | ||
| extra-dep: true | ||
|
|
||
| # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) | ||
| extra-deps: | ||
| - base-compat-0.9.0 | ||
| - cipher-aes128-0.7.0.1 | ||
| - cpphs-1.19.3 | ||
| - curve25519-0.2.2 | ||
| - ed25519-donna-0.1.1 | ||
| # - estimator-1.1.0.2 | ||
| - exception-mtl-0.4 | ||
| - ghc-srcspan-plugin-0.2.1.0 | ||
| - language-c-quote-0.11.4 | ||
| - mainland-pretty-0.4.1.2 | ||
| - primitive-0.6.1.0 | ||
| - s-cargot-0.1.0.0 | ||
| - serialport-0.4.7 | ||
| - symbol-0.2.4 | ||
|
|
||
| # Override default flag values for local packages and extra-deps | ||
| flags: {} | ||
|
|
||
| # Extra package databases containing global packages | ||
| extra-package-dbs: [] | ||
|
|
||
| install-ghc: true | ||
|
|
||
| # Control whether we use the GHC we find on the path | ||
| # system-ghc: true | ||
|
|
||
| # Require a specific version of stack, using version ranges | ||
| # require-stack-version: -any # Default | ||
| # require-stack-version: >= 1.0.0 | ||
|
|
||
| # Override the architecture used by stack, especially useful on Windows | ||
| # arch: i386 | ||
| # arch: x86_64 | ||
|
|
||
| # Extra directories used by stack for building | ||
| # extra-include-dirs: [/path/to/dir] | ||
| # extra-lib-dirs: [/path/to/dir] | ||
|
|
||
| # Allow a newer minor version of GHC than the snapshot specifies | ||
| # compiler-check: newer-minor |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html | ||
|
|
||
| # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) | ||
| resolver: ghc-8.0.1 | ||
|
|
||
| # Local packages, usually specified by relative directory name | ||
| packages: | ||
| - gec/ | ||
| - gidl/ | ||
| - ivory/ivory/ | ||
| - ivory/ivory-artifact/ | ||
| - ivory/ivory-backend-c/ | ||
| - ivory/ivory-eval/ | ||
| - ivory/ivory-examples/ | ||
| - ivory/ivory-hw/ | ||
| - ivory/ivory-model-check/ | ||
| - ivory/ivory-opts/ | ||
| - ivory/ivory-quickcheck/ | ||
| - ivory/ivory-serialize/ | ||
| - ivory/ivory-stdlib/ | ||
| #- ivory-rtverification/rtv-example/ | ||
| #- ivory-rtverification/rtv-lib/ | ||
| - ivory-tower-posix/ | ||
| - ivory-tower-stm32/ivory-bsp-stm32/ | ||
| - ivory-tower-stm32/ivory-bsp-tests/ | ||
| - ivory-tower-stm32/ivory-freertos-bindings/ | ||
| - ivory-tower-stm32/tower-freertos-stm32/ | ||
| - ivory-tower-stm32/tower-freertos-stm32-tests/ | ||
| #- ivorylang-org/ | ||
| #- smaccmpilot-org/ | ||
| - smaccmpilot-stm32f4/src/ivory-geo/ | ||
| - smaccmpilot-stm32f4/src/ivory-px4-hw/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-client/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-schema/smaccm-comm-schema-native/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-schema/smaccm-comm-schema-tower/ | ||
| - smaccmpilot-stm32f4/src/smaccm-commsec/ | ||
| - smaccmpilot-stm32f4/src/smaccm-datalink/ | ||
| - smaccmpilot-stm32f4/src/smaccm-flight/ | ||
| - smaccmpilot-stm32f4/src/smaccm-ins/ | ||
| - tower/tower/ | ||
| - tower/tower-aadl/ | ||
| - tower/tower-config/ | ||
| - tower/tower-hal/ | ||
| - tower-camkes-odroid/ | ||
| # estimator with relaxed version bounds; remove when pushed to Hackage | ||
| - location: | ||
| git: https://github.com/GaloisInc/estimator.git | ||
| commit: 4818515e8a05d7d9c54e51d7ac7fa21580336366 | ||
| extra-dep: true | ||
|
|
||
| # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) | ||
| extra-deps: | ||
| - base-compat-0.9.0 | ||
| - cipher-aes128-0.7.0.1 | ||
| - cpphs-1.19.3 | ||
| - curve25519-0.2.2 | ||
| - ed25519-donna-0.1.1 | ||
| # - estimator-1.1.0.2 | ||
| - exception-mtl-0.4 | ||
| - ghc-srcspan-plugin-0.2.1.0 | ||
| - language-c-quote-0.11.4 | ||
| - mainland-pretty-0.4.1.2 | ||
| - primitive-0.6.1.0 | ||
| - s-cargot-0.1.0.0 | ||
| - serialport-0.4.7 | ||
| - symbol-0.2.4 | ||
|
|
||
| # Override default flag values for local packages and extra-deps | ||
| flags: {} | ||
|
|
||
| # Extra package databases containing global packages | ||
| extra-package-dbs: [] | ||
|
|
||
| system-ghc: true | ||
| skip-ghc-check: true | ||
| allow-newer: true | ||
|
|
||
| # Require a specific version of stack, using version ranges | ||
| # require-stack-version: -any # Default | ||
| # require-stack-version: >= 1.0.0 | ||
|
|
||
| # Override the architecture used by stack, especially useful on Windows | ||
| # arch: i386 | ||
| # arch: x86_64 | ||
|
|
||
| # Extra directories used by stack for building | ||
| # extra-include-dirs: [/path/to/dir] | ||
| # extra-lib-dirs: [/path/to/dir] | ||
|
|
||
| # Allow a newer minor version of GHC than the snapshot specifies | ||
| # compiler-check: newer-minor |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) | ||
|
|
||
| # Here lies some fine ideas for how to avoid rebuilding packages in | ||
| # new stack subprojects, such as those generated by the gidl | ||
| # tests. Unfortunately, there's no way to prevent stack from | ||
| # rebuilding dependencies pointed to by the `packages` stanza. | ||
|
|
||
| # STACK ?= stack --work-dir $(ROOT_DIR)/.stack-work | ||
| # export STACK_ROOT := $(ROOT_DIR)/.stack-work | ||
| # $(info STACK=$(STACK)) | ||
| # $(info STACK_ROOT=$(STACK_ROOT)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html | ||
|
|
||
| # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) | ||
| resolver: lts-2.22 | ||
|
|
||
| # Local packages, usually specified by relative directory name | ||
| packages: | ||
| - gec/ | ||
| - gidl/ | ||
| - ivory/ivory/ | ||
| - ivory/ivory-artifact/ | ||
| - ivory/ivory-backend-c/ | ||
| - ivory/ivory-eval/ | ||
| - ivory/ivory-examples/ | ||
| - ivory/ivory-hw/ | ||
| - ivory/ivory-model-check/ | ||
| - ivory/ivory-opts/ | ||
| - ivory/ivory-quickcheck/ | ||
| - ivory/ivory-serialize/ | ||
| - ivory/ivory-stdlib/ | ||
| #- ivory-rtverification/rtv-example/ | ||
| #- ivory-rtverification/rtv-lib/ | ||
| - ivory-tower-posix/ | ||
| - ivory-tower-stm32/ivory-bsp-stm32/ | ||
| - ivory-tower-stm32/ivory-bsp-tests/ | ||
| - ivory-tower-stm32/ivory-freertos-bindings/ | ||
| - ivory-tower-stm32/tower-freertos-stm32/ | ||
| - ivory-tower-stm32/tower-freertos-stm32-tests/ | ||
| #- ivorylang-org/ | ||
| #- smaccmpilot-org/ | ||
| - smaccmpilot-stm32f4/src/ivory-geo/ | ||
| - smaccmpilot-stm32f4/src/ivory-px4-hw/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-client/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-schema/smaccm-comm-schema-native/ | ||
| - smaccmpilot-stm32f4/src/smaccm-comm-schema/smaccm-comm-schema-tower/ | ||
| - smaccmpilot-stm32f4/src/smaccm-commsec/ | ||
| - smaccmpilot-stm32f4/src/smaccm-datalink/ | ||
| - smaccmpilot-stm32f4/src/smaccm-flight/ | ||
| - smaccmpilot-stm32f4/src/smaccm-ins/ | ||
| - tower/tower/ | ||
| - tower/tower-aadl/ | ||
| - tower/tower-config/ | ||
| - tower/tower-hal/ | ||
| - tower-camkes-odroid/ | ||
|
|
||
| # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) | ||
| extra-deps: | ||
| - base-compat-0.9.0 | ||
| - cipher-aes128-0.7.0.1 | ||
| - cpphs-1.19.3 | ||
| - curve25519-0.2.2 | ||
| - ed25519-donna-0.1 | ||
| - estimator-1.1.0.1 | ||
| - ghc-srcspan-plugin-0.2.1.0 | ||
| - primitive-0.6.1.0 | ||
| - s-cargot-0.1.0.0 | ||
| - serialport-0.4.7 | ||
|
|
||
| # Override default flag values for local packages and extra-deps | ||
| flags: {} | ||
|
|
||
| # Extra package databases containing global packages | ||
| extra-package-dbs: [] | ||
|
|
||
| install-ghc: true | ||
|
|
||
| # Control whether we use the GHC we find on the path | ||
| # system-ghc: true | ||
|
|
||
| # Require a specific version of stack, using version ranges | ||
| # require-stack-version: -any # Default | ||
| # require-stack-version: >= 1.0.0 | ||
|
|
||
| # Override the architecture used by stack, especially useful on Windows | ||
| # arch: i386 | ||
| # arch: x86_64 | ||
|
|
||
| # Extra directories used by stack for building | ||
| # extra-include-dirs: [/path/to/dir] | ||
| # extra-lib-dirs: [/path/to/dir] | ||
|
|
||
| # Allow a newer minor version of GHC than the snapshot specifies | ||
| # compiler-check: newer-minor |
Submodule tower
updated
49 files
Submodule tower-camkes-odroid
updated
10 files
| +2 −0 | .gitignore | |
| +48 −16 | .travis.yml | |
| +9 −6 | Makefile | |
| +5 −5 | src/Tower/Odroid/CAN.hs | |
| +2 −2 | src/Tower/Odroid/CameraVM.hs | |
| +3 −4 | src/Tower/Odroid/UART.hs | |
| +58 −0 | stack-7.10.yaml | |
| +57 −0 | stack-8.0.yaml | |
| +11 −0 | stack.mk | |
| +54 −0 | stack.yaml |