diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f92752799a4770d4eafcd885a835bdd745f7b2ce..6abc091b6171e12cd4981cdef82d5ca05d42cc4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,53 +1,37 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020 RWTH Aachen University, Germany,
+# Copyright (c) 2022 RWTH Aachen University, Germany,
# Virtual Reality & Immersive Visualisation Group.
#-------------------------------------------------------------------------------
-# The include file can be change to either be removed or reference a specific commit.
+#The include file can be change to either be removed or reference a specific commit.
+#Reference the Gitlab CI website for this
include:
- - project: 'vr-group/unreal-development/unreal-ci'
+ - project: '${UNREAL_CI_PROJECT}'
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:
+#In this file you are able to configure your pipeline.
+#If you want to use the standard pipeline with all steps and deployment mechanisms, you are set-up correctly now.
+#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
#
-# 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'
-# )"
+#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.
#
-# 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.
+#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
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: "4.26"
+ GEN_TEMPLATE_REPO: "https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/unrealprojecttemplate.git"
+ GEN_TEMPLATE_BRANCH: "5.1"
GEN_DEPENDENCIES: "(
)"
@@ -56,7 +40,7 @@ Build_Windows:
extends: .Build_Windows_
tags:
- windows
- - unreal-4.26
+ - unreal-5.1
variables:
GIT_STRATEGY: none
GIT_CHECKOUT: "false"
@@ -65,12 +49,12 @@ Build_Windows:
- job: "Generate_Project"
artifacts: true
-Build_CentOS:
+Build_Linux:
only: ['web', 'schedules']
- extends: .Build_CentOS_
+ extends: .Build_Linux_
tags:
- - centos
- - unreal-4.26
+ - linux
+ - unreal-5.1
variables:
GIT_STRATEGY: none
GIT_CHECKOUT: "false"
@@ -78,17 +62,20 @@ Build_CentOS:
needs:
- job: "Generate_Project"
artifacts: true
-
-#Deploy_CAVE:
-# only: ['web', 'schedules']
-# extends: .Deploy_CAVE_
-# needs:
-# - job: "Build_CentOS"
-# artifacts: true
-#
+
+
+# Would copy packaged game to the VRDev drive
#Deploy_Windows:
# only: ['web', 'schedules']
# extends: .Deploy_VRDev_
# needs:
# - job: "Build_Windows"
# artifacts: true
+
+#Deploy_CAVE:
+# only: ['web', 'schedules']
+# extends: .Deploy_CAVE_
+# needs:
+# - job: "Build_Linux"
+# artifacts: true
+
diff --git a/README.md b/README.md
index 8d88972fd33dd65e8a7f4576e94c7cdbf01d1113..0015649fe60f22ef3a47f794949583cfac6d56ed 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ The `LogF` function allows you to log using a `printf`-like syntax. The only thi
```cpp
FString variable = "Hello!";
-UniLog.LogF("Name", "Message %s", *variable);
+UniLog.LogF("Name", TEXT("Message %s"), *variable);
```
Note that the `LogF` function does not automatically add a newline at the end.
@@ -72,7 +72,7 @@ After your stream was created, you can log to it like before using `"StreamName"
```cpp
UniLog.Log("Message", "StreamName");
-UniLog.LogF("StreamName", "Message %s", *variable);
+UniLog.LogF("StreamName", TEXT("Message %s"), *variable);
```
### Send Multiple LogStreams to the Same File
@@ -125,4 +125,4 @@ The SessionID is automatically generated at the start of each session. You may a
FString SessionID = UniLog.GetSessionIdentifier();
```
-Usually, it is of the form: `<Play|PlayInPreview|PlayInEditor|Stopped>_MM-DD-YY_hh-mm-ss`. However, it can be changed using the command line argument `-SessionID=<Custom ID>`. If this argument is present, it is always used. This is used for the aixCAVE, since the SessionID will not be the same on all slaves otherwise.
\ No newline at end of file
+Usually, it is of the form: `<Play|PlayInPreview|PlayInEditor|Stopped>_MM-DD-YY_hh-mm-ss`. However, it can be changed using the command line argument `-SessionID=<Custom ID>`. If this argument is present, it is always used. This is used for the aixCAVE, since the SessionID will not be the same on all slaves otherwise.
diff --git a/Source/UniversalLogging/Private/LogFileStream.cpp b/Source/UniversalLogging/Private/LogFileStream.cpp
index eb48bf97636ad3127949a6d67887abca30d12b9d..1bab487f2c915849d766c08bce2978dcda3252df 100644
--- a/Source/UniversalLogging/Private/LogFileStream.cpp
+++ b/Source/UniversalLogging/Private/LogFileStream.cpp
@@ -1,6 +1,6 @@
#include "LogFileStream.h"
-#include "HAL/PlatformFilemanager.h"
+#include "HAL/PlatformFileManager.h"
#include "LogStream.h"
#include "Misc/Paths.h"