flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Jenkins fixes

Browse Source
This commit is contained in:
Tiger Wang 2020-07-12 23:38:13 +01:00
parent bd20afd6ce
commit 3cf671b4fc
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/AddDependencies.cmake
View File

@ -62,7 +62,7 @@ function(link_dependencies TARGET)
fmt::fmt
jsoncpp_lib
lsqlite
lua
lualib
luaexpat
mbedtls
SQLiteCpp

2
CMake/Fixups.cmake
View File

@ -2,7 +2,7 @@ function(emit_fixups)
# TODO these should be in the submodules
# Under Windows, we need Lua as DLL; on *nix we need it linked statically:
if (WIN32)
target_compile_definitions(lua PUBLIC LUA_BUILD_AS_DLL)
target_compile_definitions(lualib PUBLIC LUA_BUILD_AS_DLL)
endif()
# Let Lua use additional checks on its C API. This is only compiled into Debug builds:

4
CMake/GenerateBindings.cmake
View File

@ -107,8 +107,8 @@ function(enable_bindings_generation)
# Generate the bindings:
add_custom_command(
OUTPUT ${BINDING_OUTPUTS}
COMMAND luaexe BindingsProcessor.lua
COMMAND lua BindingsProcessor.lua
WORKING_DIRECTORY ${BINDINGS_FOLDER}
DEPENDS ${BINDING_DEPENDENCIES} luaexe
DEPENDS ${BINDING_DEPENDENCIES} lua
)
endfunction()

7
jenkinsbuild.sh
View File

@ -82,6 +82,7 @@ popd
sha1sum Cuberite.tar.gz > Cuberite.tar.gz.sha1
# Package ProtoProxy
pushd Tools/ProtoProxy
sha1sum ProtoProxy > ProtoProxy.sha1
popd
# This tool is very out of date, uncomment when it's being worked on again
# pushd Tools/ProtoProxy
# sha1sum ProtoProxy > ProtoProxy.sha1
# popd

2
lib/lua

@ -1 +1 @@
Subproject commit e5942d9d88221dc02b824f5bda0db9876fa92bad
Subproject commit 6fb92772dc1343fd4e92a64e6a49940d188523c3

2
lib/luaproxy

@ -1 +1 @@
Subproject commit 62ee088a33a4e5eeb69cb80cd261e6574c2cb71f
Subproject commit 9e4b11990b1e4e368f1cacb4cbf9d0e908da96b6

2
lib/sqlite

@ -1 +1 @@
Subproject commit 01cbf6d5a5ba91dd78d17604865dd3aebe1b5093
Subproject commit 0bd062f9653f19ca9f59040f2fbb04fe9f753e0d

2
lib/tolua++

@ -1 +1 @@
Subproject commit 23cd44840dc9405f4f7df34a621a351062359b8d
Subproject commit 4d24aa316898964c23896fbb7419bdaa23638c26