Skip to content

Commit

Permalink
more fixes in build and breakout zencode-exec target
Browse files Browse the repository at this point in the history
for python, rust and golang only the zencode-exec binary is needed
  • Loading branch information
jaromil committed Sep 24, 2024
1 parent 38a520f commit db69f44
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 10 deletions.
21 changes: 16 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
pip3 install meson ninja
sudo apt-get install -qy zsh libreadline-dev
- run: |
make -f build/linux.mk CCACHE=1
make -f build/linux.mk deps zencode-exec CCACHE=1
cp zencode-exec /usr/local/bin/
- name: 🧪 test bindings go-${{ matrix.go }}
working-directory: bindings/golang/zenroom
Expand Down Expand Up @@ -309,16 +309,27 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- run: |
- name: Install dependencies on Linux
run: |
sudo apt update
sudo apt install -yq zsh cmake libreadline-dev
if: runner.os == 'Linux'
- run: brew install zsh
- name: Install dependencies on Apple/OSX
run: |
brew install zsh
if: runner.os == 'macOS'
- run: |
- name: Build zencode-exec on Linux
run: |
cd ../..
make -f build/linux.mk COMPILER=clang
make -f build/linux.mk deps zencode-exec
cp zencode-exec /usr/local/bin/
if: runner.os == 'Linux'
- name: Build zencode-exec on Apple/OSX
run: |
cd ../..
make -f build/apple-osx.mk deps zencode-exec.command
cp zencode-exec.command /usr/local/bin/zencode-exec
if: runner.os == 'macOS'
- run: |
./prepare.sh
pipx install meson
Expand Down
4 changes: 3 additions & 1 deletion build/apple-osx.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ endif
# activate CCACHE etc.
include build/plugins.mk

all: ${BUILD_DEPS} zenroom.command zencode-exec.command
all: deps zenroom.command zencode-exec.command

deps: ${BUILD_DEPS}

cli_sources := src/cli-zenroom.o src/repl.o
zenroom.command: ${ZEN_SOURCES} ${cli_sources}
Expand Down
3 changes: 1 addition & 2 deletions build/deps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
-c $< -o $@ \
-DVERSION=\"${VERSION}\" \
-DCURRENT_YEAR=\"${CURRENT_YEAR}\" \
-DMAKETARGET=\"${MAKECMDGOALS}\" \
-DCOMMIT=\"${COMMIT}\" \
-DBRANCH=\"${BRANCH}\" \
-DCFLAGS="${CFLAGS}"
-DCFLAGS="${cflags}"

embed-lua: lua_embed_opts := $(if ${COMPILE_LUA}, compile)
embed-lua:
Expand Down
5 changes: 3 additions & 2 deletions build/linux.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ endif
# activate CCACHE etc.
include build/plugins.mk

all: ${BUILD_DEPS} zenroom zencode-exec zencc
$(call update_compilers,${COMPILER})
all: deps zenroom zencode-exec zencc

deps: ${BUILD_DEPS}

cli_sources := src/cli-zenroom.o src/repl.o
zenroom: ${ZEN_SOURCES} ${cli_sources}
Expand Down

0 comments on commit db69f44

Please sign in to comment.