Update build scripts and bump version

moandor-y · moandor-y · commit 5262caf44a05 · 2018-09-04T20:48:25.000+08:00
diff --git a/Assets/Editor/Build.cs b/Assets/Editor/Build.cs
@@ -13,7 +13,8 @@ private static string AndroidKeystorePath
         {
             get
             {
-                var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYSTORE");
+                var value = Environment.GetEnvironmentVariable(
+                    "UNITY_ANDROID_KEYSTORE");
                 return value ?? PlayerSettings.Android.keystoreName;
             }
         }
@@ -22,7 +23,8 @@ private static string AndroidKeystorePassword
         {
             get
             {
-                var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYSTORE_PASSWORD");
+                var value = Environment.GetEnvironmentVariable(
+                    "UNITY_ANDROID_KEYSTORE_PASSWORD");
                 return value ?? PlayerSettings.Android.keystorePass;
             }
         }
@@ -31,7 +33,8 @@ private static string AndroidKeyalias
         {
             get
             {
-                var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYALIAS");
+                var value = Environment.GetEnvironmentVariable(
+                    "UNITY_ANDROID_KEYALIAS");
                 return value ?? PlayerSettings.Android.keyaliasName;
             }
         }
@@ -40,7 +43,8 @@ private static string AndroidKeyaliasPassword
         {
             get
             {
-                var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYALIAS_PASSWORD");
+                var value = Environment.GetEnvironmentVariable(
+                    "UNITY_ANDROID_KEYALIAS_PASSWORD");
                 return value ?? PlayerSettings.Android.keyaliasPass;
             }
         }
@@ -129,29 +133,47 @@ public static void BuildAll()
         [MenuItem("Build/Enable Local Server", false, 500)]
         public static void EnableLocalServer()
         {
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone,
+            PlayerSettings.SetScriptingDefineSymbolsForGroup(
+                BuildTargetGroup.Standalone,
                 "LOCAL_SERVER");
             EditorSceneManager.SaveOpenScenes();
         }
 
         [MenuItem("Build/Disable Local Server", false, 510)]
         public static void DisableLocalServer()
         {
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone, "");
+            PlayerSettings.SetScriptingDefineSymbolsForGroup(
+                BuildTargetGroup.Standalone, "");
             EditorSceneManager.SaveOpenScenes();
         }
 
-        private static void Configure()
+        public static void BuildSilently()
         {
-            var version = BumpVersion();
-            PlayerSettings.Android.bundleVersionCode = version.VersionCode;
+            Configure(false);
+            InternalBuildReleaseAndroid();
+            InternalBuildReleaseLinux();
+            InternalBuildReleaseWindows();
+            InternalBuildDebugAndroid();
+            InternalBuildDebugLinux();
+            InternalBuildDebugWindows();
+            CleanUp();
+        }
+
+        private static void Configure(bool bumpVersion = true)
+        {
+            if (bumpVersion)
+            {
+                var version = BumpVersion();
+                PlayerSettings.Android.bundleVersionCode = version.VersionCode;
+                PlayerSettings.bundleVersion = version.VersionName;
+            }
             PlayerSettings.Android.keystoreName = AndroidKeystorePath;
             PlayerSettings.Android.keystorePass = AndroidKeystorePassword;
             PlayerSettings.Android.keyaliasName = AndroidKeyalias;
             PlayerSettings.Android.keyaliasPass = AndroidKeyaliasPassword;
             PlayerSettings.runInBackground = true;
-            PlayerSettings.displayResolutionDialog = ResolutionDialogSetting.HiddenByDefault;
-            PlayerSettings.bundleVersion = version.VersionName;
+            PlayerSettings.displayResolutionDialog =
+                ResolutionDialogSetting.HiddenByDefault;
             EditorSceneManager.SaveOpenScenes();
         }
 
@@ -168,21 +190,24 @@ private static VersionNumber BumpVersion()
         {
             const string path = "Assets/Scripts/Utils/Utilities.cs";
             var text = File.ReadAllText(path);
-            Regex regex = new Regex(@"^\s*public\s+const\s+int\s+VersionCode\s*=\s*(\d+);$",
+            Regex regex = new Regex(
+                @"^\s*public\s+const\s+int\s+VersionCode\s*=\s*(\d+);$",
                 RegexOptions.Multiline);
             var group = regex.Match(text).Groups[1];
             int versionCode = int.Parse(group.Value);
             ++versionCode;
             text = text.Remove(group.Index, group.Length);
             text = text.Insert(group.Index, versionCode.ToString());
-            regex = new Regex(@"^\s*public\s+const\s+string\s+VersionName\s*=\s*\"".*\.(\d+)\"";$",
+            regex = new Regex(
+                @"^\s*public\s+const\s+string\s+VersionName\s*=\s*\"".*\.(\d+)\"";$",
                 RegexOptions.Multiline);
             group = regex.Match(text).Groups[1];
             text = text.Remove(group.Index, group.Length);
             text = text.Insert(group.Index, versionCode.ToString());
             File.WriteAllText(path, text);
             AssetDatabase.Refresh();
-            regex = new Regex(@"^\s*public\s+const\s+string\s+VersionName\s*=\s*\""(.*)\"";$",
+            regex = new Regex(
+                @"^\s*public\s+const\s+string\s+VersionName\s*=\s*\""(.*)\"";$",
                 RegexOptions.Multiline);
             return new VersionNumber
             {
@@ -293,7 +318,8 @@ private static void InternalBuildReleaseAndroid()
                 BuildOptions.None);
         }
 
-        private static void BuildMasterServer(string path, BuildTarget target, BuildOptions options)
+        private static void BuildMasterServer(string path, BuildTarget target,
+                                              BuildOptions options)
         {
             PlayerSettings.productName = "TetrisMasterServer";
             string[] scenes =
@@ -304,7 +330,7 @@ private static void BuildMasterServer(string path, BuildTarget target, BuildOpti
         }
 
         private static void BuildSpawnerServer(string path, BuildTarget target,
-            BuildOptions options)
+                                               BuildOptions options)
         {
             PlayerSettings.productName = "TetrisSpawnerServer";
             string[] scenes =
@@ -314,7 +340,8 @@ private static void BuildSpawnerServer(string path, BuildTarget target,
             BuildPipeline.BuildPlayer(scenes, path, target, options);
         }
 
-        private static void BuildGameServer(string path, BuildTarget target, BuildOptions options)
+        private static void BuildGameServer(string path, BuildTarget target,
+                                            BuildOptions options)
         {
             PlayerSettings.productName = "TetrisGameServer";
             string[] scenes =
@@ -324,7 +351,8 @@ private static void BuildGameServer(string path, BuildTarget target, BuildOption
             BuildPipeline.BuildPlayer(scenes, path, target, options);
         }
 
-        private static void BuildClient(string path, BuildTarget target, BuildOptions options)
+        private static void BuildClient(string path, BuildTarget target,
+                                        BuildOptions options)
         {
             PlayerSettings.productName = "Tetris";
             string[] scenes =
diff --git a/Assets/Scripts/Utils/Utilities.cs b/Assets/Scripts/Utils/Utilities.cs
@@ -12,8 +12,8 @@ namespace Utils
 {
     public static class Utilities
     {
-        public const int VersionCode = 176;
-        public const string VersionName = "0.2-alpha.7.176";
+        public const int VersionCode = 179;
+        public const string VersionName = "0.3-alpha.0.179";
 
         public const string BuildType =
 #if DEVELOPMENT_BUILD
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -37,6 +37,7 @@ GraphicsSettings:
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -90,7 +90,7 @@ PlayerSettings:
   visibleInBackground: 1
   allowFullscreenSwitch: 1
   graphicsJobMode: 0
-  fullscreenMode: 1
+  fullscreenMode: 0
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0
@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.2-alpha.7.176
+  bundleVersion: 0.3-alpha.0.179
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -154,7 +154,7 @@ PlayerSettings:
     Android: org.seproject.tetris
     Standalone: org.seproject.tetris
   buildNumber: {}
-  AndroidBundleVersionCode: 176
+  AndroidBundleVersionCode: 179
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 0
@@ -258,7 +258,99 @@ PlayerSettings:
   androidGamepadSupportLevel: 0
   resolutionDialogBanner: {fileID: 0}
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: WindowsStandaloneSupport

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ private static string AndroidKeystorePath`
`13`	`13`	`{`
`14`	`14`	`get`
`15`	`15`	`{`
`16`		`- var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYSTORE");`
	`16`	`+ var value = Environment.GetEnvironmentVariable(`
	`17`	`+ "UNITY_ANDROID_KEYSTORE");`
`17`	`18`	`return value ?? PlayerSettings.Android.keystoreName;`
`18`	`19`	`}`
`19`	`20`	`}`
`@@ -22,7 +23,8 @@ private static string AndroidKeystorePassword`
`22`	`23`	`{`
`23`	`24`	`get`
`24`	`25`	`{`
`25`		`- var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYSTORE_PASSWORD");`
	`26`	`+ var value = Environment.GetEnvironmentVariable(`
	`27`	`+ "UNITY_ANDROID_KEYSTORE_PASSWORD");`
`26`	`28`	`return value ?? PlayerSettings.Android.keystorePass;`
`27`	`29`	`}`
`28`	`30`	`}`
`@@ -31,7 +33,8 @@ private static string AndroidKeyalias`
`31`	`33`	`{`
`32`	`34`	`get`
`33`	`35`	`{`
`34`		`- var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYALIAS");`
	`36`	`+ var value = Environment.GetEnvironmentVariable(`
	`37`	`+ "UNITY_ANDROID_KEYALIAS");`
`35`	`38`	`return value ?? PlayerSettings.Android.keyaliasName;`
`36`	`39`	`}`
`37`	`40`	`}`
`@@ -40,7 +43,8 @@ private static string AndroidKeyaliasPassword`
`40`	`43`	`{`
`41`	`44`	`get`
`42`	`45`	`{`
`43`		`- var value = Environment.GetEnvironmentVariable("UNITY_ANDROID_KEYALIAS_PASSWORD");`
	`46`	`+ var value = Environment.GetEnvironmentVariable(`
	`47`	`+ "UNITY_ANDROID_KEYALIAS_PASSWORD");`
`44`	`48`	`return value ?? PlayerSettings.Android.keyaliasPass;`
`45`	`49`	`}`
`46`	`50`	`}`
`@@ -129,29 +133,47 @@ public static void BuildAll()`
`129`	`133`	`[MenuItem("Build/Enable Local Server", false, 500)]`
`130`	`134`	`public static void EnableLocalServer()`
`131`	`135`	`{`
`132`		`- PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone,`
	`136`	`+ PlayerSettings.SetScriptingDefineSymbolsForGroup(`
	`137`	`+ BuildTargetGroup.Standalone,`
`133`	`138`	`"LOCAL_SERVER");`
`134`	`139`	`EditorSceneManager.SaveOpenScenes();`
`135`	`140`	`}`
`136`	`141`
`137`	`142`	`[MenuItem("Build/Disable Local Server", false, 510)]`
`138`	`143`	`public static void DisableLocalServer()`
`139`	`144`	`{`
`140`		`- PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone, "");`
	`145`	`+ PlayerSettings.SetScriptingDefineSymbolsForGroup(`
	`146`	`+ BuildTargetGroup.Standalone, "");`
`141`	`147`	`EditorSceneManager.SaveOpenScenes();`
`142`	`148`	`}`
`143`	`149`
`144`		`- private static void Configure()`
	`150`	`+ public static void BuildSilently()`
`145`	`151`	`{`
`146`		`- var version = BumpVersion();`
`147`		`- PlayerSettings.Android.bundleVersionCode = version.VersionCode;`
	`152`	`+ Configure(false);`
	`153`	`+ InternalBuildReleaseAndroid();`
	`154`	`+ InternalBuildReleaseLinux();`
	`155`	`+ InternalBuildReleaseWindows();`
	`156`	`+ InternalBuildDebugAndroid();`
	`157`	`+ InternalBuildDebugLinux();`
	`158`	`+ InternalBuildDebugWindows();`
	`159`	`+ CleanUp();`
	`160`	`+ }`
	`161`	`+`
	`162`	`+ private static void Configure(bool bumpVersion = true)`
	`163`	`+ {`
	`164`	`+ if (bumpVersion)`
	`165`	`+ {`
	`166`	`+ var version = BumpVersion();`
	`167`	`+ PlayerSettings.Android.bundleVersionCode = version.VersionCode;`
	`168`	`+ PlayerSettings.bundleVersion = version.VersionName;`
	`169`	`+ }`
`148`	`170`	`PlayerSettings.Android.keystoreName = AndroidKeystorePath;`
`149`	`171`	`PlayerSettings.Android.keystorePass = AndroidKeystorePassword;`
`150`	`172`	`PlayerSettings.Android.keyaliasName = AndroidKeyalias;`
`151`	`173`	`PlayerSettings.Android.keyaliasPass = AndroidKeyaliasPassword;`
`152`	`174`	`PlayerSettings.runInBackground = true;`
`153`		`- PlayerSettings.displayResolutionDialog = ResolutionDialogSetting.HiddenByDefault;`
`154`		`- PlayerSettings.bundleVersion = version.VersionName;`
	`175`	`+ PlayerSettings.displayResolutionDialog =`
	`176`	`+ ResolutionDialogSetting.HiddenByDefault;`
`155`	`177`	`EditorSceneManager.SaveOpenScenes();`
`156`	`178`	`}`
`157`	`179`
`@@ -168,21 +190,24 @@ private static VersionNumber BumpVersion()`
`168`	`190`	`{`
`169`	`191`	`const string path = "Assets/Scripts/Utils/Utilities.cs";`
`170`	`192`	`var text = File.ReadAllText(path);`
`171`		`- Regex regex = new Regex(@"^\spublic\s+const\s+int\s+VersionCode\s=\s*(\d+);$",`
	`193`	`+ Regex regex = new Regex(`
	`194`	`+ @"^\spublic\s+const\s+int\s+VersionCode\s=\s*(\d+);$",`
`172`	`195`	`RegexOptions.Multiline);`
`173`	`196`	`var group = regex.Match(text).Groups[1];`
`174`	`197`	`int versionCode = int.Parse(group.Value);`
`175`	`198`	`++versionCode;`
`176`	`199`	`text = text.Remove(group.Index, group.Length);`
`177`	`200`	`text = text.Insert(group.Index, versionCode.ToString());`
`178`		`- regex = new Regex(@"^\spublic\s+const\s+string\s+VersionName\s=\s\"".\.(\d+)\"";$",`
	`201`	`+ regex = new Regex(`
	`202`	`+ @"^\spublic\s+const\s+string\s+VersionName\s=\s\"".\.(\d+)\"";$",`
`179`	`203`	`RegexOptions.Multiline);`
`180`	`204`	`group = regex.Match(text).Groups[1];`
`181`	`205`	`text = text.Remove(group.Index, group.Length);`
`182`	`206`	`text = text.Insert(group.Index, versionCode.ToString());`
`183`	`207`	`File.WriteAllText(path, text);`
`184`	`208`	`AssetDatabase.Refresh();`
`185`		`- regex = new Regex(@"^\spublic\s+const\s+string\s+VersionName\s=\s\""(.)\"";$",`
	`209`	`+ regex = new Regex(`
	`210`	`+ @"^\spublic\s+const\s+string\s+VersionName\s=\s\""(.)\"";$",`
`186`	`211`	`RegexOptions.Multiline);`
`187`	`212`	`return new VersionNumber`
`188`	`213`	`{`
`@@ -293,7 +318,8 @@ private static void InternalBuildReleaseAndroid()`
`293`	`318`	`BuildOptions.None);`
`294`	`319`	`}`
`295`	`320`
`296`		`- private static void BuildMasterServer(string path, BuildTarget target, BuildOptions options)`
	`321`	`+ private static void BuildMasterServer(string path, BuildTarget target,`
	`322`	`+ BuildOptions options)`
`297`	`323`	`{`
`298`	`324`	`PlayerSettings.productName = "TetrisMasterServer";`
`299`	`325`	`string[] scenes =`
`@@ -304,7 +330,7 @@ private static void BuildMasterServer(string path, BuildTarget target, BuildOpti`
`304`	`330`	`}`
`305`	`331`
`306`	`332`	`private static void BuildSpawnerServer(string path, BuildTarget target,`
`307`		`- BuildOptions options)`
	`333`	`+ BuildOptions options)`
`308`	`334`	`{`
`309`	`335`	`PlayerSettings.productName = "TetrisSpawnerServer";`
`310`	`336`	`string[] scenes =`
`@@ -314,7 +340,8 @@ private static void BuildSpawnerServer(string path, BuildTarget target,`
`314`	`340`	`BuildPipeline.BuildPlayer(scenes, path, target, options);`
`315`	`341`	`}`
`316`	`342`
`317`		`- private static void BuildGameServer(string path, BuildTarget target, BuildOptions options)`
	`343`	`+ private static void BuildGameServer(string path, BuildTarget target,`
	`344`	`+ BuildOptions options)`
`318`	`345`	`{`
`319`	`346`	`PlayerSettings.productName = "TetrisGameServer";`
`320`	`347`	`string[] scenes =`
`@@ -324,7 +351,8 @@ private static void BuildGameServer(string path, BuildTarget target, BuildOption`
`324`	`351`	`BuildPipeline.BuildPlayer(scenes, path, target, options);`
`325`	`352`	`}`
`326`	`353`
`327`		`- private static void BuildClient(string path, BuildTarget target, BuildOptions options)`
	`354`	`+ private static void BuildClient(string path, BuildTarget target,`
	`355`	`+ BuildOptions options)`
`328`	`356`	`{`
`329`	`357`	`PlayerSettings.productName = "Tetris";`
`330`	`358`	`string[] scenes =`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ namespace Utils`
`12`	`12`	`{`
`13`	`13`	`public static class Utilities`
`14`	`14`	`{`
`15`		`- public const int VersionCode = 176;`
`16`		`- public const string VersionName = "0.2-alpha.7.176";`
	`15`	`+ public const int VersionCode = 179;`
	`16`	`+ public const string VersionName = "0.3-alpha.0.179";`
`17`	`17`
`18`	`18`	`public const string BuildType =`
`19`	`19`	`#if DEVELOPMENT_BUILD`