Skip to content

Commit

Permalink
tweaked build for Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
osimon8 committed Mar 15, 2022
1 parent 1c8cf1e commit 450e8f2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-latest
- os: macOS-11
release_name: combc-mac
- os: ubuntu-latest
release_name: combc-ubuntu
Expand All @@ -23,7 +23,7 @@ jobs:
ocaml-compiler:
- 4.13.x
os:
- macos-latest
- macOS-11
- ubuntu-latest
- windows-latest

Expand Down Expand Up @@ -69,9 +69,6 @@ jobs:
- name: Download artifacts
uses: actions/download-artifact@v3

- name: Test - View working directory
run: ls -R

- name: Publish
uses: softprops/action-gh-release@v1
with:
Expand Down
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The compiler is built in OCaml, and uses [Dune](https://dune.build/).

To build from source, install dependencies using:

`opam install . --deps-only`
opam install . --deps-only

Then, run `dune build`.

Expand All @@ -19,12 +19,21 @@ Simply supply the file name containing the CombinatorC program as a command line

For example, on Windows:

`combc-windows.exe input.txt`
combc-windows.exe input.txt

Optionally, you can set the flag `--output-json` to output a JSON string representing the blueprint instead of a Factorio blueprint string.

The output blueprint will have the name of the input file.

### Running on Mac

By default MacOS will block executables from unknown developers. To get around this, navigate to the install location and run the following commands:

xattr -d com.apple.quarantine combc-mac
chmod +x combc-mac

Now, you should be able to run the compiler normally.

## Language

A CombinatorC program starts with optional compiler directives, and is followed by an optional list circuit bindings that are terminated by semicolons. A final output circuit is required, which can either be a circuit binding or an expression. This should not be terminated by a semicolon.
Expand Down
2 changes: 1 addition & 1 deletion combc.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "0.1.8"
version: "0.1.9"
synopsis: "C-style language that compiles to Factorio combinators"
maintainer: ["Owen Simon <osimon922@gmail.com>"]
authors: ["Owen Simon <osimon922@gmail.com>"]
Expand Down
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(lang dune 3.0)
(using menhir 2.1)
(name combc)
(version 0.1.8)
(version 0.1.9)
(license "GPL-3.0")
(authors "Owen Simon <osimon922@gmail.com>")
(maintainers "Owen Simon <osimon922@gmail.com>")
Expand Down

0 comments on commit 450e8f2

Please sign in to comment.