Merge pull request #10 from UniToolsTeam/feature/web-gl

Feature/web gl
UniToolsTeam · Mar 24, 2022 · e22dadb · e22dadb
2 parents 563c9bc + 6d302dc
commit e22dadb
Show file tree

Hide file tree

Showing 64 changed files with 252 additions and 78 deletions.
diff --git a/Editor/Core/Pipelines/BuildPipeline.cs b/Editor/Core/Pipelines/BuildPipeline.cs
@@ -7,7 +7,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(BuildPipeline),
-        menuName = nameof(UniTools) + "/Build/Pipeline"
+        menuName = MenuPaths.Pipelines + "Pipeline"
     )]
     public sealed class BuildPipeline : ScriptablePostBuildPipeline
     {

diff --git a/Editor/Core/Pipelines/CompositeBuildPipeline.cs b/Editor/Core/Pipelines/CompositeBuildPipeline.cs
@@ -7,7 +7,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(CompositeBuildPipeline),
-        menuName = nameof(UniTools) + "/Build/Composite Pipeline"
+        menuName = MenuPaths.Pipelines + "Composite Pipeline"
     )]
     public sealed class CompositeBuildPipeline : ScriptablePreBuildPipeline
     {

diff --git a/Editor/Defines/Models/ScriptingDefineSymbols.cs b/Editor/Defines/Models/ScriptingDefineSymbols.cs
@@ -7,7 +7,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(ScriptingDefineSymbols),
-        menuName = nameof(UniTools) + "/" + nameof(Build) + "/" + nameof(ScriptingDefineSymbols)
+        menuName = MenuPaths.Defines + "DefineSymbols"
     )]
     public sealed class ScriptingDefineSymbols : ScriptableObject
     {
@@ -24,8 +24,7 @@ public override string ToString()
             {
                 return string.Empty;
             }
-
-
+
             StringBuilder builder = new StringBuilder();
 
             int last = m_defines.Count - 1;

diff --git a/Editor/Defines/Pipelines/ScriptableBuildStepWithDefines.cs b/Editor/Defines/Pipelines/ScriptableBuildStepWithDefines.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using UniTools.Build;
 using UnityEditor;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
@@ -8,7 +7,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(ScriptableBuildStepWithDefines),
-        menuName = nameof(UniTools) + "/Build/Steps/BuildWithDefines"
+        menuName = MenuPaths.Defines + "BuildWithDefines"
     )]
     public sealed class ScriptableBuildStepWithDefines : ScriptablePlatformBuildStep
     {

diff --git a/Editor/IO/Archive/CreateZipArchiveStep.cs b/Editor/IO/Archive/CreateZipArchiveStep.cs
@@ -1,14 +1,13 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using UniTools.Build;
 using UnityEngine;
 
 namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(CreateZipArchiveStep),
-        menuName = nameof(UniTools) + "/" + nameof(Build) + "/" + nameof(CreateZipArchiveStep)
+        menuName = MenuPaths.IO + "Zip Archive"
     )]
     public sealed class CreateZipArchiveStep : ScriptableCustomBuildStep
     {

diff --git a/Editor/IO/CustomEditors/EnsureDirectoryEmptyEditor.cs b/Editor/IO/CustomEditors/EnsureDirectoryEmptyEditor.cs
@@ -0,0 +1,15 @@
+using UnityEditor;
+
+namespace UniTools.Build
+{
+    [CustomEditor(typeof(EnsureDirectoryEmpty))]
+    public sealed class EnsureDirectoryEmptyEditor : Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+            EditorGUILayout.LabelField(target.ToString());
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/IO/CustomEditors/EnsureDirectoryEmptyEditor.cs.meta b/Editor/IO/CustomEditors/EnsureDirectoryEmptyEditor.cs.meta
diff --git a/Editor/IO/CustomEditors/EnsureDirectoryExistsEditor.cs b/Editor/IO/CustomEditors/EnsureDirectoryExistsEditor.cs
@@ -0,0 +1,15 @@
+using UnityEditor;
+
+namespace UniTools.Build
+{
+    [CustomEditor(typeof(EnsureDirectoryExists))]
+    public sealed class EnsureDirectoryExistsEditor : Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+            EditorGUILayout.LabelField(target.ToString());
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/IO/CustomEditors/EnsureDirectoryExistsEditor.cs.meta b/Editor/IO/CustomEditors/EnsureDirectoryExistsEditor.cs.meta
diff --git a/Editor/IO/Directory/EnsureDirectoryEmpty.cs b/Editor/IO/Directory/EnsureDirectoryEmpty.cs
@@ -1,14 +1,13 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using UniTools.Build;
 using UnityEngine;
 
 namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(EnsureDirectoryEmpty),
-        menuName = nameof(UniTools) + "/Build/IO/" + nameof(EnsureDirectoryEmpty)
+        menuName = MenuPaths.IO + nameof(EnsureDirectoryEmpty)
     )]
     public sealed class EnsureDirectoryEmpty : ScriptableCustomBuildStep
     {
@@ -35,5 +34,10 @@ public override async Task Execute()
 
             await Task.CompletedTask;
         }
+
+        public override string ToString()
+        {
+            return m_path.ToString();
+        }
     }
 }
diff --git a/Editor/IO/Directory/EnsureDirectoryExists.cs b/Editor/IO/Directory/EnsureDirectoryExists.cs
@@ -1,13 +1,12 @@
 using System.IO;
 using System.Threading.Tasks;
-using UniTools.Build;
 using UnityEngine;
 
 namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(EnsureDirectoryExists),
-        menuName = nameof(UniTools) + "/Build/IO/" + nameof(EnsureDirectoryExists)
+        menuName = MenuPaths.IO + nameof(EnsureDirectoryExists)
     )]
     public sealed class EnsureDirectoryExists : ScriptableCustomBuildStep
     {
@@ -19,5 +18,10 @@ public override async Task Execute()
 
             await Task.CompletedTask;
         }
+
+        public override string ToString()
+        {
+            return m_path.ToString();
+        }
     }
 }
diff --git a/Editor/IO/Files/CopyFileToDirectory.cs b/Editor/IO/Files/CopyFileToDirectory.cs
@@ -8,7 +8,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(CopyFileToDirectory),
-        menuName = nameof(UniTools) + "/Build/IO/" + nameof(CopyFileToDirectory)
+        menuName = MenuPaths.IO + nameof(CopyFileToDirectory)
     )]
     public sealed class CopyFileToDirectory : ScriptableCustomBuildStep
     {

diff --git a/Editor/IO/Files/DeleteFileOrDirectory.cs b/Editor/IO/Files/DeleteFileOrDirectory.cs
@@ -7,7 +7,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(DeleteFileOrDirectory),
-        menuName = nameof(UniTools) + "/Build/Steps/Pre/" + nameof(DeleteFileOrDirectory)
+        menuName = MenuPaths.IO + nameof(DeleteFileOrDirectory)
     )]
     public sealed class DeleteFileOrDirectory : ScriptableCustomBuildStep
     {

diff --git a/Editor/IO/Path/CompositeScriptablePath.cs b/Editor/IO/Path/CompositeScriptablePath.cs
@@ -6,7 +6,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(CompositeScriptablePath),
-        menuName = nameof(UniTools) + "/" + nameof(Build) + "/Composite Path"
+        menuName = MenuPaths.IO + "Composite Path"
     )]
     public sealed class CompositeScriptablePath : BaseScriptablePath
     {

diff --git a/Editor/IO/Path/ScriptablePath.cs b/Editor/IO/Path/ScriptablePath.cs
@@ -4,7 +4,7 @@ namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(ScriptablePath),
-        menuName = nameof(UniTools) + "/" + nameof(Build) + "/Path"
+        menuName = MenuPaths.IO + "Path"
     )]
     public sealed class ScriptablePath : BaseScriptablePath
     {

diff --git a/Editor/IO/Path/Steps/GenerateRandomPath.cs b/Editor/IO/Path/Steps/GenerateRandomPath.cs
@@ -1,14 +1,13 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using UniTools.Build;
 using UnityEngine;
 
 namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(GenerateRandomPath),
-        menuName = nameof(UniTools) + "/Build/Steps/Pre/" + nameof(GenerateRandomPath)
+        menuName = MenuPaths.IO + nameof(GenerateRandomPath)
     )]
     public sealed class GenerateRandomPath : ScriptableCustomBuildStep
     {

diff --git a/Editor/MenuPaths.cs b/Editor/MenuPaths.cs
@@ -0,0 +1,19 @@
+namespace UniTools.Build
+{
+    public static class MenuPaths
+    {
+        public const string Core = nameof(UniTools) + "/";
+        public const string IO = Core + "IO/";
+        public const string Pipelines = Core + "Pipelines/";
+
+        public const string Build = Core + "Build/";
+        public const string Defines = Build + "Defines/";
+        public const string Versioning = Build + "Versioning/";
+
+        private const string Platforms = Build + "Platforms/";
+        public const string Android = Platforms + "Android/";
+        public const string IOS = Platforms + "iOS/";
+        public const string Standalone = Platforms + "Standalone/";
+        public const string WebGL = Platforms + "WebGL/";
+    }
+}
diff --git a/Editor/MenuPaths.cs.meta b/Editor/MenuPaths.cs.meta
diff --git a/Editor/Platforms/Android/Build/BuildApk.cs b/Editor/Platforms/Android/Build/BuildApk.cs
@@ -3,15 +3,14 @@
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 
-namespace UniTools.Build.Android
+namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(BuildApk),
-        menuName = nameof(UniTools) + "/Build/Steps/" + nameof(Android) + "/" + nameof(BuildApk)
+        menuName = MenuPaths.Android + nameof(BuildApk)
     )]
     public sealed class BuildApk : ScriptableBuildStepWithOptions
     {
-
         public override BuildTarget Target => BuildTarget.Android;
 
         public override async Task<BuildReport> Execute()

diff --git a/Editor/Platforms/Android/CustomEditors/SetAliasEditor.cs b/Editor/Platforms/Android/CustomEditors/SetAliasEditor.cs
@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace UniTools.Build.Android
+namespace UniTools.Build
 {
     [CustomEditor(typeof(SetAlias))]
     public sealed class SetAliasEditor : Editor

diff --git a/Editor/Platforms/Android/CustomEditors/SetKeystorePasswordEditor.cs b/Editor/Platforms/Android/CustomEditors/SetKeystorePasswordEditor.cs
@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace UniTools.Build.Android
+namespace UniTools.Build
 {
     [CustomEditor(typeof(SetKeystorePassword))]
     public sealed class SetKeystorePasswordEditor : Editor

diff --git a/Editor/Platforms/Android/Pre/SetAlias.cs b/Editor/Platforms/Android/Pre/SetAlias.cs
@@ -3,11 +3,11 @@
 using UnityEditor.Build;
 using UnityEngine;
 
-namespace UniTools.Build.Android
+namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(SetAlias),
-        menuName = nameof(UniTools) + "/Build/Steps/" + nameof(Android) + "/Pre/" + nameof(SetAlias)
+        menuName = MenuPaths.Android + nameof(SetAlias)
     )]
     public sealed class SetAlias : ScriptableCustomBuildStep
     {

diff --git a/Editor/Platforms/Android/Pre/SetDebugKeystore.cs b/Editor/Platforms/Android/Pre/SetDebugKeystore.cs
@@ -2,11 +2,11 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace UniTools.Build.Android
+namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(SetDebugKeystore),
-        menuName = nameof(UniTools) + "/Build/Steps/" + nameof(Android) + "/Pre/" + nameof(SetDebugKeystore)
+        menuName = MenuPaths.Android + nameof(SetDebugKeystore)
     )]
     public sealed class SetDebugKeystore : ScriptableCustomBuildStep
     {

diff --git a/Editor/Platforms/Android/Pre/SetKeystorePassword.cs b/Editor/Platforms/Android/Pre/SetKeystorePassword.cs
@@ -2,11 +2,11 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace UniTools.Build.Android
+namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(SetKeystorePassword),
-        menuName = nameof(UniTools) + "/Build/Steps/" + nameof(Android) + "/Pre/" + nameof(SetKeystorePassword)
+        menuName = MenuPaths.Android + nameof(SetKeystorePassword)
     )]
     public sealed class SetKeystorePassword : ScriptableCustomBuildStep
     {

diff --git a/Editor/Platforms/Standalone/Build/BuildMacOS.cs b/Editor/Platforms/Standalone/Build/BuildMacOS.cs
@@ -6,11 +6,11 @@
 #endif
 using UnityEngine;
 
-namespace UniTools.Build.Standalone
+namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(BuildMacOS),
-        menuName = nameof(UniTools) + "/Build/Steps/" + nameof(Standalone) + "/" + nameof(BuildMacOS)
+        menuName = MenuPaths.Standalone + nameof(BuildMacOS)
     )]
     public sealed class BuildMacOS : ScriptableBuildStepWithOptions
     {

diff --git a/Editor/Platforms/Standalone/Build/BuildWindows.cs b/Editor/Platforms/Standalone/Build/BuildWindows.cs
@@ -3,11 +3,11 @@
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 
-namespace UniTools.Build.Standalone
+namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(BuildWindows),
-        menuName = nameof(UniTools) + "/Build/Steps/" + nameof(Standalone) + "/" + nameof(BuildWindows)
+        menuName = MenuPaths.Standalone + nameof(BuildWindows)
     )]
     public sealed class BuildWindows : ScriptableBuildStepWithOptions
     {

diff --git a/Editor/Platforms/Standalone/Build/BuildWindows64.cs b/Editor/Platforms/Standalone/Build/BuildWindows64.cs
@@ -3,11 +3,11 @@
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 
-namespace UniTools.Build.Standalone
+namespace UniTools.Build
 {
     [CreateAssetMenu(
         fileName = nameof(BuildWindows64),
-        menuName = nameof(UniTools) + "/Build/Steps/" + nameof(Standalone) + "/" + nameof(BuildWindows64)
+        menuName = MenuPaths.Standalone + nameof(BuildWindows64)
     )]
     public sealed class BuildWindows64 : ScriptableBuildStepWithOptions
     {

diff --git a/Editor/Platforms/WebGL.meta b/Editor/Platforms/WebGL.meta