[v1.2.8] [UE4] Improving UE4 publishing script

bombomby · Sep 4, 2019 · de67fcd · de67fcd
1 parent 2bbd4fb
commit de67fcd
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 145 deletions.
diff --git a/gui/Properties/AssemblyInfo.cs b/gui/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.7.0")]
-[assembly: AssemblyFileVersion("1.2.7.0")]
+[assembly: AssemblyVersion("1.2.8.0")]
+[assembly: AssemblyFileVersion("1.2.8.0")]
diff --git a/samples/UnrealEnginePlugin/OptickPlugin.uplugin b/samples/UnrealEnginePlugin/OptickPlugin.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.2.7",
+	"VersionName": "1.2.8",
 	"FriendlyName": "Optick",
 	"Description": "Super Lightweight Performance Profiler",
 	"Category": "Performance",

diff --git a/samples/UnrealEnginePlugin/Source/OptickPlugin.Build.cs b/samples/UnrealEnginePlugin/Source/OptickPlugin.Build.cs
@@ -1,24 +1,4 @@
-// The MIT License(MIT)
-//
 // Copyright(c) 2019 Vadim Slyusarev
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 namespace UnrealBuildTool.Rules
 {

diff --git a/samples/UnrealEnginePlugin/Source/Private/OptickCommands.cpp b/samples/UnrealEnginePlugin/Source/Private/OptickCommands.cpp
@@ -1,24 +1,4 @@
-// The MIT License(MIT)
-//
 // Copyright(c) 2019 Vadim Slyusarev
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "OptickCommands.h"
 

diff --git a/samples/UnrealEnginePlugin/Source/Private/OptickCommands.h b/samples/UnrealEnginePlugin/Source/Private/OptickCommands.h
@@ -1,24 +1,4 @@
-// The MIT License(MIT)
-//
 // Copyright(c) 2019 Vadim Slyusarev
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 

diff --git a/samples/UnrealEnginePlugin/Source/Private/OptickPlugin.cpp b/samples/UnrealEnginePlugin/Source/Private/OptickPlugin.cpp
@@ -1,24 +1,4 @@
-// The MIT License(MIT)
-//
 // Copyright(c) 2019 Vadim Slyusarev
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 // Core
 #include "CoreMinimal.h"
@@ -134,6 +114,9 @@ DECLARE_DELEGATE_OneParam(FStatFrameDelegate, int64);
 
 bool FOptickPlugin::Tick(float DeltaTime)
 {
+	static const FString OptickMessage(TEXT("OptickPlugin is running!"));
+	GEngine->AddOnScreenDebugMessage(31313, 5.f, FColor::Yellow, OptickMessage);
+
 	Optick::Update();
 	return true;
 }

diff --git a/samples/UnrealEnginePlugin/Source/Private/OptickStyle.cpp b/samples/UnrealEnginePlugin/Source/Private/OptickStyle.cpp
@@ -1,24 +1,4 @@
-// The MIT License(MIT)
-//
 // Copyright(c) 2019 Vadim Slyusarev
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #include "OptickStyle.h"
 

diff --git a/samples/UnrealEnginePlugin/Source/Private/OptickStyle.h b/samples/UnrealEnginePlugin/Source/Private/OptickStyle.h
@@ -1,24 +1,4 @@
-// The MIT License(MIT)
-//
 // Copyright(c) 2019 Vadim Slyusarev
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 

diff --git a/samples/UnrealEnginePlugin/Source/Public/IOptickPlugin.h b/samples/UnrealEnginePlugin/Source/Public/IOptickPlugin.h
@@ -1,24 +1,4 @@
-// The MIT License(MIT)
-//
 // Copyright(c) 2019 Vadim Slyusarev
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files(the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions :
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once
 

diff --git a/tools/Publish_UE4.bat b/tools/Publish_UE4.bat
@@ -1,4 +1,5 @@
-rem @echo off
+@echo off
+setlocal enabledelayedexpansion
 
 cd ..
 
@@ -17,6 +18,26 @@ xcopy /Y Bin\Release\x64\Optick.exe samples\UnrealEnginePlugin\GUI\*
 
 call "C:\Program Files\Epic Games\UE_%UNREAL_VERSION%\Engine\Build\BatchFiles\RunUAT.bat" BuildPlugin -Plugin="%CD%\samples\UnrealEnginePlugin\OptickPlugin.uplugin" -Package="%CD%\publish\Optick_%VERSION_NAME%\OptickPlugin" -Rocket
 
-powershell "Compress-Archive -Path \".\publish\Optick_%VERSION_NAME%\*\" -DestinationPath \".\publish\Optick_%VERSION_NAME%.zip\""
+rem Process Copyright
+cd %CD%\publish\Optick_%VERSION_NAME%\OptickPlugin\Source\Private\OptickCore\
+
+if not exist "tmp" mkdir tmp
+
+for %%f in (*.cpp *.h) do (
+   (Echo "%%f" | FIND /I "miniz" 1>NUL) || (
+	   echo // Copyright(c^) 2019 Vadim Slyusarev > "tmp\%%f"
+       more +21 "%%f" >> "tmp\%%f"
+   )
+)
+
+xcopy /Y tmp\*.* *
+
+del /Q tmp\*.*
+rmdir tmp
+
+cd ..\..\..\..\..\..
+
+rem Compress Archive
+powershell "Compress-Archive -Path \"%CD%\publish\Optick_%VERSION_NAME%\*\" -DestinationPath \"%CD%\publish\Optick_%VERSION_NAME%.zip\""
 
 cd tools