diff --git a/Makefile b/Makefile index 2358a8469..f8d8cefbf 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,6 @@ all: $(OUTPUT_DIR)/libs $(if $(ANDROID),,$(LUAJIT)) \ $(OUTPUT_DIR)/plugins $(LUASOCKET) \ $(OUTPUT_DIR)/ffi $(OUTPUT_DIR)/data \ $(if $(WIN32),,$(LUASEC)) \ - $(if $(ANDROID),$(LUACOMPAT52) $(LUALONGNUMBER),) \ - $(if $(WIN32),,$(EVERNOTE_LIB)) \ $(TURBOJPEG_LIB) \ $(LODEPNG_LIB) \ $(GIF_LIB) \ @@ -54,7 +52,6 @@ ifeq ($(DO_STRIP),1) $(if $(or $(KOBO),$(POCKETBOOK),$(REMARKABLE)),$(OUTPUT_DIR)/fbdepth,) \ $(if $(or $(CERVANTES),$(KINDLE),$(KOBO),$(POCKETBOOK),$(REMARKABLE),$(SONY_PRSTUX)),$(OUTPUT_DIR)/zsync2,) \ $(if $(ANDROID),,$(LUAJIT)) \ - $(OUTPUT_DIR)/plugins/evernote.koplugin/lib/$(if $(WIN32),*.dll,*.so*) \ $(OUTPUT_DIR)/rocks/lib/lua/5.1/$(if $(WIN32),*.dll,*.so*) \ $(OUTPUT_DIR)/libs/$(if $(WIN32),*.dll,*.so*)" ;\ $(STRIP) --strip-unneeded $${STRIP_FILES} ;\ @@ -63,14 +60,8 @@ ifeq ($(DO_STRIP),1) xargs $(STRIP) --strip-unneeded endif # set up some needed paths and links - install -d $(OUTPUT_DIR)/{cache,history,clipboard,fonts} $(CURDIR)/$(EVERNOTE_THRIFT_DIR) + install -d $(OUTPUT_DIR)/{cache,history,clipboard,fonts} ln -sf $(CURDIR)/$(THIRDPARTY_DIR)/kpvcrlib/cr3.css $(OUTPUT_DIR)/data/ -ifndef DARWIN - # setup Evernote SDK - cd $(EVERNOTE_SDK_DIR) && \ - $(RCP) *.lua evernote $(CURDIR)/$(EVERNOTE_PLUGIN_DIR) && \ - cp thrift/*.lua $(CURDIR)/$(EVERNOTE_THRIFT_DIR) -endif test -e $(LPEG_RE) && chmod 664 $(LPEG_RE) || true # hot fix re.lua permission $(OUTPUT_DIR)/libs: diff --git a/Makefile.defs b/Makefile.defs index dab70f893..f1c9620ee 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -828,18 +828,6 @@ LUASEC_DIR=$(CURDIR)/$(LUASEC_BUILD_DIR)/luasec-prefix/src/luasec LUASOCKET=$(OUTPUT_DIR)/common/socket LUASEC=$(OUTPUT_DIR)/common/ssl -EVERNOTE_SDK_BUILD_DIR=$(THIRDPARTY_DIR)/evernote-sdk-lua/build/$(MACHINE) -EVERNOTE_SDK_DIR=$(CURDIR)/$(EVERNOTE_SDK_BUILD_DIR)/evernote-sdk-lua-prefix/src/evernote-sdk-lua -EVERNOTE_PLUGIN_DIR=$(OUTPUT_DIR)/plugins/evernote.koplugin -EVERNOTE_THRIFT_DIR=$(EVERNOTE_PLUGIN_DIR)/thrift -EVERNOTE_LIB=$(EVERNOTE_PLUGIN_DIR)/lib/libluasocket.so -LUALONGNUMBER=$(CURDIR)/$(OUTPUT_DIR)/libs/liblualongnumber.so - -LUASERIAL_BUILD_DIR=$(THIRDPARTY_DIR)/lua-serialize/build/$(MACHINE) -LUASERIAL_DIR=$(CURDIR)/$(LUASERIAL_BUILD_DIR)/lua-serialize-prefix/src/lua-serialize -LUASERIAL_LIB=$(OUTPUT_DIR)/common/serialize.so -LUACOMPAT52=$(CURDIR)/$(OUTPUT_DIR)/libs/libluacompat52.so - ZMQ_BUILD_DIR=$(THIRDPARTY_DIR)/libzmq/build/$(MACHINE) ZMQ_DIR=$(CURDIR)/$(ZMQ_BUILD_DIR)/libzmq-prefix/src/libzmq-build ZMQ_LIB_EXT=$(if $(WIN32),.dll,$(if $(DARWIN),.4.dylib,.so.4)) @@ -974,7 +962,7 @@ LPEG_DYNLIB=$(OUTPUT_DIR)/rocks/lib/lua/5.1/lpeg.so CMAKE_THIRDPARTY_LIBS := kpvcrlib,nanosvg,zstd -CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),evernote-sdk-lua,luajit,lpeg,turbo +CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),luajit,lpeg,turbo CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),zyre,czmq,filemq,libzmq CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),libk2pdfopt,tesseract,leptonica CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),lj-wpaclient diff --git a/Makefile.third b/Makefile.third index 2190b787e..a5c0c541c 100644 --- a/Makefile.third +++ b/Makefile.third @@ -617,25 +617,6 @@ ifdef DARWIN $(OUTPUT_DIR)/common/ssl.so endif -$(LUASERIAL_LIB): $(THIRDPARTY_DIR)/lua-serialize/*.* - install -d $(LUASERIAL_BUILD_DIR) - -rm -f $(LUASERIAL_DIR)/../lua-serialize-stamp/lua-serialize-build - -rm -f $(LUASERIAL_LIB) - cd $(LUASERIAL_BUILD_DIR) && \ - $(CMAKE) $(CMAKE_FLAGS) -DCC="$(CC) $(CFLAGS)" \ - -DLDFLAGS="$(LDFLAGS) $(if $(or $(ANDROID),$(WIN32)), $(CURDIR)/$(LUAJIT_LIB),)" \ - -DOUTPUT_DIR=$(CURDIR)/$(OUTPUT_DIR)/common \ - $(CURDIR)/$(THIRDPARTY_DIR)/lua-serialize && \ - $(CMAKE_MAKE_PROGRAM) $(CMAKE_MAKE_PROGRAM_FLAGS) - -# NOTE: We don't ship lua-serialize anymore, but the Evernote plugin still requires this. -# Both it and lua-serialize build an horribly outdated version of it. -# FIXME: Someone who actually cares about this probably ought to bump the submodule. -# Ideally, in evernote-sdk-lua, since we control it, and update this to keep Evernote's copy, -# like LUALONGNUMBER does. -$(LUACOMPAT52): $(LUASERIAL_LIB) $(THIRDPARTY_DIR)/lua-serialize/CMakeLists.txt - cp $(OUTPUT_DIR)/common/$(notdir $(LUACOMPAT52)) $(OUTPUT_DIR)/libs - # zeromq should be compiled without optimization in clang 3.4 # which otherwise may throw a warning saying "array index is past the end # of the array" for strcmp comparing a string with exactly 2 chars. @@ -756,21 +737,6 @@ $(LPEG_DYNLIB) $(LPEG_RE): $(LUAJIT_LIB) $(THIRDPARTY_DIR)/lpeg/*.* cp -f $(LPEG_DIR)/lpeg.so $(OUTPUT_DIR)/rocks/lib/lua/5.1 cp -f $(LPEG_DIR)/re.lua $(OUTPUT_DIR)/rocks/share/lua/5.1 -$(EVERNOTE_LIB): $(THIRDPARTY_DIR)/evernote-sdk-lua/*.* - install -d $(EVERNOTE_SDK_BUILD_DIR) - -rm -f $(EVERNOTE_LIB) $(EVERNOTE_SDK_DIR)/../evernote-sdk-lua-stamp/evernote-sdk-lua-build - cd $(EVERNOTE_SDK_BUILD_DIR) && \ - $(CMAKE) $(CMAKE_FLAGS) -DCC="$(CC) $(CFLAGS)" \ - -DOUTPUT_DIR="$(CURDIR)/$(EVERNOTE_PLUGIN_DIR)/lib" \ - -DLDFLAGS="$(LDFLAGS) $(if $(or $(ANDROID),$(WIN32)),$(CURDIR)/$(LUAJIT_LIB) -lm)" \ - -DDYNLIB_CFLAGS="$(DYNLIB_CMAKE_CFLAGS)" \ - $(CURDIR)/$(THIRDPARTY_DIR)/evernote-sdk-lua && \ - $(CMAKE_MAKE_PROGRAM) $(CMAKE_MAKE_PROGRAM_FLAGS) - -$(LUALONGNUMBER): $(EVERNOTE_LIB) $(THIRDPARTY_DIR)/evernote-sdk-lua/*.* - cp $(CURDIR)/$(EVERNOTE_PLUGIN_DIR)/lib/liblualongnumber.so \ - $(CURDIR)/$(OUTPUT_DIR)/libs - $(SQLITE_LIB): $(THIRDPARTY_DIR)/sqlite/*.* install -d $(SQLITE_BUILD_DIR) cd $(SQLITE_BUILD_DIR) && \ diff --git a/thirdparty/evernote-sdk-lua/CMakeLists.txt b/thirdparty/evernote-sdk-lua/CMakeLists.txt deleted file mode 100644 index 221c604ea..000000000 --- a/thirdparty/evernote-sdk-lua/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -project(evernote-sdk-lua) -cmake_minimum_required(VERSION 3.5.1) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules") -include("koreader_thirdparty_common") -include("koreader_thirdparty_git") - -enable_language(C) - -ep_get_source_dir(SOURCE_DIR) -assert_var_defined(CC) -assert_var_defined(OUTPUT_DIR) -assert_var_defined(LDFLAGS) - -set(BUILD_CMD sh -c "${KO_MAKE_RECURSIVE} -j1 -C thrift CC=\"${CC}\" LDFLAGS=\"${LDFLAGS}\" DYNLIB_CFLAGS=\"${DYNLIB_CFLAGS}\" OUTPUT_DIR=${OUTPUT_DIR}") - -ko_write_gitclone_script( - GIT_CLONE_SCRIPT_FILENAME - https://github.com/koreader/evernote-sdk-lua - 5267d2a6c2505a8c33d4b99fec526afd910a23bd - ${SOURCE_DIR} -) - -include(ExternalProject) -ExternalProject_Add( - ${PROJECT_NAME} - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME} - BUILD_IN_SOURCE 1 - # skip configure - CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILD_CMD} - # skip install - INSTALL_COMMAND "" -) diff --git a/thirdparty/lua-serialize/CMakeLists.txt b/thirdparty/lua-serialize/CMakeLists.txt deleted file mode 100644 index a5b73ceb7..000000000 --- a/thirdparty/lua-serialize/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -project(lua-serialize) -cmake_minimum_required(VERSION 3.5.1) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/../cmake_modules") -include("koreader_thirdparty_common") -include("koreader_thirdparty_git") - -enable_language(C) - -assert_var_defined(LDFLAGS) -assert_var_defined(OUTPUT_DIR) - -ep_get_source_dir(SOURCE_DIR) - -set(PATCH_CMD "${KO_PATCH} ${CMAKE_CURRENT_SOURCE_DIR}/lua-serialize-lto.patch") - -set(BUILD_CMD sh -c "${KO_MAKE_RECURSIVE} -j1 CC=\"${CC}\" LDFLAGS=\"${LDFLAGS}\" OUTPUT_DIR=\"${OUTPUT_DIR}\"") - -ko_write_gitclone_script( - GIT_CLONE_SCRIPT_FILENAME - https://github.com/koreader/lua-serialize - decd0f171cb61f3919d2441a3f0d9b3174b951e2 - ${SOURCE_DIR} -) - -include(ExternalProject) -ExternalProject_Add( - ${PROJECT_NAME} - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME} - PATCH_COMMAND COMMAND ${PATCH_CMD} - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILD_CMD} - # skip install - INSTALL_COMMAND "" -) diff --git a/thirdparty/lua-serialize/lua-serialize-lto.patch b/thirdparty/lua-serialize/lua-serialize-lto.patch deleted file mode 100644 index d4562f293..000000000 --- a/thirdparty/lua-serialize/lua-serialize-lto.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Makefile b/Makefile -index 68cabaf..e43dea0 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,7 +9,7 @@ COMPAT_DIR=lua-compat-5.2 - SRCS=$(wildcard $(SRC_DIR)/*.c) - OBJS=$(SRCS:%.c=%.o) - --CFLAGS=-I$(LUA_DIR)/src -I$(COMPAT_DIR)/c-api -shared -fPIC -+LUA_CFLAGS:= -I$(LUA_DIR)/src -I$(COMPAT_DIR)/c-api -shared -fPIC - - ifndef DARWIN - CFLAGS+= -Wl,-E -Wl,-rpath,'$$ORIGIN' -@@ -38,8 +38,8 @@ LIBSERIALIZE=$(OUTPUT_DIR)/serialize.$(if $(WIN32),dll,so) - libs: $(LIBLUACOMPAT52) $(LIBSERIALIZE) - - $(LIBLUACOMPAT52): $(COMPAT_DIR)/c-api/compat-5.2.c $(LUA_DIR) -- $(CC) $(CFLAGS) -o $@ $< -L$(OUTPUT_DIR) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LUA_CFLAGS) -o $@ $< $(LDFLAGS) -L$(OUTPUT_DIR) - - $(LIBSERIALIZE): $(SRC_DIR)/serialize.c $(LUA_DIR) -- $(CC) $(CFLAGS) -o $@ $< -lluacompat52 -L$(OUTPUT_DIR) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LUA_CFLAGS) -o $@ $< $(LDFLAGS) -lluacompat52 -L$(OUTPUT_DIR) -