diff --git a/.gitignore b/.gitignore index 4ec61d1..aae1fb0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /.lock-waf* /.waf* +/.rsconscache /build/ /test/tmp/ /coverage/ diff --git a/Makefile b/Makefile index fd4fd5b..cdc1d18 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,7 @@ +.PHONY: all all: - ./waf build --targets jes + @rscons .PHONY: clean clean: - ./waf clean - -ifneq ($(FILTER),) - GTEST_FILTER := --gtest_filter=$(FILTER) -endif - -.PHONY: build_tests -build_tests: - ./waf build --targets tests - -.PHONY: test -test: build_tests - ./build/tests $(GTEST_FILTER) - @-rm -rf coverage - -gcovinator -b build -s src + @rscons -c diff --git a/Rsconsfile b/Rsconsfile new file mode 100644 index 0000000..7b20541 --- /dev/null +++ b/Rsconsfile @@ -0,0 +1,6 @@ +Rscons::Environment.new do |env| + env["sources"] = Dir[ + "src/**/*.d", + "src/**/*.c"] + env.Program("#{env.build_root}/jes", "${sources}") +end