Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added default-publish feature to voxygen and updated build defs

Browse Source
This commit is contained in:
Ben Wallis 2021-06-14 22:32:53 +01:00
parent b0e899de45
commit d5f79b3872
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab/CI/build.gitlab-ci.yml
View File

@ -61,7 +61,9 @@ coverage:
script: script:
- ln -s /dockercache/target target - ln -s /dockercache/target target
- rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
- VELOREN_USERDATA_STRATEGY=executable cargo build --release - export VELOREN_USERDATA_STRATEGY=executable
- cargo build --release -p veloren-voxygen --no-default-features --features default-publish
- cargo build --release -p veloren-server-cli
- cp -r target/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
- cp -r target/release/veloren-voxygen $CI_PROJECT_DIR - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
artifacts: artifacts:
@ -79,7 +81,9 @@ coverage:
- update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
- ln -s /dockercache/target target - ln -s /dockercache/target target
- rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
- VELOREN_USERDATA_STRATEGY=executable cargo build --target=x86_64-pc-windows-gnu --release - export VELOREN_USERDATA_STRATEGY=executable
- cargo build --target=x86_64-pc-windows-gnu --release -p veloren-voxygen --no-default-features --features default-publish
- cargo build --target=x86_64-pc-windows-gnu --release -p veloren-server-cli
- cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
- cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
- cp /usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/libgcc_s_seh-1.dll $CI_PROJECT_DIR - cp /usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/libgcc_s_seh-1.dll $CI_PROJECT_DIR
@ -107,7 +111,9 @@ coverage:
- export RUSTFLAGS="-D warnings" - export RUSTFLAGS="-D warnings"
script: script:
- export MACOSX_DEPLOYMENT_TARGET="10.13" - export MACOSX_DEPLOYMENT_TARGET="10.13"
- VELOREN_USERDATA_STRATEGY=executable cargo build --release - export VELOREN_USERDATA_STRATEGY=executable
- cargo build --release -p veloren-voxygen --no-default-features --features default-publish
- cargo build --release -p veloren-server-cli
- cp -r target/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
- cp -r target/release/veloren-voxygen $CI_PROJECT_DIR - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
artifacts: artifacts:

6
voxygen/Cargo.toml
View File

@ -30,7 +30,9 @@ tracy = ["profiling", "profiling/profile-with-tracy", "common/tracy", "common-ec
plugins = ["client/plugins"] plugins = ["client/plugins"]
egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"] egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"]
default = ["singleplayer", "native-dialog", "plugins", "simd"] # We don't ship egui with published release builds so a separate feature is required that excludes it
default-publish = ["singleplayer", "native-dialog", "plugins", "simd"]
default = ["default-publish", "egui-ui"]
[dependencies] [dependencies]
client = {package = "veloren-client", path = "../client"} client = {package = "veloren-client", path = "../client"}
@ -67,9 +69,7 @@ keyboard-keynames = { git = "https://gitlab.com/Frinksy/keyboard-keynames.git",
# EGUI # EGUI
egui = {version = "0.12", optional = true } egui = {version = "0.12", optional = true }
egui_wgpu_backend = {git = "https://github.com/hasenbanck/egui_wgpu_backend.git", rev = "63a002c6a9b6c016e45806dd065864431caab621", optional = true } egui_wgpu_backend = {git = "https://github.com/hasenbanck/egui_wgpu_backend.git", rev = "63a002c6a9b6c016e45806dd065864431caab621", optional = true }
#egui_wgpu_backend = { path = "../../egui_wgpu_backend" }
egui_winit_platform = {version = "0.7", optional = true } egui_winit_platform = {version = "0.7", optional = true }
#egui_winit_platform = { path = "../../egui_winit_platform" }
# ECS # ECS
specs = {git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46"} specs = {git = "https://github.com/amethyst/specs.git", rev = "f985bec5d456f7b0dd8aae99848f9473c2cd9d46"}