extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2025-06-20 17:58:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow override of LEX and YACC; merge changes from macos-ci branch

Browse Source
This commit is contained in:
Matthew Thompson 2023-08-30 14:15:57 +02:00 committed by Thomas Jensen
parent 3551c4bd57
commit 069197052e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/boxes.yml vendored
View File

@ -46,14 +46,14 @@ jobs:
file: out/lcov-total.info file: out/lcov-total.info
format: lcov format: lcov
build-macos: build-mac:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: add-packages - name: add-packages
run: | run: |
brew install flex bison libunistring pcre2 ncurses diffutils lcov cmocka brew install git flex bison libunistring pcre2 ncurses diffutils lcov cmocka
- name: make cov - name: make cov
run: make cov LEX=/usr/local/opt/flex/bin/flex YACC=/usr/local/opt/bison/bin/bison run: make cov LEX=/usr/local/opt/flex/bin/flex YACC=/usr/local/opt/bison/bin/bison

9
Makefile
View File

@ -23,6 +23,11 @@ DOC_FILES = doc/boxes.1 doc/boxes.el
PKG_NAME = boxes-$(BVERSION) PKG_NAME = boxes-$(BVERSION)
OUT_DIR = out OUT_DIR = out
# Set some defaults for LEX and YACC but allow env
# variables to override them.
LEX ?= flex
YACC ?= bison
PCRE2_VERSION = 10.40 PCRE2_VERSION = 10.40
PCRE2_DIR = vendor/pcre2-$(PCRE2_VERSION) PCRE2_DIR = vendor/pcre2-$(PCRE2_VERSION)
LIBUNISTRING_VERSION = 1.0 LIBUNISTRING_VERSION = 1.0
@ -44,7 +49,7 @@ WIN_CMOCKA_DIR = vendor/cmocka-$(WIN_CMOCKA_VERSION)
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
build cov debug: infomsg replaceinfos build cov debug: infomsg replaceinfos
$(MAKE) -C src BOXES_PLATFORM=unix LEX=flex YACC=bison $@ $(MAKE) -C src BOXES_PLATFORM=unix LEX=$(LEX) YACC=$(YACC) $@
win32: infomsg replaceinfos win32: infomsg replaceinfos
$(MAKE) -C src BOXES_PLATFORM=win32 C_INCLUDE_PATH=../$(PCRE2_DIR)/src LDFLAGS=-L../$(PCRE2_DIR)/.libs \ $(MAKE) -C src BOXES_PLATFORM=win32 C_INCLUDE_PATH=../$(PCRE2_DIR)/src LDFLAGS=-L../$(PCRE2_DIR)/.libs \
@ -124,7 +129,7 @@ $(LIBNCURSES_DIR)/lib/libncurses.a: vendor/libncurses-$(LIBNCURSES_VERSION).tar.
cd $(LIBNCURSES_DIR) ; ./configure --enable-static ; $(MAKE) cd $(LIBNCURSES_DIR) ; ./configure --enable-static ; $(MAKE)
static: infomsg replaceinfos $(LIBUNISTRING_DIR)/lib/.libs/libunistring.a $(PCRE2_DIR)/.libs/libpcre2-32.a $(LIBNCURSES_DIR)/lib/libncurses.a static: infomsg replaceinfos $(LIBUNISTRING_DIR)/lib/.libs/libunistring.a $(PCRE2_DIR)/.libs/libpcre2-32.a $(LIBNCURSES_DIR)/lib/libncurses.a
$(MAKE) -C src BOXES_PLATFORM=static LEX=flex YACC=bison LIBUNISTRING_DIR=$(LIBUNISTRING_DIR) \ $(MAKE) -C src BOXES_PLATFORM=static LEX=$(LEX) YACC=$(YACC) LIBUNISTRING_DIR=$(LIBUNISTRING_DIR) \
PCRE2_DIR=$(PCRE2_DIR) LIBNCURSES_DIR=$(LIBNCURSES_DIR) LIBNCURSES_WIN_INCLUDE=$(LIBNCURSES_WIN_INCLUDE) $@ PCRE2_DIR=$(PCRE2_DIR) LIBNCURSES_DIR=$(LIBNCURSES_DIR) LIBNCURSES_WIN_INCLUDE=$(LIBNCURSES_WIN_INCLUDE) $@

2
src/Makefile
View File

@ -102,7 +102,7 @@ flags_:
exit 1 exit 1
parser.c parser.h: parser.y lex.yy.h | check_dir parser.c parser.h: parser.y lex.yy.h | check_dir
$(YACC) --warnings=all --verbose --defines=parser.h --output=parser.c $< $(YACC) -Wall --verbose --header=parser.h -o parser.c $<
lex.yy.c lex.yy.h: lexer.l | check_dir lex.yy.c lex.yy.h: lexer.l | check_dir
$(LEX) --header-file=lex.yy.h $< $(LEX) --header-file=lex.yy.h $<