diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..cf6b911fbb525b8f26503909a2ced1542249fc87 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,94 @@ +#------------------------------------------------------------------------------- +# Copyright (c) 2020 RWTH Aachen University, Germany, +# Virtual Reality & Immersive Visualisation Group. +#------------------------------------------------------------------------------- + +# The include file can be change to either be removed or reference a specific commit. + +include: + - project: 'vr-group/unreal-development/unreal-ci' + ref: master + file: '/shared_scripts.yml' + +# In this file you are able to configure your plugins pipeline. +# If you want to customize something, either overwrite things that are defined in the shared_scripts repository, +# or remove the "extends" and write your own scripts +# +# If you want your pipeline to run on every commit, just remove the "only" blocks. Keep in mind, that a build +# can take some time. +# +# If you want to alter the unreal-building process two variables are defined for either changing the CLIENT_CONFIG or +# for adding EXTRA_ARGS to the building process +# +# For the generate stage, you can specify needed dependencies in GEN_DEPENDENCIES with [Branch@PluginFolder] as key +# Example: +# +# Generate_Project: +# only: ['web', 'schedules'] +# extends: .Generate_Project_ +# variables: +# GEN_TEMPLATE_REPO: "https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unrealprojecttemplate.git" +# GEN_TEMPLATE_BRANCH: "develop" +# GEN_DEPENDENCIES: "( +# [master@nDisplayExtensions]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/ndisplayextensions.git' +# [master@CaveOverlay]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unreal-cave-overlay.git' +# )" +# +# You can uncomment the deploy lines to deploy your project to the CAVE/VRDev. This only makes sense, if your plugin works +# with a generated project. + +stages: + - generate + - build +# - deploy + +Generate_Project: + only: ['web', 'schedules'] + extends: .Generate_Project_ + variables: + GEN_TEMPLATE_REPO: "https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unrealprojecttemplate.git" + GEN_TEMPLATE_BRANCH: "develop" + GEN_DEPENDENCIES: "( + )" + +Build_Windows: + only: ['web', 'schedules'] + extends: .Build_Windows_ + tags: + - windows + - unreal-4.26 + variables: + GIT_STRATEGY: none + GIT_CHECKOUT: "false" + #CLIENT_CONFIG: "DebugGame" + needs: + - job: "Generate_Project" + artifacts: true + +Build_CentOS: + only: ['web', 'schedules'] + extends: .Build_CentOS_ + tags: + - centos + - unreal-4.26 + variables: + GIT_STRATEGY: none + GIT_CHECKOUT: "false" + CLIENT_CONFIG: "DebugGame" + needs: + - job: "Generate_Project" + artifacts: true + +#Deploy_CAVE: +# only: ['web', 'schedules'] +# extends: .Deploy_CAVE_ +# needs: +# - job: "Build_CentOS" +# artifacts: true +# +#Deploy_Windows: +# only: ['web', 'schedules'] +# extends: .Deploy_VRDev_ +# needs: +# - job: "Build_Windows" +# artifacts: true diff --git a/Source/UniversalLogging/Private/UniversalLogging.cpp b/Source/UniversalLogging/Private/UniversalLogging.cpp index b31f1af4185b5f7a03525f5011d50d661556a276..5163d4ee5addbd5c28d49dd9bf65ae6e241e247e 100644 --- a/Source/UniversalLogging/Private/UniversalLogging.cpp +++ b/Source/UniversalLogging/Private/UniversalLogging.cpp @@ -7,7 +7,7 @@ #include "Cluster/IDisplayClusterClusterManager.h" #include "Misc/CommandLine.h" -LogFileManager UniversalLoggingImpl::Log_File_Manager = LogFileManager(); +LogFileManager UniversalLoggingImpl::Log_File_Manager{}; void UniversalLoggingImpl::StartupModule() {