From 9329b7369cc8254c7093d49d33c47290e54dd72b Mon Sep 17 00:00:00 2001
From: AndrewKahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Wed, 14 Dec 2022 01:27:36 -0800
Subject: [PATCH] Install mac modules based on target platform for greater
 flexibility (#481)

---
 dist/index.js                         | Bin 21970247 -> 21970566 bytes
 dist/index.js.map                     | Bin 16364287 -> 16364688 bytes
 src/model/platform-setup/setup-mac.ts |  20 ++++++++++++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index ec837da4fd6abd012b65041c0af41fad758c4c0b..fcb92b1b7cb6841601efb788568db148ab8ac351 100644
GIT binary patch
delta 1608
zcmY+^XLQYX9LMo<lmE@OB7-Z5ix5OYtRO<Jy@S|oi3*xlT%-0%D)tJ(-`;z-LRak7
z)-0X&Y+}<IvD&^rj&pK6c)g$eKIi-JckE@h*Tgs3Ua9GpbeDA3EF&_<%!sxa<^Y@3
z-HgdG&buVWn2y_S{^pK*Mu<5*&#<{B$0wMMZdv~3DVx>P*B%~gPmG92aV8Dv*V~@#
z9BenEo?8OV#Efx4=IK1c+ciF+Oa9*ac5gaz4Zr-IM_AAPNrRlpN%^~g_wT-Ye|I}B
z(=B-J3LnF#mop`Wr?=ZlX}JchaDzKM;0Z5y!v_UW5QR_}Mc|8~@Pj`B5Qt(Z4jW1!
z2*C(JN!U>erBMc<D2s9kLwQs{MTDagA`pqnsDda|MKx4M4b((5YN0mjAO>|2i+ZS!
zI5^M%4bcdV(F9G=49(F3Ezt_C(FXBoi*{&_1av@0bV6rzL05Fc2lx;lp*wmY5k2uS
zdLaqD(Fc9;36k+CK0`mGpg)`#fPol<!T20QFciZu93wCiqc9p{Fc#yGiZpzI@kqx6
zOvEHi#uQA&G)%_~%)~5YU^eDpE;2C>^I>8E7Ge<=V+odG8J1%OR$>)aV-40~9oAz5
zHewStV+*!o8@6KyzQkA9i7f2GZhVbz@GZW>_sGT`?8QFp#{nF~AsogL9K|vGfFJP_
zj^hMQ;uKEf41UI0oWn2p6~Ezk{DD7l9v5&Cmv9+Za23~Z9XD_jx9}Hokc->6gS)tg
z`*?tdc!bCJ8~@-5p5hsvBM&d|60h(YZ}2bvo0gVqnFYl~aa9b(s<<iciihH<cq!hB
zk5WJ>s1#BPD@7DvrKsYk_$vWQpi)dJuGo|kN{|w)geWByyHZLit&~whm9k1XB}^%=
zR8T4^;YuYXLWxu=D^-*zrK(a*sjk#eYAVr6Ev2?nM~PADDzQpErM?oUIFtrTL#2_@
bSZSg(RhlWyl@>}%rIpg!vX9Tia<s$$@I6=|

delta 1486
zcmYk+S6mGM0EO}2&Fw}RX-E<oDdUzRqR^1N_ZC@EWN$)*?9sLN-g`z_*?aFT*?X_=
zym|P4FX#P?`<-HY{6~sye1ajtDj~}bqfdq<a<jpdd}OE55|UzLvIJ)suN&G}mWEq-
zTH;-;OwML=Y_CrJV>)}pc8D@Z$M{FZ#d-X<C#Gc@VGR>(kQLcr3p->-4&+2G*dsR_
z;0Px;BM)4V7p}+$H{^#q3ZNi7PzZ%l1V!PAV(@}DilYQdq7=;VfiFtK5B?~FvIsyq
zlt&;cpdx}0j7q4CDhNR+!Vr$Ch(I+|M-9|OE!0LG)I~kiM*}oOBQ!=6G(|HsM+>w>
zE3`%%v_(6#M<hC+Bcjj=ozVqd(GAh)jvk0XEPA3B;?Ns?&=>vC9|JHDgD@CFFciZu
z93wCi@fd~C7=r|i#W*BlJSJcwk}wIAF$GgG4bw3LGcgOZkqiswU@qoiJ{Djh7GW`#
zU@4YiIaXjLR$(>PU@g{RJvLw?HeoZiU@Nv^J9c0vc40U6U@!JzKT>c22a$?29KvB7
z!BHGTI*#K6PT~|!;|$K?9M0ncF5(g{;|i|g8m{98ZsHbh;|}iP9`54-9^w%m;|ZSP
z88Yx3nRtPhc!k$^gSU8x_xOO1_=L~+g0J|7@A!eA_=Vs2gTF~>nTDxQtduN@QL$D`
zij9(0$)?yUc1m_7hmuptrPwRE6$iypaZ;R>Jc^5wS8-MHDQ-%B#a$_&6jVHvLP}w!
zh*DJXREjBHinmf+DWQ~9N-1W=NAXokD}IW<QbsAO1SsW{@=BmmL8+(&DZxr5rLs~*
k2~k3oFeO~6szfN&l<G<irKVC#sjbve>Kalx6GM8Fe;9y)y8r+H

diff --git a/dist/index.js.map b/dist/index.js.map
index cd41e3a61166161d6c47f4b08182aefbd781058a..e0a7cba7a3afc7a53cb961a64c7938b3594eef47 100644
GIT binary patch
delta 1260
zcmZw9cUa5;9LMqJC`Ta<*AU(5XI4h`NV0b+l9fAMbm_WNvgHVw4dG{mjL6PBJK4KV
z6cHIkX4#K_ct0M`Lmq#;{`!7D?;l0Q(u9&?X}T&p(Z@Zh)Xqv0Dwbtg$BTvjwi;7m
zh=WWLV=%@Vj1p8pMOeTRl^{iBRDl(&Q5Drt9X6<envkIuYNHP1u!SA$;efhuL_O4p
z6BJOQ0h~<+qoDQ_Q{t5tVqS(&BvFZRse--en=3ep$!5V(q7^;!1v}Bl>|`MtzbmCO
zg^Pzm<>sc-Yofw}6<U3yLR9A|9YjT-LM~>fDJ{i9vtU!v+b=-$$`|B+miFbBI(3kn
zHq1T9VEA9aQmPKuMCi4ee<Jeok>5{$7Yqf?GHbm~$LZH^tZSx#hG>MwXo99_1{b)(
z4b9O4Ezt_@XpJ^#i*{&_4(NzZ=!`D#Kv#I88@$jRJ<t=q&>MZw7yZy5127PSFc{wO
z!4UYu4?{5w{uqt`jKD~Y!f1>^AjU!kHO3(b8U$lJCLjb_gkmDXphGzHFkliQ5Q)i%
z!W2x!G)%_~%)~6rMl|NYh`E@D7|h24EJQ38VKJ6qDVAY5;t-DnBw_`UuoA1V8Y0$U
zE!JT@lCc3Bu?Z>Ij4jxTZAis->_8fJVi$H}5B6do_9Gn!a1e)Z7)NjvCLF_YoWMz(
z!fBjA2F@ZA=Wreua1obq8CP%>*Ki#-a1*zXg>0B{8#%axyU0Zz?%_W2@c<7|fJb<Y
tLOj7!Ji~Jop%^dl5+!(r*LZ`sc!&2WMHxQeBR=6XzTm6LHS=3e*-zqFNJ{_!

delta 1165
zcmYkzcUTN?0LJmB(5cf^T*)YhBg&DKQTCq6UZGToYlt#SSBMUk!_SsIGAiS&bjsc&
z5+$RftV`B^eD#+<KF{;M&-1>i6-LRQa-$?OAWmm;v=S*s>q=qkWG~gbhg;g2=}b{l
z;hSJzEex@8sV-iw7K&arQlZF@$7lKZm<dCSwN&R_Qkdqas`;C|WG*$qCSUHBUEyN!
zuOw=;NgAyg%ux%qQ3n=~pe`(71u5#m8Zy|x7IvtQ29U!Z4rmBRG(uxEK~p%v8O@+T
zbF@H9y+*4{@Dyda3W-R!Rayv{L0M|<?=Px~T%Cn`ak9)or3#A(j#h^#!UBU-p=yty
z$VkQigQT21C0e01T+jw>;R-jjg9`1@0q*Ds4|IYjywDk4&=uX_4Igwz5A;MY^hO`_
zML+b%01U(+48{-)#V`!V2>4<o{4ffmF$QBX4&yNa6EO*sF$MmZifNdR00d$Nf)I=l
z%)~6rMkwZBF4PD^I3f^<d5FS%EI>43un>!|7)!7e%Mgn=EJr*vNI)W1U?o-|39GRN
z$<Sgg)?qzTkcu>HfDRk637a9X1zWKV+pz;Xu?xGAjy>3meb|o!IEX_yj3YRT3>?F8
zoWMzBA`96#h0{2Lv(V!l&f@|u;u3Oj8M!dv3i6PTtGI^ixPhCvh1<A;ySRt@cz}m^
zgvThr6BObpo}mcOQH&ROi4v6J70U1$Z}1lHP!1#B;{z&CiI4b%&-j9`Frf<HP>t{S
OfuH!L&&m5;Q1urfbf)wG

diff --git a/src/model/platform-setup/setup-mac.ts b/src/model/platform-setup/setup-mac.ts
index 10f7cfd3..2cac03f6 100644
--- a/src/model/platform-setup/setup-mac.ts
+++ b/src/model/platform-setup/setup-mac.ts
@@ -32,11 +32,23 @@ class SetupMac {
 
   private static async installUnity(buildParameters: BuildParameters, silent = false) {
     const unityChangeset = await getUnityChangeset(buildParameters.editorVersion);
-    const command = `${this.unityHubPath} -- --headless install \
+    let command = `${this.unityHubPath} -- --headless install \
                                           --version ${buildParameters.editorVersion} \
-                                          --changeset ${unityChangeset.changeset} \
-                                          --module mac-il2cpp \
-                                          --childModules`;
+                                          --changeset ${unityChangeset.changeset} `;
+
+    switch (buildParameters.targetPlatform) {
+      case 'iOS':
+        command += `--module ios `;
+        break;
+      case 'StandaloneOSX':
+        command += `--module mac-il2cpp `;
+        break;
+      case 'android':
+        command += `--module android `;
+        break;
+    }
+
+    command += `--childModules`;
 
     // Ignoring return code because the log seems to overflow the internal buffer which triggers
     // a false error