Merge pull request #41 from rthery/update-binary-name

Move binaryName to BuildArchitecture
superunitybuild · Jun 11, 2019 · 30e67b7 · 30e67b7
2 parents 849f4bd + 72b0732
commit 30e67b7
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 25 deletions.
diff --git a/Editor/Build/BuildProject.cs b/Editor/Build/BuildProject.cs
@@ -334,7 +334,7 @@ private static bool BuildPlayer(string notification, BuildReleaseType releaseTyp
 
         // Generate build path.
         string buildPath = GenerateBuildPath(BuildSettings.basicSettings.buildPath, releaseType, platform, architecture, distribution, buildTime);
-        string exeName = string.Format(platform.binaryNameFormat, SanitizeFileName(releaseType.productName));
+        string binName = string.Format(architecture.binaryNameFormat, SanitizeFileName(releaseType.productName));
 
         // Save current user defines, and then set target defines.
         string preBuildDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(platform.targetGroup);
@@ -377,11 +377,11 @@ private static bool BuildPlayer(string notification, BuildReleaseType releaseTyp
 
         string error = "";
 #if UNITY_2018_1_OR_NEWER
-        UnityEditor.Build.Reporting.BuildReport buildReport = BuildPipeline.BuildPlayer(releaseType.sceneList.GetSceneFileList(), Path.Combine(buildPath, exeName), architecture.target, options);
+        UnityEditor.Build.Reporting.BuildReport buildReport = BuildPipeline.BuildPlayer(releaseType.sceneList.GetSceneFileList(), Path.Combine(buildPath, binName), architecture.target, options);
         if (buildReport.summary.result == UnityEditor.Build.Reporting.BuildResult.Failed)
             error = buildReport.summary.totalErrors + " occurred.";
 #else
-        error = BuildPipeline.BuildPlayer(releaseType.sceneList.GetSceneFileList(), Path.Combine(buildPath, exeName), architecture.target, options);
+        error = BuildPipeline.BuildPlayer(releaseType.sceneList.GetSceneFileList(), Path.Combine(buildPath, binName), architecture.target, options);
 #endif
         if (!string.IsNullOrEmpty(error))
         {

diff --git a/Editor/Build/Platform/BuildAndroid.cs b/Editor/Build/Platform/BuildAndroid.cs
@@ -24,14 +24,13 @@ public BuildAndroid()
     public override void Init()
     {
         platformName = _name;
-        binaryNameFormat = _binaryNameFormat;
         dataDirNameFormat = _dataDirNameFormat;
         targetGroup = _targetGroup;
 
         if (architectures == null || architectures.Length == 0)
         {
             architectures = new BuildArchitecture[] {
-                new BuildArchitecture(BuildTarget.Android, "Android", true)
+                new BuildArchitecture(BuildTarget.Android, "Android", true, _binaryNameFormat)
             };
         }
         if (variants == null || variants.Length == 0)

diff --git a/Editor/Build/Platform/BuildArchitecture.cs b/Editor/Build/Platform/BuildArchitecture.cs
@@ -10,12 +10,14 @@ public class BuildArchitecture
     public BuildTarget target;
     public string name;
     public bool enabled;
+    public string binaryNameFormat;
 
-    public BuildArchitecture(BuildTarget target, string name, bool enabled)
+    public BuildArchitecture(BuildTarget target, string name, bool enabled, string binaryNameFormat)
     {
         this.target = target;
         this.name = name;
         this.enabled = enabled;
+        this.binaryNameFormat = binaryNameFormat;
     }
 }
 

diff --git a/Editor/Build/Platform/BuildIOS.cs b/Editor/Build/Platform/BuildIOS.cs
@@ -25,14 +25,13 @@
 //    public override void Init()
 //    {
 //        platformName = _name;
-//        binaryNameFormat = _binaryNameFormat;
 //        dataDirNameFormat = _dataDirNameFormat;
 //        targetGroup = _targetGroup;
 
 //        if (architectures == null || architectures.Length == 0)
 //        {
 //            architectures = new BuildArchitecture[] { 
-//                new BuildArchitecture(BuildTarget.iOS, "iOS", true)
+//                new BuildArchitecture(BuildTarget.iOS, "iOS", true, _binaryNameFormat)
 //            };
 //        }
 //        if (variants == null || variants.Length == 0)

diff --git a/Editor/Build/Platform/BuildLinux.cs b/Editor/Build/Platform/BuildLinux.cs
@@ -9,7 +9,6 @@ public class BuildLinux : BuildPlatform
     #region Constants
 
     private const string _name = "Linux";
-    private const string _binaryNameFormat = "{0}.x86";
     private const string _dataDirNameFormat = "{0}_Data";
     private const BuildTargetGroup _targetGroup = BuildTargetGroup.Standalone;
 
@@ -24,17 +23,21 @@ public BuildLinux()
     public override void Init()
     {
         platformName = _name;
-        binaryNameFormat = _binaryNameFormat;
         dataDirNameFormat = _dataDirNameFormat;
         targetGroup = _targetGroup;
 
         if (architectures == null || architectures.Length == 0)
         {
-            architectures = new BuildArchitecture[] { 
-                new BuildArchitecture(BuildTarget.StandaloneLinuxUniversal, "Linux Universal", true),
-                new BuildArchitecture(BuildTarget.StandaloneLinux, "Linux x86", false),
-                new BuildArchitecture(BuildTarget.StandaloneLinux64, "Linux x64", false)
+            architectures = new BuildArchitecture[] {
+                new BuildArchitecture(BuildTarget.StandaloneLinuxUniversal, "Linux Universal", true, "{0}"),
+                new BuildArchitecture(BuildTarget.StandaloneLinux, "Linux x86", false, "{0}.x86"),
+                new BuildArchitecture(BuildTarget.StandaloneLinux64, "Linux x64", false, "{0}.x86_64")
             };
+
+#if UNITY_2018_3_OR_NEWER
+            architectures[0].enabled = false;
+            architectures[2].enabled = true;
+#endif
         }
     }
 }

diff --git a/Editor/Build/Platform/BuildOSX.cs b/Editor/Build/Platform/BuildOSX.cs
@@ -24,19 +24,18 @@ public BuildOSX()
     public override void Init()
     {
         platformName = _name;
-        binaryNameFormat = _binaryNameFormat;
         dataDirNameFormat = _dataDirNameFormat;
         targetGroup = _targetGroup;
 
         if (architectures == null || architectures.Length == 0)
         {
             architectures = new BuildArchitecture[] { 
 #if UNITY_2017_3_OR_NEWER
-                new BuildArchitecture(BuildTarget.StandaloneOSX, "OSX", true),
+                new BuildArchitecture(BuildTarget.StandaloneOSX, "OSX", true, _binaryNameFormat),
 #else
-                new BuildArchitecture(BuildTarget.StandaloneOSXUniversal, "OSX Universal", true),
-                new BuildArchitecture(BuildTarget.StandaloneOSXIntel, "OSX Intel", false),
-                new BuildArchitecture(BuildTarget.StandaloneOSXIntel64, "OSX Intel64", false)
+                new BuildArchitecture(BuildTarget.StandaloneOSXUniversal, "OSX Universal", true, _binaryNameFormat),
+                new BuildArchitecture(BuildTarget.StandaloneOSXIntel, "OSX Intel", false, _binaryNameFormat),
+                new BuildArchitecture(BuildTarget.StandaloneOSXIntel64, "OSX Intel64", false, _binaryNameFormat)
 #endif
             };
         }

diff --git a/Editor/Build/Platform/BuildPC.cs b/Editor/Build/Platform/BuildPC.cs
@@ -24,15 +24,14 @@ public BuildPC()
     public override void Init()
     {
         platformName = _name;
-        binaryNameFormat = _binaryNameFormat;
         dataDirNameFormat = _dataDirNameFormat;
         targetGroup = _targetGroup;
 
         if (architectures == null || architectures.Length == 0)
         {
             architectures = new BuildArchitecture[] { 
-                new BuildArchitecture(BuildTarget.StandaloneWindows, "Windows x86", true),
-                new BuildArchitecture(BuildTarget.StandaloneWindows64, "Windows x64", false)
+                new BuildArchitecture(BuildTarget.StandaloneWindows, "Windows x86", true, _binaryNameFormat),
+                new BuildArchitecture(BuildTarget.StandaloneWindows64, "Windows x64", false, _binaryNameFormat)
             };
         }
     }

diff --git a/Editor/Build/Platform/BuildPlatform.cs b/Editor/Build/Platform/BuildPlatform.cs
@@ -13,7 +13,6 @@ public class BuildPlatform
     public BuildVariant[] variants = new BuildVariant[0];
 
     public string platformName;
-    public string binaryNameFormat;
     public string dataDirNameFormat;
     public BuildTargetGroup targetGroup;
 

diff --git a/Editor/Build/Platform/BuildWebGL.cs b/Editor/Build/Platform/BuildWebGL.cs
@@ -24,14 +24,13 @@ public BuildWebGL()
     public override void Init()
     {
         platformName = _name;
-        binaryNameFormat = _binaryNameFormat;
         dataDirNameFormat = _dataDirNameFormat;
         targetGroup = _targetGroup;
 
         if (architectures == null || architectures.Length == 0)
         {
             architectures = new BuildArchitecture[] { 
-                new BuildArchitecture(BuildTarget.WebGL, "WebGL", true),
+                new BuildArchitecture(BuildTarget.WebGL, "WebGL", true, _binaryNameFormat),
             };
         }
     }