From b3a7a6b36c695abc5515e806464b497997f59115 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 13 May 2016 11:36:41 +0100 Subject: Add a makefile Replace the python scripts for building the shared lib and tests with a Makefile, which makes it easier to handle a mix of C and C++. --- Makefile | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a722b70 --- /dev/null +++ b/Makefile @@ -0,0 +1,69 @@ +#!/usr/bin/make -f + +BUILD_DIR := build +OPTIMIZE_FLAGS ?= -g -O3 +TEST_OPTIMIZE_FLAGS ?= -g -O0 +CC = gcc +TARGET := $(BUILD_DIR)/libolm.so + +SOURCES := $(wildcard src/*.cpp) $(wildcard src/*.c) +OBJECTS := $(patsubst src/%,$(BUILD_DIR)/%,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SOURCES)))) +TEST_SOURCES := $(wildcard tests/test_*.cpp) $(wildcard tests/test_*.c) +TEST_BINARIES := $(patsubst tests/%,$(BUILD_DIR)/%,$(patsubst %.c,%,$(patsubst %.cpp,%,$(TEST_SOURCES)))) + +CPPFLAGS += -Iinclude -Ilib +CFLAGS += -Wall --std=c89 -fPIC +CXXFLAGS += -Wall --std=c++11 -fPIC +LDFLAGS += -Wall + +# generate .d files when compiling +CPPFLAGS += -MMD + +### per-target variables + +$(OBJECTS): CFLAGS += $(OPTIMIZE_FLAGS) +$(OBJECTS): CXXFLAGS += $(OPTIMIZE_FLAGS) +$(TARGET): LDFLAGS += $(OPTIMIZE_FLAGS) + +$(TEST_BINARIES): CPPFLAGS += -Itests/include +$(TEST_BINARIES): LDLIBS += -lolm +$(TEST_BINARIES): LDFLAGS += $(TEST_OPTIMIZE_FLAGS) -L$(BUILD_DIR) + +### top-level targets + +$(TARGET): $(OBJECTS) + $(CXX) $(LDFLAGS) --shared -fPIC $^ $(OUTPUT_OPTION) + +clean:; + rm -rf $(OBJECTS) $(OBJECTS:.o=.d) \ + $(TEST_BINARIES) $(TEST_BINARIES:=.d) \ + $(TARGET) + +build_tests: $(TEST_BINARIES) + +test: build_tests + for i in $(TEST_BINARIES); do \ + echo $$i; \ + LD_LIBRARY_PATH=$(BUILD_DIR) $$i || exit $$?; \ + done + +### rules for building objects +$(BUILD_DIR)/%.o: src/%.c + $(COMPILE.c) $(OUTPUT_OPTION) $< + +$(BUILD_DIR)/%.o: src/%.cpp + $(COMPILE.cc) $(OUTPUT_OPTION) $< + +$(BUILD_DIR)/%: tests/%.c + $(LINK.c) $< $(LOADLIBES) $(LDLIBS) -o $@ + +$(BUILD_DIR)/%: tests/%.cpp + $(LINK.cc) $< $(LOADLIBES) $(LDLIBS) -o $@ + + +### dependencies + +$(TEST_BINARIES): $(TARGET) + +-include $(OBJECTS:.o=.d) +-include $(TEST_BINARIES:=.d) -- cgit v1.2.3 From d4c8aae803a1fad46ded6e82a64575d9b6e40a7e Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 20 May 2016 09:36:50 +0100 Subject: Add support for building the JS wrappers to the Makefile Now that we have C and C++, we need to split the compile and link steps (because we need different flags for the C and C++ files), so this is easier with a Makefile. --- Makefile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a722b70..20a82a6 100644 --- a/Makefile +++ b/Makefile @@ -3,19 +3,38 @@ BUILD_DIR := build OPTIMIZE_FLAGS ?= -g -O3 TEST_OPTIMIZE_FLAGS ?= -g -O0 +JS_OPTIMIZE_FLAGS ?= -O3 CC = gcc +EMCC = emcc TARGET := $(BUILD_DIR)/libolm.so +JS_TARGET := javascript/olm.js + +JS_EXPORTED_FUNCTIONS := javascript/exported_functions.json + +PUBLIC_HEADERS := include/olm/olm.hh SOURCES := $(wildcard src/*.cpp) $(wildcard src/*.c) OBJECTS := $(patsubst src/%,$(BUILD_DIR)/%,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SOURCES)))) TEST_SOURCES := $(wildcard tests/test_*.cpp) $(wildcard tests/test_*.c) TEST_BINARIES := $(patsubst tests/%,$(BUILD_DIR)/%,$(patsubst %.c,%,$(patsubst %.cpp,%,$(TEST_SOURCES)))) +JS_OBJECTS := $(patsubst %.o,%.js.bc,$(OBJECTS)) +JS_PRE := $(wildcard javascript/*pre.js) +JS_POST := $(wildcard javascript/*post.js) CPPFLAGS += -Iinclude -Ilib CFLAGS += -Wall --std=c89 -fPIC CXXFLAGS += -Wall --std=c++11 -fPIC LDFLAGS += -Wall +EMCCFLAGS = --closure 1 --memory-init-file 0 -s NO_FILESYSTEM=1 -s INVOKE_RUN=0 +# NO_BROWSER is kept for compatibility with emscripten 1.35.24, but is no +# longer needed. +EMCCFLAGS += -s NO_BROWSER=1 + +EMCC.c = $(EMCC) $(CFLAGS) $(CPPFLAGS) -c +EMCC.cc = $(EMCC) $(CXXFLAGS) $(CPPFLAGS) -c +EMCC_LINK = $(EMCC) $(LDFLAGS) $(EMCCFLAGS) + # generate .d files when compiling CPPFLAGS += -MMD @@ -29,14 +48,29 @@ $(TEST_BINARIES): CPPFLAGS += -Itests/include $(TEST_BINARIES): LDLIBS += -lolm $(TEST_BINARIES): LDFLAGS += $(TEST_OPTIMIZE_FLAGS) -L$(BUILD_DIR) +$(JS_OBJECTS): CFLAGS += $(JS_OPTIMIZE_FLAGS) +$(JS_OBJECTS): CXXFLAGS += $(JS_OPTIMIZE_FLAGS) +$(JS_TARGET): LDFLAGS += $(JS_OPTIMIZE_FLAGS) + ### top-level targets $(TARGET): $(OBJECTS) $(CXX) $(LDFLAGS) --shared -fPIC $^ $(OUTPUT_OPTION) +js: $(JS_TARGET) +.PHONY: js + +$(JS_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) + $(EMCC_LINK) \ + --pre-js $(JS_PRE) --post-js $(JS_POST) \ + -s "EXPORTED_FUNCTIONS=@$(JS_EXPORTED_FUNCTIONS)" \ + $(JS_OBJECTS) -o $@ + clean:; rm -rf $(OBJECTS) $(OBJECTS:.o=.d) \ $(TEST_BINARIES) $(TEST_BINARIES:=.d) \ + $(JS_OBJECTS) $(JS_TARGET) \ + $(JS_EXPORTED_FUNCTIONS) \ $(TARGET) build_tests: $(TEST_BINARIES) @@ -47,6 +81,10 @@ test: build_tests LD_LIBRARY_PATH=$(BUILD_DIR) $$i || exit $$?; \ done +$(JS_EXPORTED_FUNCTIONS): $(PUBLIC_HEADERS) + perl -MJSON -ne '/(olm_[^( ]*)\(/ && push @f, "_$$1"; END { print encode_json \@f }' $^ > $@.tmp + mv $@.tmp $@ + ### rules for building objects $(BUILD_DIR)/%.o: src/%.c $(COMPILE.c) $(OUTPUT_OPTION) $< @@ -54,6 +92,12 @@ $(BUILD_DIR)/%.o: src/%.c $(BUILD_DIR)/%.o: src/%.cpp $(COMPILE.cc) $(OUTPUT_OPTION) $< +$(BUILD_DIR)/%.js.bc: src/%.c + $(EMCC.c) $(OUTPUT_OPTION) $< + +$(BUILD_DIR)/%.js.bc: src/%.cpp + $(EMCC.cc) $(OUTPUT_OPTION) $< + $(BUILD_DIR)/%: tests/%.c $(LINK.c) $< $(LOADLIBES) $(LDLIBS) -o $@ @@ -66,4 +110,5 @@ $(BUILD_DIR)/%: tests/%.cpp $(TEST_BINARIES): $(TARGET) -include $(OBJECTS:.o=.d) +-include $(JS_OBJECTS:.bc=.d) -include $(TEST_BINARIES:=.d) -- cgit v1.2.3 From 488567a45f95cefd258f5f1a4cdf00c8848576d9 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 20 May 2016 12:01:18 +0100 Subject: Use a version script to restrict symbols in the .so We want to stop aes_* and sha_* functions leaking out of our .so, as well as internal _olm_* symbols. This also means we need to link the unit tests against the objects. Possibly we should distinguish between unit tests and integration tests. --- Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 20a82a6..9e01a1f 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,6 @@ $(OBJECTS): CXXFLAGS += $(OPTIMIZE_FLAGS) $(TARGET): LDFLAGS += $(OPTIMIZE_FLAGS) $(TEST_BINARIES): CPPFLAGS += -Itests/include -$(TEST_BINARIES): LDLIBS += -lolm $(TEST_BINARIES): LDFLAGS += $(TEST_OPTIMIZE_FLAGS) -L$(BUILD_DIR) $(JS_OBJECTS): CFLAGS += $(JS_OPTIMIZE_FLAGS) @@ -55,7 +54,9 @@ $(JS_TARGET): LDFLAGS += $(JS_OPTIMIZE_FLAGS) ### top-level targets $(TARGET): $(OBJECTS) - $(CXX) $(LDFLAGS) --shared -fPIC $^ $(OUTPUT_OPTION) + $(CXX) $(LDFLAGS) --shared -fPIC \ + -Wl,--version-script,version_script.ver \ + $(OUTPUT_OPTION) $(OBJECTS) js: $(JS_TARGET) .PHONY: js @@ -78,7 +79,7 @@ build_tests: $(TEST_BINARIES) test: build_tests for i in $(TEST_BINARIES); do \ echo $$i; \ - LD_LIBRARY_PATH=$(BUILD_DIR) $$i || exit $$?; \ + $$i || exit $$?; \ done $(JS_EXPORTED_FUNCTIONS): $(PUBLIC_HEADERS) @@ -98,17 +99,15 @@ $(BUILD_DIR)/%.js.bc: src/%.c $(BUILD_DIR)/%.js.bc: src/%.cpp $(EMCC.cc) $(OUTPUT_OPTION) $< -$(BUILD_DIR)/%: tests/%.c - $(LINK.c) $< $(LOADLIBES) $(LDLIBS) -o $@ +$(BUILD_DIR)/%: tests/%.c $(OBJECTS) + $(LINK.c) $< $(OBJECTS) $(LOADLIBES) $(LDLIBS) -o $@ -$(BUILD_DIR)/%: tests/%.cpp - $(LINK.cc) $< $(LOADLIBES) $(LDLIBS) -o $@ +$(BUILD_DIR)/%: tests/%.cpp $(OBJECTS) + $(LINK.cc) $< $(OBJECTS) $(LOADLIBES) $(LDLIBS) -o $@ ### dependencies -$(TEST_BINARIES): $(TARGET) - -include $(OBJECTS:.o=.d) -include $(JS_OBJECTS:.bc=.d) -include $(TEST_BINARIES:=.d) -- cgit v1.2.3 From 85f2d57e0859c40a702ef79c73357fb641fa63a2 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 20 May 2016 15:28:54 +0100 Subject: Add an 'all' target to the Makefile So that we can build everything together. --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9e01a1f..27abf45 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,9 @@ $(JS_TARGET): LDFLAGS += $(JS_OPTIMIZE_FLAGS) ### top-level targets +lib: $(TARGET) +.PHONY: lib + $(TARGET): $(OBJECTS) $(CXX) $(LDFLAGS) --shared -fPIC \ -Wl,--version-script,version_script.ver \ @@ -86,6 +89,9 @@ $(JS_EXPORTED_FUNCTIONS): $(PUBLIC_HEADERS) perl -MJSON -ne '/(olm_[^( ]*)\(/ && push @f, "_$$1"; END { print encode_json \@f }' $^ > $@.tmp mv $@.tmp $@ +all: test js lib +.PHONY: lib + ### rules for building objects $(BUILD_DIR)/%.o: src/%.c $(COMPILE.c) $(OUTPUT_OPTION) $< -- cgit v1.2.3 From ab7610087a0908640436d1703d33fc78715ca5e1 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 20 May 2016 16:50:14 +0100 Subject: Remove dep files for js objects on clean --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 27abf45..aa63c79 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ $(JS_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) clean:; rm -rf $(OBJECTS) $(OBJECTS:.o=.d) \ $(TEST_BINARIES) $(TEST_BINARIES:=.d) \ - $(JS_OBJECTS) $(JS_TARGET) \ + $(JS_OBJECTS) $(JS_OBJECTS:=.d) $(JS_TARGET) \ $(JS_EXPORTED_FUNCTIONS) \ $(TARGET) -- cgit v1.2.3