Skip to content

Commit f31d4e9

Browse files
timothyschoentimothyschoen
committed
Windows AAX installer fixes
1 parent 1601c52 commit f31d4e9

1 file changed

Lines changed: 34 additions & 15 deletions

File tree

‎.github/scripts/package-Windows.sh‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ cat > ./plugdata.wxs <<-EOL
5353
<CopyFile Id="BINARYDATA_TO_LV2" FileId="BINARYDATA_BIN" DestinationDirectory="LV2_PLUGIN_DIR" DestinationName="plugdata-resources.bin"/>
5454
<CopyFile Id="BINARYDATA_TO_LV2_FX" FileId="BINARYDATA_BIN" DestinationDirectory="LV2_FX_PLUGIN_DIR" DestinationName="plugdata-resources.bin"/>
5555
<CopyFile Id="BINARYDATA_TO_CLAP" FileId="BINARYDATA_BIN" DestinationDirectory="CLAP_INSTALL_DIR" DestinationName="plugdata-resources.bin"/>
56-
<CopyFile Id="BINARYDATA_TO_AAX" FileId="BINARYDATA_BIN" DestinationDirectory="AAX_INSTALL_DIR" DestinationName="plugdata-resources.bin"/>
56+
<?if \$(var.Win64) = "yes" ?>
57+
<CopyFile Id="BINARYDATA_TO_AAX" FileId="BINARYDATA_BIN" DestinationDirectory="AAX_PLUGIN_DIR" DestinationName="plugdata-resources.bin"/>
58+
<CopyFile Id="BINARYDATA_TO_AAX_FX" FileId="BINARYDATA_BIN" DestinationDirectory="AAX_FX_PLUGIN_DIR" DestinationName="plugdata-resources.bin"/>
59+
<?endif ?>
5760
</Component>
5861
</Directory>
5962
</Directory>
@@ -146,20 +149,34 @@ cat > ./plugdata.wxs <<-EOL
146149
<File Id="CLAP_FX_PLUGIN" Source="Plugins\CLAP\plugdata-fx.clap"/>
147150
</Component>
148151
</Directory>
152+
<?if \$(var.Win64) = "yes" ?>
149153
<Directory Id="AVID_DIR" Name="Avid">
150-
<Directory Id="AVID_AUDIO_DIR" Name="Audio">
151-
<Directory Id="AVID_AUDIO_PLUGINS_DIR" Name="Plug-Ins">
152-
<Component Id="AAX_FILES" Guid="8673b528-83c1-4697-a8cb-773e30e47f50" Win64="\$(var.Win64)">
153-
<RemoveFile Id="AAX_PLUGIN" Name="plugdata.aaxplugin" On="both"/>
154-
<File Id="AAX_PLUGIN" Source="Plugins\AAX\plugdata.aaxplugin"/>
155-
</Component>
156-
<Component Id="AAX_FX_FILES" Guid="1e0ef2de-2e50-4490-a5fc-0c12bb8f29b9" Win64="\$(var.Win64)">
157-
<RemoveFile Id="AAX_FX_PLUGIN" Name="plugdata-fx.aaxplugin" On="both"/>
158-
<File Id="AAX_FX_PLUGIN" Source="Plugins\AAX\plugdata-fx.aaxplugin"/>
159-
</Component>
160-
</Directory>
161-
</Directory>
162-
</Directory>
154+
<Directory Id="AVID_AUDIO_DIR" Name="Audio">
155+
<Directory Id="AAX_INSTALL_DIR" Name="Plug-Ins">
156+
<Directory Id="AAX_PLUGIN_DIR" Name="plugdata.aaxplugin">
157+
<Directory Id="AAX_CONTENTS" Name="Contents">
158+
<Directory Id="AAX_ARCH" Name="x64">
159+
<Component Id="AAX_FILES" Guid="3b8d4f21-7c92-4e15-9a8b-1d2e5f6a7b8c" Win64="\$(var.Win64)">
160+
<RemoveFile Id="AAX_PLUGIN_REMOVE" Name="plugdata.aaxplugin" On="both"/>
161+
<File Id="AAX_PLUGIN" Source="Plugins\AAX\plugdata.aaxplugin\Contents\x64\plugdata.aaxplugin"/>
162+
</Component>
163+
</Directory>
164+
</Directory>
165+
</Directory>
166+
<Directory Id="AAX_FX_PLUGIN_DIR" Name="plugdata-fx.aaxplugin">
167+
<Directory Id="AAX_FX_CONTENTS" Name="Contents">
168+
<Directory Id="AAX_FX_ARCH" Name="x64">
169+
<Component Id="AAX_FX_FILES" Guid="6e9a2b13-4d57-4f88-b3c1-8a9d0e1f2c3d" Win64="\$(var.Win64)">
170+
<RemoveFile Id="AAX_FX_PLUGIN_REMOVE" Name="plugdata-fx.aaxplugin" On="both"/>
171+
<File Id="AAX_FX_PLUGIN" Source="Plugins\AAX\plugdata-fx.aaxplugin\Contents\x64\plugdata-fx.aaxplugin"/>
172+
</Component>
173+
</Directory>
174+
</Directory>
175+
</Directory>
176+
</Directory>
177+
</Directory>
178+
</Directory>
179+
<?endif ?>
163180
</Directory>
164181
</Directory>
165182
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
@@ -185,10 +202,12 @@ cat > ./plugdata.wxs <<-EOL
185202
<ComponentRef Id="CLAP_FILES"/>
186203
<ComponentRef Id="CLAP_FX_FILES"/>
187204
</Feature>
188-
<Feature Id="AAX" Level="1" Title="AAX Plugin">
205+
<?if \$(var.Win64) = "yes" ?>
206+
<Feature Id="AAX" Level="2" Title="AAX Plugin">
189207
<ComponentRef Id="AAX_FILES"/>
190208
<ComponentRef Id="AAX_FX_FILES"/>
191209
</Feature>
210+
<?endif ?>
192211
<!-- define powershell script as base64 that will remove registry entries for old plugdata versions -->
193212
<Property Id="reg_clean">powershell.exe -ExecutionPolicy Bypass -NoProfile -WindowStyle Hidden -e JABkAGkAcwBwAGwAYQB5AE4AYQBtAGUAIAA9ACAAIgBwAGwAdQBnAGQAYQB0AGEAIgAKACQAcAB1AGIAbABpAHMAaABlAHIAIAA9ACAAIgBUAGkAbQBvAHQAaAB5ACAAUwBjAGgAbwBlAG4AIgAKACQAcgBlAGcAaQBzAHQAcgB5AFAAYQB0AGgAIAA9ACAAIgBIAEsATABNADoAXABTAE8ARgBUAFcAQQBSAEUAXABNAGkAYwByAG8AcwBvAGYAdABcAFcAaQBuAGQAbwB3AHMAXABDAHUAcgByAGUAbgB0AFYAZQByAHMAaQBvAG4AXABVAG4AaQBuAHMAdABhAGwAbAAiAAoAJABzAHUAYgBLAGUAeQBzACAAPQAgAEcAZQB0AC0AQwBoAGkAbABkAEkAdABlAG0AIAAtAFAAYQB0AGgAIAAkAHIAZQBnAGkAcwB0AHIAeQBQAGEAdABoAAoACgBmAG8AcgBlAGEAYwBoACAAKAAkAHMAdQBiAEsAZQB5ACAAaQBuACAAJABzAHUAYgBLAGUAeQBzACkAIAB7AAoAIAAgACAAIAAkAGMAdQByAHIAZQBuAHQASwBlAHkAIAA9ACAARwBlAHQALQBJAHQAZQBtAFAAcgBvAHAAZQByAHQAeQAgAC0AUABhAHQAaAAgACQAcwB1AGIASwBlAHkALgBQAFMAUABhAHQAaAAKACAAIAAgACAAaQBmACAAKAAkAGMAdQByAHIAZQBuAHQASwBlAHkALgBEAGkAcwBwAGwAYQB5AE4AYQBtAGUAIAAtAGUAcQAgACQAZABpAHMAcABsAGEAeQBOAGEAbQBlACAALQBhAG4AZAAgACQAYwB1AHIAcgBlAG4AdABLAGUAeQAuAFAAdQBiAGwAaQBzAGgAZQByACAALQBlAHEAIAAkAHAAdQBiAGwAaQBzAGgAZQByACkAIAB7AAoAIAAgACAAIAAgACAAIAAgAFIAZQBtAG8AdgBlAC0ASQB0AGUAbQAgAC0AUABhAHQAaAAgACQAcwB1AGIASwBlAHkALgBQAFMAUABhAHQAaAAgAC0AUgBlAGMAdQByAHMAZQAgAC0ARgBvAHIAYwBlAAoAIAAgACAAIAAgACAAIAAgAFcAcgBpAHQAZQAtAEgAbwBzAHQAIAAiAFIAZQBnAGkAcwB0AHIAeQAgAGUAbgB0AHIAeQAgAHIAZQBtAG8AdgBlAGQAOgAgACQAKAAkAHMAdQBiAEsAZQB5AC4AUABTAFAAYQB0AGgAKQAiAAoAIAAgACAAIAB9AAoAfQA=
194213
</Property>

0 commit comments

Comments
 (0)