Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Libs so #6

Merged
merged 12 commits into from
Feb 10, 2018
Merged

Libs so #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
22762f9
Added changes to Makefiles to create shared object
cyocum Jan 23, 2018
65ab06d
Made libgherkin.so build by default
cyocum Jan 23, 2018
b974507
Removed unnecessary linker directive
cyocum Jan 23, 2018
b0ade5f
Created a make install and moved file
cyocum Jan 23, 2018
621dd46
Attempting to fix error on CI with mingw-gcc
Jan 25, 2018
8325fb2
Made changes based on reviewer feedback
Jan 26, 2018
7a63949
Merge branch 'master' into libs_so
aslakhellesoy Jan 26, 2018
9e73887
Removed -soname from shared flags as this was causing failure on OSX
Jan 26, 2018
9ca47fa
Added libs_so to all target
cyocum Jan 29, 2018
05c5675
Correct the target of the make rule for the dynamic library.
brasmusson Jan 29, 2018
9f1cd4d
gherkin: Add .PHONY targets, formatting
aslakhellesoy Jan 30, 2018
0bd23be
Merge branch 'master' into libs_so
aslakhellesoy Jan 30, 2018
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
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,13 @@ libs: ./include/rule_type.h src/parser.c src/dialect.c $(SRC_FILES) src/Makefile
cd src; $(MAKE) CC=$(CC) $@
.PHONY: libs

libs_so: ./include/rule_type.h src/parser.c src/dialect.c $(SRC_FILES) src/Makefile
cd src; $(MAKE) CC=$(CC) $@
.PHONY: libs_so

.run: cli $(GHERKIN) $(GOOD_FEATURE_FILES)
$(RUN_GHERKIN) $(GOOD_FEATURE_FILES) | jq . > /dev/null
touch .run
touch $@

./include/rule_type.h: gherkin.berp gherkin-c-rule-type.razor
mono berp/berp.exe -g gherkin.berp -t gherkin-c-rule-type.razor -o $@
Expand Down Expand Up @@ -96,3 +100,4 @@ acceptance/testdata/%.feature.source.ndjson: testdata/%.feature testdata/%.featu
mkdir -p `dirname $@`
$(RUN_GHERKIN) --no-ast --no-pickles $< | jq --sort-keys --compact-output "." > $@
diff --unified <(jq "." $<.source.ndjson) <(jq "." $@)

1 change: 1 addition & 0 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.0.1
0 src/error_list.h → include/error_list.h
View file
Open in desktop
File renamed without changes.
0 src/file_reader.h → include/file_reader.h
View file
Open in desktop
File renamed without changes.
25 changes: 20 additions & 5 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
GCC_FLAGS=-c -Wall -Werror -g
CLANG_FLAGS=-c -Wall -Werror -g
GCC_FLAGS=-c -Wall -Werror -g -fPIC
CLANG_FLAGS=-c -Wall -Werror -g -fPIC
GCC_SO_FLAGS=-shared
MINGW_FLAGS=-c -Wall -Werror -g

ifeq ($(CC),i686-w64-mingw32-gcc)
CC=i686-w64-mingw32-gcc
LD=i686-w64-mingw32-gcc
CC_FLAGS=$(GCC_FLAGS)
CC_FLAGS=$(MINGW_FLAGS)
AR=i686-w64-mingw32-ar
EXT=.exe
else ifeq ($(CC),clang)
Expand All @@ -25,13 +27,22 @@ LD_LIBS=-lm
RM_CMD=rm -rf
MKDIR_CMD=mkdir -p

VERSION=$(shell cat ../VERSION)

all: \
cli \
../bin/gherkin_generate_tokens$(EXT)
cli \
../bin/gherkin_generate_tokens$(EXT) \
libs_so
.PHONY: all

cli: ../bin/gherkin$(EXT)
.PHONY: cli

libs: ../libs/libgherkin.a
.PHONY: libs

libs_so: ../libs/libgherkin.so.$(VERSION)
.PHONY: libs_so

clean:
$(RM_CMD) ../bin ../objs ../libs
Expand Down Expand Up @@ -121,6 +132,10 @@ GHERKIN_CLI_OBJS= \
$(MKDIR_CMD) $(dir $@)
$(AR) $(AR_FLAGS) $@ $(UTILITIES_OBJS) $(PARSER_OBJS) $(AST_OBJS) $(COMPILER_OBJS) $(PICKLES_OBJS) $(EVENT_OBJS)

../libs/libgherkin.so.$(VERSION): $(UTILITIES_OBJS) $(PARSER_OBJS) $(AST_OBJS) $(COMPILER_OBJS) $(PICKLES_OBJS) $(EVENT_OBJS) Makefile
$(MKDIR_CMD) $(dir $@)
$(CC) $(GCC_SO_FLAGS) $(UTILITIES_OBJS) $(PARSER_OBJS) $(AST_OBJS) $(COMPILER_OBJS) $(PICKLES_OBJS) $(EVENT_OBJS) -o $@

../bin/gherkin_generate_tokens$(EXT): ../libs/libgherkin.a $(GENERATE_TOKEN_OBJS) Makefile
$(MKDIR_CMD) $(dir $@)
$(LD) $(LD_FLAGS) $(GENERATE_TOKEN_OBJS) -L../libs/ -lgherkin $(LD_LIBS) -o $@
Expand Down