From e62fb7e72aea79c4c130e3857c807e1d94d2c50b Mon Sep 17 00:00:00 2001 From: Miron Zelina Date: Mon, 14 Oct 2019 14:09:50 +0100 Subject: [PATCH 1/2] Try to adapt to setup-gdk changes --- ci/setup-and-build.ps1 | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/ci/setup-and-build.ps1 b/ci/setup-and-build.ps1 index 97414de2..97eaaf3d 100644 --- a/ci/setup-and-build.ps1 +++ b/ci/setup-and-build.ps1 @@ -40,13 +40,6 @@ pushd "$exampleproject_home" popd Finish-Event "get-gdk-head-commit" "build-unreal-gdk-example-project-:windows:" - Start-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" - pushd $gdk_home - # Invoke the GDK's setup script - &"$($gdk_home)\ci\setup-gdk.ps1" - popd - Finish-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" - # Use the cached engine version or set it up if it has not been cached yet. Start-Event "set-up-engine" "build-unreal-gdk-example-project-:windows:" @@ -55,6 +48,13 @@ pushd "$exampleproject_home" Finish-Event "set-up-engine" "build-unreal-gdk-example-project-:windows:" + Start-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" + pushd $gdk_home + # Invoke the GDK's setup script + &"$($gdk_home)\ci\setup-gdk.ps1" -unreal_path "$engine_directory" + popd + Finish-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" + Start-Event "associate-uproject-with-engine" "build-unreal-gdk-example-project-:windows:" pushd $engine_directory @@ -104,14 +104,6 @@ pushd "$exampleproject_home" "-run=GenerateSchemaAndSnapshots", ` "-MapPaths=`"/Maps/FPS-Start_Small`"" ) - - # TODO (GV-29) this is also being done as part of setup.bat. We should look into calling setup.bat instead of this, but need to make sure it doesn't brake if called after setup-gdk.ps1 - $core_gdk_schema_path = "$($gdk_home)\SpatialGDK\Extras\schema\*" - $schema_std_lib_path = "$($gdk_home)\SpatialGDK\Binaries\ThirdParty\Improbable\Programs\schema\*" - New-Item -Path "$($exampleproject_home)\spatial\schema\unreal" -Name "gdk" -ItemType Directory -Force - New-Item -Path "$($exampleproject_home)\spatial" -Name "\build\dependencies\schema\standard_library" -ItemType Directory -Force - Copy-Item "$($core_gdk_schema_path)" -Destination "$($exampleproject_home)\spatial\schema\unreal\gdk" -Force -Recurse - Copy-Item "$($schema_std_lib_path)" -Destination "$($exampleproject_home)\spatial\build\dependencies\schema\standard_library" -Force -Recurse popd Finish-Event "generate-schema" "build-unreal-gdk-example-project-:windows:" From 523e2047a2ff05891d445b162889361caef2115c Mon Sep 17 00:00:00 2001 From: Miron Zelina Date: Tue, 15 Oct 2019 16:05:33 +0100 Subject: [PATCH 2/2] Switch to project plugin build --- ci/setup-and-build.ps1 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ci/setup-and-build.ps1 b/ci/setup-and-build.ps1 index 97eaaf3d..187a0024 100644 --- a/ci/setup-and-build.ps1 +++ b/ci/setup-and-build.ps1 @@ -40,6 +40,13 @@ pushd "$exampleproject_home" popd Finish-Event "get-gdk-head-commit" "build-unreal-gdk-example-project-:windows:" + Start-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" + pushd $gdk_home + # Invoke the GDK's setup script + &"$($gdk_home)\ci\setup-gdk.ps1" + popd + Finish-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" + # Use the cached engine version or set it up if it has not been cached yet. Start-Event "set-up-engine" "build-unreal-gdk-example-project-:windows:" @@ -48,14 +55,6 @@ pushd "$exampleproject_home" Finish-Event "set-up-engine" "build-unreal-gdk-example-project-:windows:" - Start-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" - pushd $gdk_home - # Invoke the GDK's setup script - &"$($gdk_home)\ci\setup-gdk.ps1" -unreal_path "$engine_directory" - popd - Finish-Event "set-up-gdk-plugin" "build-unreal-gdk-example-project-:windows:" - - Start-Event "associate-uproject-with-engine" "build-unreal-gdk-example-project-:windows:" pushd $engine_directory $unreal_version_selector_path = "Engine\Binaries\Win64\UnrealVersionSelector.exe"