Merge remote-tracking branch 'origin/master' into dbkr/ci2
This commit is contained in:
commit
82534708a3
5 changed files with 63 additions and 32 deletions
64
Makefile
64
Makefile
|
@ -14,10 +14,21 @@ AFL_CC = afl-gcc
|
||||||
AFL_CXX = afl-g++
|
AFL_CXX = afl-g++
|
||||||
AR = ar
|
AR = ar
|
||||||
|
|
||||||
RELEASE_TARGET := $(BUILD_DIR)/libolm.so.$(VERSION)
|
UNAME := $(shell uname)
|
||||||
|
ifeq ($(UNAME),Darwin)
|
||||||
|
SO := dylib
|
||||||
|
OLM_LDFLAGS :=
|
||||||
|
else
|
||||||
|
SO := so
|
||||||
|
OLM_LDFLAGS := -Wl,-soname,libolm.so.$(MAJOR) \
|
||||||
|
-Wl,--version-script,version_script.ver
|
||||||
|
endif
|
||||||
|
|
||||||
|
RELEASE_TARGET := $(BUILD_DIR)/libolm.$(SO).$(VERSION)
|
||||||
STATIC_RELEASE_TARGET := $(BUILD_DIR)/libolm.a
|
STATIC_RELEASE_TARGET := $(BUILD_DIR)/libolm.a
|
||||||
DEBUG_TARGET := $(BUILD_DIR)/libolm_debug.so.$(VERSION)
|
DEBUG_TARGET := $(BUILD_DIR)/libolm_debug.$(SO).$(VERSION)
|
||||||
JS_TARGET := javascript/olm.js
|
JS_WASM_TARGET := javascript/olm.js
|
||||||
|
JS_ASMJS_TARGET := javascript/olm_legacy.js
|
||||||
|
|
||||||
JS_EXPORTED_FUNCTIONS := javascript/exported_functions.json
|
JS_EXPORTED_FUNCTIONS := javascript/exported_functions.json
|
||||||
JS_EXTRA_EXPORTED_RUNTIME_METHODS := ALLOC_STACK
|
JS_EXTRA_EXPORTED_RUNTIME_METHODS := ALLOC_STACK
|
||||||
|
@ -84,8 +95,11 @@ EMCCFLAGS += -s NO_BROWSER=1
|
||||||
# mind that the plaintext can only be 48K because base64). We also have about
|
# mind that the plaintext can only be 48K because base64). We also have about
|
||||||
# 36K of statics. So let's have 256K of memory.
|
# 36K of statics. So let's have 256K of memory.
|
||||||
# (This can't be changed by the app with wasm since it's baked into the wasm).
|
# (This can't be changed by the app with wasm since it's baked into the wasm).
|
||||||
EMCCFLAGS += -s TOTAL_STACK=65536 -s TOTAL_MEMORY=262144
|
# (emscripten also mandates at least 16MB of memory for asm.js now, so
|
||||||
|
# we don't use this for the legacy build.)
|
||||||
|
EMCCFLAGS_WASM += -s TOTAL_STACK=65536 -s TOTAL_MEMORY=262144
|
||||||
|
|
||||||
|
EMCCFLAGS_ASMJS += -s WASM=0
|
||||||
|
|
||||||
EMCC.c = $(EMCC) $(CFLAGS) $(CPPFLAGS) -c
|
EMCC.c = $(EMCC) $(CFLAGS) $(CPPFLAGS) -c
|
||||||
EMCC.cc = $(EMCC) $(CXXFLAGS) $(CPPFLAGS) -c
|
EMCC.cc = $(EMCC) $(CXXFLAGS) $(CPPFLAGS) -c
|
||||||
|
@ -121,7 +135,8 @@ $(FUZZER_DEBUG_BINARIES): LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
|
||||||
|
|
||||||
$(JS_OBJECTS): CFLAGS += $(JS_OPTIMIZE_FLAGS)
|
$(JS_OBJECTS): CFLAGS += $(JS_OPTIMIZE_FLAGS)
|
||||||
$(JS_OBJECTS): CXXFLAGS += $(JS_OPTIMIZE_FLAGS)
|
$(JS_OBJECTS): CXXFLAGS += $(JS_OPTIMIZE_FLAGS)
|
||||||
$(JS_TARGET): LDFLAGS += $(JS_OPTIMIZE_FLAGS)
|
$(JS_WASM_TARGET): LDFLAGS += $(JS_OPTIMIZE_FLAGS)
|
||||||
|
$(JS_ASMJS_TARGET): LDFLAGS += $(JS_OPTIMIZE_FLAGS)
|
||||||
|
|
||||||
### Fix to make mkdir work on windows and linux
|
### Fix to make mkdir work on windows and linux
|
||||||
ifeq ($(shell echo "check_quotes"),"check_quotes")
|
ifeq ($(shell echo "check_quotes"),"check_quotes")
|
||||||
|
@ -143,20 +158,18 @@ lib: $(RELEASE_TARGET)
|
||||||
|
|
||||||
$(RELEASE_TARGET): $(RELEASE_OBJECTS)
|
$(RELEASE_TARGET): $(RELEASE_OBJECTS)
|
||||||
$(CXX) $(LDFLAGS) --shared -fPIC \
|
$(CXX) $(LDFLAGS) --shared -fPIC \
|
||||||
-Wl,-soname,libolm.so.$(MAJOR) \
|
$(OLM_LDFLAGS) \
|
||||||
-Wl,--version-script,version_script.ver \
|
|
||||||
$(OUTPUT_OPTION) $(RELEASE_OBJECTS)
|
$(OUTPUT_OPTION) $(RELEASE_OBJECTS)
|
||||||
ln -sf libolm.so.$(VERSION) $(BUILD_DIR)/libolm.so.$(MAJOR)
|
ln -sf libolm.$(SO).$(VERSION) $(BUILD_DIR)/libolm.$(SO).$(MAJOR)
|
||||||
|
|
||||||
debug: $(DEBUG_TARGET)
|
debug: $(DEBUG_TARGET)
|
||||||
.PHONY: debug
|
.PHONY: debug
|
||||||
|
|
||||||
$(DEBUG_TARGET): $(DEBUG_OBJECTS)
|
$(DEBUG_TARGET): $(DEBUG_OBJECTS)
|
||||||
$(CXX) $(LDFLAGS) --shared -fPIC \
|
$(CXX) $(LDFLAGS) --shared -fPIC \
|
||||||
-Wl,-soname,libolm_debug.so.$(MAJOR) \
|
$(OLM_LDFLAGS) \
|
||||||
-Wl,--version-script,version_script.ver \
|
|
||||||
$(OUTPUT_OPTION) $(DEBUG_OBJECTS)
|
$(OUTPUT_OPTION) $(DEBUG_OBJECTS)
|
||||||
ln -sf libolm_debug.so.$(VERSION) $(BUILD_DIR)/libolm_debug.so.$(MAJOR)
|
ln -sf libolm_debug.$(SO).$(VERSION) $(BUILD_DIR)/libolm_debug.$(SO).$(MAJOR)
|
||||||
|
|
||||||
static: $(STATIC_RELEASE_TARGET)
|
static: $(STATIC_RELEASE_TARGET)
|
||||||
.PHONY: static
|
.PHONY: static
|
||||||
|
@ -164,14 +177,27 @@ static: $(STATIC_RELEASE_TARGET)
|
||||||
$(STATIC_RELEASE_TARGET): $(RELEASE_OBJECTS)
|
$(STATIC_RELEASE_TARGET): $(RELEASE_OBJECTS)
|
||||||
$(AR) rcs $@ $^
|
$(AR) rcs $@ $^
|
||||||
|
|
||||||
js: $(JS_TARGET)
|
js: $(JS_WASM_TARGET) $(JS_ASMJS_TARGET)
|
||||||
.PHONY: js
|
.PHONY: js
|
||||||
|
|
||||||
# Note that the output file we give to emcc determines the name of the
|
# Note that the output file we give to emcc determines the name of the
|
||||||
# wasm file baked into the js, hence messing around outputting to olm.js
|
# wasm file baked into the js, hence messing around outputting to olm.js
|
||||||
# and then renaming it.
|
# and then renaming it.
|
||||||
$(JS_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $(JS_PREFIX) $(JS_SUFFIX)
|
$(JS_WASM_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $(JS_PREFIX) $(JS_SUFFIX)
|
||||||
EMCC_CLOSURE_ARGS="--externs $(JS_EXTERNS)" $(EMCC_LINK) \
|
EMCC_CLOSURE_ARGS="--externs $(JS_EXTERNS)" $(EMCC_LINK) \
|
||||||
|
$(EMCCFLAGS_WASM) \
|
||||||
|
$(foreach f,$(JS_PRE),--pre-js $(f)) \
|
||||||
|
$(foreach f,$(JS_POST),--post-js $(f)) \
|
||||||
|
-s "EXPORTED_FUNCTIONS=@$(JS_EXPORTED_FUNCTIONS)" \
|
||||||
|
-s "EXTRA_EXPORTED_RUNTIME_METHODS=$(JS_EXTRA_EXPORTED_RUNTIME_METHODS)" \
|
||||||
|
$(JS_OBJECTS) -o $@
|
||||||
|
mv $@ javascript/olmtmp.js
|
||||||
|
cat $(JS_PREFIX) javascript/olmtmp.js $(JS_SUFFIX) > $@
|
||||||
|
rm javascript/olmtmp.js
|
||||||
|
|
||||||
|
$(JS_ASMJS_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $(JS_PREFIX) $(JS_SUFFIX)
|
||||||
|
EMCC_CLOSURE_ARGS="--externs $(JS_EXTERNS)" $(EMCC_LINK) \
|
||||||
|
$(EMCCFLAGS_ASMJS) \
|
||||||
$(foreach f,$(JS_PRE),--pre-js $(f)) \
|
$(foreach f,$(JS_PRE),--pre-js $(f)) \
|
||||||
$(foreach f,$(JS_POST),--post-js $(f)) \
|
$(foreach f,$(JS_POST),--post-js $(f)) \
|
||||||
-s "EXPORTED_FUNCTIONS=@$(JS_EXPORTED_FUNCTIONS)" \
|
-s "EXPORTED_FUNCTIONS=@$(JS_EXPORTED_FUNCTIONS)" \
|
||||||
|
@ -206,16 +232,16 @@ install-headers: $(PUBLIC_HEADERS)
|
||||||
|
|
||||||
install-debug: debug install-headers
|
install-debug: debug install-headers
|
||||||
test -d $(DESTDIR)$(PREFIX)/lib || $(call mkdir,$(DESTDIR)$(PREFIX)/lib)
|
test -d $(DESTDIR)$(PREFIX)/lib || $(call mkdir,$(DESTDIR)$(PREFIX)/lib)
|
||||||
install -Dm755 $(DEBUG_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so.$(VERSION)
|
install -Dm755 $(DEBUG_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm_debug.$(SO).$(VERSION)
|
||||||
ln -s libolm_debug.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so.$(MAJOR)
|
ln -s libolm_debug.$(SO).$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.$(SO).$(MAJOR)
|
||||||
ln -s libolm_debug.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so
|
ln -s libolm_debug.$(SO).$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.$(SO)
|
||||||
.PHONY: install-debug
|
.PHONY: install-debug
|
||||||
|
|
||||||
install: lib install-headers
|
install: lib install-headers
|
||||||
test -d $(DESTDIR)$(PREFIX)/lib || $(call mkdir,$(DESTDIR)$(PREFIX)/lib)
|
test -d $(DESTDIR)$(PREFIX)/lib || $(call mkdir,$(DESTDIR)$(PREFIX)/lib)
|
||||||
install -Dm755 $(RELEASE_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm.so.$(VERSION)
|
install -Dm755 $(RELEASE_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm.$(SO).$(VERSION)
|
||||||
ln -s libolm.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.so.$(MAJOR)
|
ln -s libolm.$(SO).$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.$(SO).$(MAJOR)
|
||||||
ln -s libolm.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.so
|
ln -s libolm.$(SO).$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.$(SO)
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
|
|
||||||
clean:;
|
clean:;
|
||||||
|
|
|
@ -31,6 +31,9 @@ To build the javascript bindings, install emscripten from http://kripken.github.
|
||||||
|
|
||||||
make js
|
make js
|
||||||
|
|
||||||
|
Note that if you run emscripten in a docker container, you need to pass through
|
||||||
|
the EMCC_CLOSURE_ARGS environment variable.
|
||||||
|
|
||||||
To build the android project for Android bindings, run:
|
To build the android project for Android bindings, run:
|
||||||
|
|
||||||
.. code:: bash
|
.. code:: bash
|
||||||
|
|
|
@ -463,12 +463,3 @@ olm_exports["get_library_version"] = restore_stack(function() {
|
||||||
getValue(buf+2, 'i8'),
|
getValue(buf+2, 'i8'),
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
Module['onRuntimeInitialized'] = function() {
|
|
||||||
OLM_ERROR = Module['_olm_error']();
|
|
||||||
if (onInitSuccess) onInitSuccess();
|
|
||||||
};
|
|
||||||
|
|
||||||
Module['onAbort'] = function(err) {
|
|
||||||
if (onInitFail) onInitFail(err);
|
|
||||||
};
|
|
||||||
|
|
|
@ -37,3 +37,12 @@ if (typeof(OLM_OPTIONS) !== 'undefined') {
|
||||||
* use UTF8ToString.
|
* use UTF8ToString.
|
||||||
*/
|
*/
|
||||||
var NULL_BYTE_PADDING_LENGTH = 1;
|
var NULL_BYTE_PADDING_LENGTH = 1;
|
||||||
|
|
||||||
|
Module['onRuntimeInitialized'] = function() {
|
||||||
|
OLM_ERROR = Module['_olm_error']();
|
||||||
|
if (onInitSuccess) onInitSuccess();
|
||||||
|
};
|
||||||
|
|
||||||
|
Module['onAbort'] = function(err) {
|
||||||
|
if (onInitFail) onInitFail(err);
|
||||||
|
};
|
||||||
|
|
|
@ -24,7 +24,9 @@ if (typeof(window) !== 'undefined') {
|
||||||
window["Olm"] = olm_exports;
|
window["Olm"] = olm_exports;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Emscripten sets the module exports to be its module
|
if (typeof module === 'object') {
|
||||||
// with wrapped c functions. Clobber it with our higher
|
// Emscripten sets the module exports to be its module
|
||||||
// level wrapper class.
|
// with wrapped c functions. Clobber it with our higher
|
||||||
module.exports = olm_exports;
|
// level wrapper class.
|
||||||
|
module.exports = olm_exports;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue