Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specify tool dependencies using build-tool-depends. Refs #149. #228

Merged
merged 10 commits into from
Feb 2, 2025
+29 −12
Merged

Specify tool dependencies using build-tool-depends. Refs #149. #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2b46ebf
ogma-language-c: Specify tools needed using build-tool-depends. Refs …
ivanperez-keera Feb 2, 2025
24ddff3
ogma-language-cocospec: Specify tools needed using build-tool-depends…
ivanperez-keera Feb 2, 2025
28b62fc
ogma-language-smv: Specify tools needed using build-tool-depends. Ref…
ivanperez-keera Feb 2, 2025
8889c92
ogma-cli: Add cabal.project. Refs #149.
ivanperez-keera Feb 2, 2025
9e1f959
ogma-cli: Install bnfc in Github jobs. Refs #149.
ivanperez-keera Feb 2, 2025
ac68632
ogma-cli: Simplify installation instructions. Refs #149.
ivanperez-keera Feb 2, 2025
76c70c0
ogma-language-c: Document changes in CHANGELOG. Refs #149.
ivanperez-keera Feb 2, 2025
f8ffed4
ogma-language-cocospec: Document changes in CHANGELOG. Refs #149.
ivanperez-keera Feb 2, 2025
d067ec4
ogma-language-smv: Document changes in CHANGELOG. Refs #149.
ivanperez-keera Feb 2, 2025
ede7dda
ogma-cli: Document changes in CHANGELOG. Refs #149.
ivanperez-keera Feb 2, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
- name: Install dependencies
run: |
cabal v1-install alex happy
cabal v1-install BNFC

- name: Install ogma
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/repo-ghc-8.6-cabal-2.4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
- name: Install dependencies
run: |
cabal v1-install alex happy
cabal v1-install BNFC

- name: Install ogma
run: |
Expand Down
2 changes: 2 additions & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
packages:
*/
1 change: 1 addition & 0 deletions ogma-cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

* Add all auxiliary test files to distributable Cabal package (#216).
* Remove extraneous EOL character (#224).
* Update installation instructions to use cabal install (#149).

## [1.6.0] - 2025-01-21

Expand Down
12 changes: 6 additions & 6 deletions ogma-cli/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ Once GHC and cabal are installed, the simplest way to install Ogma is with:
```sh
$ git clone https://github.com/nasa/ogma.git
$ cd ogma
$ export PATH="$HOME/.cabal/bin/:$PATH"
$ cabal v1-update
$ cabal v1-install alex happy
$ cabal v1-install BNFC copilot
$ cabal v1-install ogma-*/
$ export PATH="$HOME/.local/bin/:$PATH"
$ cabal update
$ cabal install --lib copilot copilot-c99 copilot-language copilot-theorem \
copilot-libraries copilot-interpreter
$ cabal install ogma-cli:ogma
```

After that, the `ogma` executable will be placed in the directory
`$HOME/.cabal/bin/`, where `$HOME` represents your user's home directory.
`$HOME/.local/bin/`, where `$HOME` represents your user's home directory.

# Usage
<sup>[(Back to top)](#table-of-contents)</sup>
Expand Down
1 change: 1 addition & 0 deletions ogma-language-c/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [1.X.Y] - 2025-02-01
* Bump upper version constraint on Cabal (#213).
* Remove extraneous EOL character (#224).
* Specify tools needed using build-tool-depends (#149).

## [1.6.0] - 2025-01-21

Expand Down
7 changes: 5 additions & 2 deletions ogma-language-c/ogma-language-c.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

cabal-version: 2.0
build-type: Custom

name: ogma-language-c
version: 1.6.0
homepage: https://github.com/nasa/ogma
Expand Down Expand Up @@ -72,7 +71,6 @@ custom-setup
base >= 4.11.0.0 && < 5
, Cabal >= 2.0 && < 3.15
, process >= 1.6 && < 1.7
, BNFC >= 2.9.1 && < 2.10

library

Expand All @@ -93,6 +91,11 @@ library
base >= 4.11.0.0 && < 5
, array >= 0.5.2.0 && < 0.6

build-tool-depends:
alex:alex >= 3
, BNFC:bnfc >= 2.9.4
, happy:happy >= 1.19

hs-source-dirs:
src

Expand Down
1 change: 1 addition & 0 deletions ogma-language-cocospec/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Remove references to old design of Ogma from documentation (#220).
* Bump upper version constraint on Cabal (#213).
* Remove extraneous EOL character (#224).
* Specify tools needed using build-tool-depends (#149).

## [1.6.0] - 2025-01-21

Expand Down
7 changes: 5 additions & 2 deletions ogma-language-cocospec/ogma-language-cocospec.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

cabal-version: 2.0
build-type: Custom

name: ogma-language-cocospec
version: 1.6.0
homepage: https://github.com/nasa/ogma
Expand Down Expand Up @@ -72,7 +71,6 @@ custom-setup
base >= 4.11.0.0 && < 5
, Cabal >= 2.0 && < 3.15
, process >= 1.6 && < 1.7
, BNFC >= 2.9.1 && < 2.10

library

Expand All @@ -93,6 +91,11 @@ library
base >= 4.11.0.0 && < 5
, array >= 0.5.2.0 && < 0.6

build-tool-depends:
alex:alex >= 3
, BNFC:bnfc >= 2.9.4
, happy:happy >= 1.19

hs-source-dirs:
src

Expand Down
1 change: 1 addition & 0 deletions ogma-language-smv/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Remove references to old design of Ogma from documentation (#220).
* Bump upper version constraint on Cabal (#213).
* Remove extraneous EOL character (#224).
* Specify tools needed using build-tool-depends (#149).

## [1.6.0] - 2025-01-21

Expand Down
7 changes: 5 additions & 2 deletions ogma-language-smv/ogma-language-smv.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

cabal-version: 2.0
build-type: Custom

name: ogma-language-smv
version: 1.6.0
homepage: https://github.com/nasa/ogma
Expand Down Expand Up @@ -72,7 +71,6 @@ custom-setup
base >= 4.11.0.0 && < 5
, Cabal >= 2.0 && < 3.15
, process >= 1.6 && < 1.7
, BNFC >= 2.9.1 && < 2.10

library

Expand All @@ -94,6 +92,11 @@ library
base >= 4.11.0.0 && < 5
, array >= 0.5.2.0 && < 0.6

build-tool-depends:
alex:alex >= 3
, BNFC:bnfc >= 2.9.4
, happy:happy >= 1.19

hs-source-dirs:
src

Expand Down