Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added htmlparser Luarock for newsdownloader #1110

Merged
merged 8 commits into from
Jun 4, 2020
Merged

Added htmlparser Luarock for newsdownloader #1110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2a589e9
Added htmlparser Luarock for newsdownloader
hngt Jun 4, 2020
baa30f3
Added needed definitions
hngt Jun 4, 2020
2aa145e
Alphabetical order
hngt Jun 4, 2020
95739d2
[NewsDownloader] Cleanup
hngt Jun 4, 2020
276d4f3
Change tag to current HEAD of htmlparser
hngt Jun 4, 2020
38a4126
Fixes and consistency in Rockspec paths
hngt Jun 4, 2020
c1deb73
fixing lua-spore
hngt Jun 4, 2020
1003484
Update thirdparty/lua-htmlparser/CMakeLists.txt
Frenzie Jun 4, 2020
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
5 changes: 2 additions & 3 deletions Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,13 +845,12 @@ endif

LUA_HTMLPARSER_VER=scm-0
hngt marked this conversation as resolved.
Show resolved Hide resolved
LUA_HTMLPARSER_BUILD_DIR=$(THIRDPARTY_DIR)/lua-htmlparser/build/$(MACHINE)
LUA_HTMLPARSER_ROCK=$(LUAROCKS_DIR)/lua-htmlparser/$(LUA_HTMLPARSER_VER).rockspec
LUA_HTMLPARSER_ROCK=$(LUAROCKS_DIR)/lua-htmlparser/htmlparser-$(LUA_HTMLPARSER_VER).rockspec

LUA_SPORE_BUILD_DIR=$(THIRDPARTY_DIR)/lua-Spore/build/$(MACHINE)
LUA_SPORE_DIR=$(CURDIR)/$(LUA_SPORE_BUILD_DIR)/lua-Spore-prefix/src/lua-Spore
SPORE_VER=0.3.1-1
LUA_SPORE_VER=lua-spore-$(SPORE_VER)
hngt marked this conversation as resolved.
Show resolved Hide resolved
LUA_SPORE_ROCK=$(LUAROCKS_DIR)/lua-spore/$(SPORE_VER)/$(LUA_SPORE_VER).rockspec
LUA_SPORE_ROCK=$(LUAROCKS_DIR)/lua-spore/$(SPORE_VER)/lua-spore-$(LUA_SPORE_VER).rockspec

SQLITE_BUILD_DIR=$(THIRDPARTY_DIR)/sqlite/build/$(MACHINE)
SQLITE_DIR=$(CURDIR)/$(SQLITE_BUILD_DIR)/sqlite-prefix/src/sqlite-build
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/lua-Spore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ assert_var_defined(LUAROCKS)

ep_get_source_dir(SOURCE_DIR)

set(LUA_SPORE_ROCKSPEC rockspec/${LUA_SPORE_VER}.rockspec)
set(LUA_SPORE_ROCKSPEC rockspec/lua-spore-${LUA_SPORE_VER}.rockspec)

set(BUILD_CMD sh -c "${LUAROCKS} make --tree=${OUTPUT_DIR}/rocks ${LUA_SPORE_ROCKSPEC}")
if(DEFINED LIBFLAG)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/lua-htmlparser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ assert_var_defined(LUAROCKS)

ep_get_source_dir(SOURCE_DIR)

set(LUA_HTMLPARSER_ROCKSPEC rockspec/${LUA_HTMLPARSER_VER}.rockspec)
set(LUA_HTMLPARSER_ROCKSPEC rockspec/htmlparser-${LUA_HTMLPARSER_VER}.rockspec)
hngt marked this conversation as resolved.
Show resolved Hide resolved

set(BUILD_CMD sh -c "${LUAROCKS} make --tree=${OUTPUT_DIR}/rocks ${LUA_HTMLPARSER_ROCKSPEC}")
if(DEFINED LIBFLAG)
Expand Down