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

Clean up server folder for Android (#4448)

Browse Source
This commit is contained in:
Mat 2020-01-02 17:59:07 +02:00 committed by GitHub
parent bf10b56638
commit dd665f092f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Server/Install/UnixExecutables.list Normal file
View File

@ -0,0 +1,17 @@
Cuberite
Plugins
Prefabs
webadmin
BACKERS
brewing.txt
crafting.txt
furnace.txt
items.ini
monsters.ini
buildinfo.txt
README.txt
favicon.png
CONTRIBUTORS
LICENSE
*.example.ini
ThirdPartyLicenses

6
android/compile.sh
View File

@ -64,8 +64,6 @@ case "$1" in
echo "Packing server.zip ..." echo "Packing server.zip ..."
rm -rf Server rm -rf Server
mkdir -p Server mkdir -p Server
cd $BASEDIR/../Server
zip -r $BASEDIR/Server/server.zip *
for arch in armeabi-v7a arm64-v8a x86 x86_64; do for arch in armeabi-v7a arm64-v8a x86 x86_64; do
echo "Doing ... $arch ..." && \ echo "Doing ... $arch ..." && \
@ -76,6 +74,10 @@ case "$1" in
zip $BASEDIR/Server/"$arch".zip Cuberite zip $BASEDIR/Server/"$arch".zip Cuberite
done done
echo "Packing server.zip ..."
cd $BUILDDIR/Server
zip -r $BASEDIR/Server/server.zip -@ -x Cuberite < Install/UnixExecutables.list
cd $BASEDIR/Server cd $BASEDIR/Server
for file in server.zip armeabi-v7a.zip arm64-v8a.zip x86.zip x86_64.zip; do for file in server.zip armeabi-v7a.zip arm64-v8a.zip x86.zip x86_64.zip; do
echo "Generating sha1 sum for ... $file ..." && \ echo "Generating sha1 sum for ... $file ..." && \

12
src/CMakeLists.txt
View File

@ -403,12 +403,12 @@ set(symlinks
message("Creating output folder and symlinks...") message("Creating output folder and symlinks...")
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/Server") file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/Server")
foreach (symlink ${symlinks}) foreach (symlink ${symlinks})
make_symlink("${CMAKE_SOURCE_DIR}/Server/${symlink}" "${CMAKE_BINARY_DIR}/Server/${symlink}") make_symlink("${CMAKE_CURRENT_SOURCE_DIR}/../Server/${symlink}" "${CMAKE_BINARY_DIR}/Server/${symlink}")
endforeach(symlink) endforeach(symlink)
make_symlink("${CMAKE_SOURCE_DIR}/BACKERS" "${CMAKE_BINARY_DIR}/Server/BACKERS") make_symlink("${CMAKE_CURRENT_SOURCE_DIR}/../BACKERS" "${CMAKE_BINARY_DIR}/Server/BACKERS")
make_symlink("${CMAKE_SOURCE_DIR}/CONTRIBUTORS" "${CMAKE_BINARY_DIR}/Server/CONTRIBUTORS") make_symlink("${CMAKE_CURRENT_SOURCE_DIR}/../CONTRIBUTORS" "${CMAKE_BINARY_DIR}/Server/CONTRIBUTORS")
make_symlink("${CMAKE_SOURCE_DIR}/LICENSE" "${CMAKE_BINARY_DIR}/Server/LICENSE") make_symlink("${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE" "${CMAKE_BINARY_DIR}/Server/LICENSE")
make_symlink("${CMAKE_SOURCE_DIR}/Server/Install/ThirdPartyLicenses" "${CMAKE_BINARY_DIR}/Server/ThirdPartyLicenses") make_symlink("${CMAKE_CURRENT_SOURCE_DIR}/../Server/Install/ThirdPartyLicenses" "${CMAKE_BINARY_DIR}/Server/ThirdPartyLicenses")
@ -444,7 +444,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME} luaexpat jsoncpp_lib_static mbedtls
# Create a folder for Bindings' documentation: # Create a folder for Bindings' documentation:
FILE(MAKE_DIRECTORY "Bindings/docs") FILE(MAKE_DIRECTORY "Bindings/docs")
make_symlink("${CMAKE_SOURCE_DIR}/src/Bindings/docs" "${CMAKE_BINARY_DIR}/Server/BindingsDocs") make_symlink("${CMAKE_CURRENT_SOURCE_DIR}/Bindings/docs" "${CMAKE_BINARY_DIR}/Server/BindingsDocs")
# For MSVC, set the startup project to Cuberite, and the debugger dir: # For MSVC, set the startup project to Cuberite, and the debugger dir: