Skip to content

Commit

Permalink
Improve version support (#304)
Browse files Browse the repository at this point in the history 
Description
===========

Add install support for Unity versions

2020, 2021 and alpha versions of 2022

I also found some issue due to bugs in the old
UnityHub. I fixed these things which will have impact
on 2019 installs along with the rest in this huge patch.
  • Loading branch information
@Larusso
Larusso authored Nov 16, 2021
1 parent f2d7c3a commit ee16535
Show file tree
Hide file tree
Showing 161 changed files with 11,968 additions and 6,821 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion commands/uvm-generate-modules-json/tests/fixures/linux/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
mod v2017;
mod v2018;
mod v2019;

mod v2020;
mod v2021;
mod v2022;
pub mod module {
pub use super::v2017::modules::*;
pub use super::v2018::modules::*;
pub use super::v2019::modules::*;
pub use super::v2020::modules::*;
pub use super::v2021::modules::*;
pub use super::v2022::modules::*;
}

pub mod manifest {
pub use super::v2017::manifests::*;
pub use super::v2018::manifests::*;
pub use super::v2019::manifests::*;
pub use super::v2020::manifests::*;
pub use super::v2021::manifests::*;
pub use super::v2022::manifests::*;
}
18 changes: 18 additions & 0 deletions commands/uvm-generate-modules-json/tests/fixures/linux/test_setup.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#[cfg(target_os = "")]
generate_modules_json![
generates_modules_2022_1, Version::a(2022, 1, 0, 13), UNITY_2022_1_0_A_13,
generates_modules_2021_1, Version::f(2021, 1, 28, 1), UNITY_2021_1_28_F_1,
generates_modules_2021_2, Version::f(2021, 2, 2, 1), UNITY_2021_2_2_F_1,
generates_modules_2020_1, Version::f(2020, 1, 17, 1), UNITY_2020_1_17_F_1,
generates_modules_2020_2, Version::f(2020, 2, 7, 1), UNITY_2020_2_7_F_1,
generates_modules_2020_3, Version::f(2020, 3, 22, 1), UNITY_2020_3_22_F_1,
generates_modules_2019_1, Version::f(2019, 1, 14, 1), UNITY_2019_1_14_F_1,
generates_modules_2019_2, Version::f(2019, 2, 21, 1), UNITY_2019_2_21_F_1,
generates_modules_2019_3, Version::f(2019, 3, 15, 1), UNITY_2019_3_15_F_1,
generates_modules_2019_4, Version::f(2019, 4, 32, 1), UNITY_2019_4_32_F_1,
generates_modules_2018_4, Version::f(2018, 4, 36, 1), UNITY_2018_4_36_F_1,
generates_modules_2018_3, Version::f(2018, 3, 14, 1), UNITY_2018_3_14_F_1,
generates_modules_2018_2, Version::f(2018, 2, 21, 1), UNITY_2018_2_21_F_1,
generates_modules_2018_1, Version::f(2018, 1, 9, 2), UNITY_2018_1_9_F_2,
generates_modules_2017_4, Version::f(2017, 4, 40, 1), UNITY_2017_4_40_F_1,
];
99 changes: 99 additions & 0 deletions commands/uvm-generate-modules-json/tests/fixures/linux/v2017/2017.4.40f1_manifest.ini
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
[Unity]
title=Unity 2017.4.40f1
description=Unity Editor
url=LinuxEditorInstaller/Unity.tar.xz
md5=e6ec37b260342dd8b1e3e8dd2ed88f1c
install=true
mandatory=false
size=675610012
installedsize=2786979840
version=2017.4.40f1
[Documentation]
title=Documentation
description=Unity User Manual and Scripting API Reference
url=MacDocumentationInstaller/Documentation.pkg
md5=a82eda0c58e9f56913079a19de48ee36
install=true
mandatory=false
size=261978148
installedsize=545456000
[StandardAssets]
title=Standard Assets
description=Unity Standard Assets for easily getting started building projects in Unity
url=MacStandardAssetsInstaller/StandardAssets.pkg
md5=d38593eecf3c3cad31e62a3fe09e3306
install=true
mandatory=false
size=189343786
installedsize=184868000
[Example]
title=Example Project
description=Unity Example Project based on Standard Assets
url=MacExampleProjectInstaller/Examples.pkg
md5=1ff94205e51e62c5da6beb9b30436c4f
install=false
mandatory=false
size=311961630
installedsize=538832000
[Android]
title=Android Build Support
description=Allows building your Unity projects for the Android platform
url=MacEditorTargetInstaller/UnitySetup-Android-Support-for-Editor-2017.4.40f1.pkg
md5=b6990ae00717ee4d2a534a23695670c9
install=false
mandatory=false
size=386824216
installedsize=1151080000
requires_unity=true
[iOS]
title=iOS Build Support
description=Allows building your Unity projects for the iOS platform
url=LinuxEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-2017.4.40f1.tar.xz
md5=e5f107fb6b89cc91c93b62a9c1ee170f
install=false
mandatory=false
size=884686480
installedsize=3124940800
requires_unity=true
[Mac]
title=Mac Build Support
description=Allows building your Unity projects for the Mac platform
url=MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-2017.4.40f1.pkg
md5=0966d11dcf2e98a3ee900c7341d088dd
install=false
mandatory=false
size=40785938
installedsize=128535000
requires_unity=true
[WebGL]
title=WebGL Build Support
description=Allows building your Unity projects for the WebGL platform
url=LinuxEditorTargetInstaller/UnitySetup-WebGL-Support-for-Editor-2017.4.40f1.tar.xz
md5=aae446fdb7cb693cb4fdcfefc0b49ec6
install=false
mandatory=false
size=158590200
installedsize=683622400
requires_unity=true
[Windows]
title=Windows Build Support
description=Allows building your Unity projects for the Windows platform
url=MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-2017.4.40f1.pkg
md5=eff448b4169f18939f93c3316715a296
install=false
mandatory=false
size=336345125
installedsize=1234142000
requires_unity=true
[Facebook-Games]
title=Facebook Gameroom Build Support
description=Allows building your Unity projects for the Facebook-Games platform
url=MacEditorTargetInstaller/UnitySetup-Facebook-Games-Support-for-Editor-2017.4.40f1.pkg
md5=e7a7ea5cdf8aaa2e77efd647d5a0acd8
install=false
mandatory=false
size=43440157
installedsize=103965000
requires_unity=true
optsync_webgl=WebGL
optsync_windows=Windows
1 change: 1 addition & 0 deletions commands/uvm-generate-modules-json/tests/fixures/linux/v2017/2017.4.40f1_modules.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"id":"documentation","name":"Documentation","description":"Unity User Manual and Scripting API Reference","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/MacDocumentationInstaller/Documentation.pkg","category":"Components","installedSize":545456000,"downloadSize":261978148,"visible":true,"selected":false,"destination":"{UNITY_PATH}/Editor/Data/Documentation","checksum":"a82eda0c58e9f56913079a19de48ee36"},{"id":"standardassets","name":"Standard Assets","description":"Unity Standard Assets for easily getting started building projects in Unity","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/MacStandardAssetsInstaller/StandardAssets.pkg","category":"Components","installedSize":184868000,"downloadSize":189343786,"visible":true,"selected":false,"destination":"{UNITY_PATH}","checksum":"d38593eecf3c3cad31e62a3fe09e3306"},{"id":"example","name":"Example Project","description":"Unity Example Project based on Standard Assets","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/MacExampleProjectInstaller/Examples.pkg","category":"Components","installedSize":538832000,"downloadSize":311961630,"visible":true,"selected":false,"destination":"{UNITY_PATH}","checksum":"1ff94205e51e62c5da6beb9b30436c4f"},{"id":"android","name":"Android Build Support","description":"Allows building your Unity projects for the Android platform","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/MacEditorTargetInstaller/UnitySetup-Android-Support-for-Editor-2017.4.40f1.pkg","category":"Platforms","installedSize":1151080000,"downloadSize":386824216,"visible":true,"selected":false,"destination":"{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer","checksum":"b6990ae00717ee4d2a534a23695670c9"},{"id":"ios","name":"iOS Build Support","description":"Allows building your Unity projects for the iOS platform","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/LinuxEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-2017.4.40f1.tar.xz","category":"Platforms","installedSize":3124940800,"downloadSize":884686480,"visible":true,"selected":false,"destination":"{UNITY_PATH}/Editor/Data/PlaybackEngines","checksum":"e5f107fb6b89cc91c93b62a9c1ee170f"},{"id":"mac","name":"Mac Build Support","description":"Allows building your Unity projects for the Mac platform","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-2017.4.40f1.pkg","category":"Platforms","installedSize":128535000,"downloadSize":40785938,"visible":true,"selected":false,"destination":"{UNITY_PATH}/Editor/Data/PlaybackEngines/MacStandaloneSupport","checksum":"0966d11dcf2e98a3ee900c7341d088dd"},{"id":"webgl","name":"WebGL Build Support","description":"Allows building your Unity projects for the WebGL platform","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/LinuxEditorTargetInstaller/UnitySetup-WebGL-Support-for-Editor-2017.4.40f1.tar.xz","category":"Platforms","installedSize":683622400,"downloadSize":158590200,"visible":true,"selected":false,"destination":"{UNITY_PATH}/Editor/Data/PlaybackEngines/WebGLSupport","checksum":"aae446fdb7cb693cb4fdcfefc0b49ec6"},{"id":"windows","name":"Windows Build Support","description":"Allows building your Unity projects for the Windows platform","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-2017.4.40f1.pkg","category":"Platforms","installedSize":1234142000,"downloadSize":336345125,"visible":true,"selected":false,"destination":"{UNITY_PATH}/Editor/Data/PlaybackEngines/WindowsStandaloneSupport","checksum":"eff448b4169f18939f93c3316715a296"},{"id":"facebook-games","name":"Facebook Gameroom Build Support","description":"Allows building your Unity projects for the Facebook-Games platform","downloadUrl":"https://download.unity3d.com/download_unity/6e14067f8a9a/MacEditorTargetInstaller/UnitySetup-Facebook-Games-Support-for-Editor-2017.4.40f1.pkg","category":"Platforms","installedSize":103965000,"downloadSize":43440157,"visible":true,"selected":false,"destination":"{UNITY_PATH}/Editor/Data/PlaybackEngines/Facebook","checksum":"e7a7ea5cdf8aaa2e77efd647d5a0acd8"}]
9 changes: 9 additions & 0 deletions commands/uvm-generate-modules-json/tests/fixures/linux/v2017/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pub mod modules {
//MODULE_JSON
pub const UNITY_2017_4_40_F_1:&str = include_str!("2017.4.40f1_modules.json");
}

pub mod manifests {
//MANIFEST_INI
pub const UNITY_2017_4_40_F_1:&str = include_str!("2017.4.40f1_manifest.ini");
}
99 changes: 99 additions & 0 deletions commands/uvm-generate-modules-json/tests/fixures/linux/v2018/2018.1.9f2,_manifest.ini
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
[Unity]
title=Unity 2018.1.9f2
description=Unity Editor
url=LinuxEditorInstaller/Unity.tar.xz
md5=a55a559202216a4d0b4434e7627c9655
install=true
mandatory=false
size=800936960
installedsize=3021373440
version=2018.1.9f2
[Documentation]
title=Documentation
description=Unity User Manual and Scripting API Reference
url=MacDocumentationInstaller/Documentation.pkg
md5=54a147979a0926f854794c02aa1ef85c
install=true
mandatory=false
size=333006885
installedsize=802087000
[StandardAssets]
title=Standard Assets
description=Unity Standard Assets for easily getting started building projects in Unity
url=MacStandardAssetsInstaller/StandardAssets.pkg
md5=e5895b1c67f1c81302aa220b134b75bb
install=true
mandatory=false
size=189331499
installedsize=184856000
[Example]
title=Example Project
description=Unity Example Project based on Standard Assets
url=MacExampleProjectInstaller/Examples.pkg
md5=9cfb837150b7576f3fa1548118d4a416
install=false
mandatory=false
size=313387040
installedsize=552517000
[Android]
title=Android Build Support
description=Allows building your Unity projects for the Android platform
url=MacEditorTargetInstaller/UnitySetup-Android-Support-for-Editor-2018.1.9f2.pkg
md5=cbad1feadb8c5afb43981f04afe8ae77
install=false
mandatory=false
size=349919264
installedsize=1172099000
requires_unity=true
[iOS]
title=iOS Build Support
description=Allows building your Unity projects for the iOS platform
url=LinuxEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-2018.1.9f2.tar.xz
md5=9a45b38c7160e71de75ed3f598700d63
install=false
mandatory=false
size=916738264
installedsize=3277578240
requires_unity=true
[Mac-Mono]
title=Mac Mono Scripting Backend
description=Allows building your Unity projects for the Mac-Mono platform
url=MacEditorTargetInstaller/UnitySetup-Mac-Mono-Support-for-Editor-2018.1.9f2.pkg
md5=27b6ee5136780f891c813fbe7180bae3
install=false
mandatory=false
size=43370520
installedsize=139614000
requires_unity=true
[WebGL]
title=WebGL Build Support
description=Allows building your Unity projects for the WebGL platform
url=LinuxEditorTargetInstaller/UnitySetup-WebGL-Support-for-Editor-2018.1.9f2.tar.xz
md5=9c89dbf4dde523e010598aba8fcc0b86
install=false
mandatory=false
size=160300648
installedsize=715591680
requires_unity=true
[Windows-Mono]
title=Windows Mono Scripting Backend
description=Allows building your Unity projects for the Windows-Mono platform
url=MacEditorTargetInstaller/UnitySetup-Windows-Mono-Support-for-Editor-2018.1.9f2.pkg
md5=d8f36be37781132827a77a991b122278
install=false
mandatory=false
size=351434781
installedsize=1227008000
requires_unity=true
[Facebook-Games]
title=Facebook Gameroom Build Support
description=Allows building your Unity projects for the Facebook-Games platform
url=MacEditorTargetInstaller/UnitySetup-Facebook-Games-Support-for-Editor-2018.1.9f2.pkg
md5=62794a550aa3786bfa50a1766cc1852b
install=false
mandatory=false
size=44881959
installedsize=107789000
requires_unity=true
optsync_webgl=WebGL
optsync_windows=Windows
Loading

0 comments on commit ee16535

Please sign in to comment.