Skip to content

Commit

Permalink
Run cask build in build scripts, in addition to cargo build
Browse files Browse the repository at this point in the history
  • Loading branch information
ubolonton committed Apr 20, 2020
1 parent 6874deb commit 55cf498
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .azure-pipelines/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ resources:
steps:
- template: .azure-pipelines/steps/setup-rust.yml@emacs-module-rs
- template: .azure-pipelines/steps/setup-llvm.yml@emacs-module-rs
- template: steps/-build.yml
- template: .azure-pipelines/steps/setup-emacs.yml@emacs-module-rs
- template: .azure-pipelines/steps/setup-cask.yml@emacs-module-rs
- template: steps/-build.yml
- template: steps/setup-tree-sitter-cli.yml
- template: steps/-test.yml
3 changes: 2 additions & 1 deletion .azure-pipelines/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ jobs:
steps:
- template: .azure-pipelines/steps/setup-rust.yml@emacs-module-rs
- template: .azure-pipelines/steps/setup-llvm.yml@emacs-module-rs
- template: .azure-pipelines/steps/setup-emacs.yml@emacs-module-rs
- template: .azure-pipelines/steps/setup-cask.yml@emacs-module-rs
- template: steps/-build.yml
parameters:
target: release
- template: .azure-pipelines/steps/setup-emacs.yml@emacs-module-rs
- template: steps/setup-tree-sitter-cli.yml
- template: steps/-test.yml
- template: steps/-save-binaries.yml
Expand Down
2 changes: 2 additions & 0 deletions .azure-pipelines/steps/-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ parameters:

steps:
- powershell: |
cask install
.\bin\build.ps1 ${{ parameters.target }}
displayName: Build all packages (Windows)
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

- bash: |
cask install
./bin/build ${{ parameters.target }}
displayName: Build all packages
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ before_install:
- git clone -b master https://github.com/ubolonton/evm.git $HOME/.evm
- evm config path /tmp
- evm install $EVM_EMACS --use --skip
- curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python

install:
- cask install
- make build

before_script:
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ For consistency with Emacs's conventions, this binding has some differences comp
Clone this repo and add its `lisp` and `langs` directories to `load-path`.
Install [cask](https://cask.readthedocs.io) and run `cask install` to install dev dependencies.
If you want to hack on the high-level features (in Lisp) only:
- Evaluate this (once) to download the necessary binaries:
```emacs-lisp
Expand Down
2 changes: 2 additions & 0 deletions bin/build
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ source "$here/env.bash"

MODULE_DIR="$PROJECT_ROOT/target/$TARGET"
cp -f "$MODULE_DIR/$MODULE_ORIGINAL" "./lisp/$MODULE_RENAMED"

cask build
)
6 changes: 4 additions & 2 deletions bin/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ Push-Location $project_root

cargo build --all $extra

Pop-Location

Copy-Item $module_dir\$module_name.dll $project_root\lisp\$module_renamed.dll

cask build

Pop-Location

0 comments on commit 55cf498

Please sign in to comment.