Skip to content

Commit

Permalink
6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@icedterminal
icedterminal committed Dec 20, 2023
1 parent 00d5dda commit 694e21e
Show file tree
Hide file tree
Showing 17 changed files with 211 additions and 200 deletions.
6 changes: 3 additions & 3 deletions BUILDING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
To build this installer yourself you need the following:

- [Visual Studio 2022 Community](https://visualstudio.microsoft.com/vs/)
- [Heatwave for VS 2022 Extension](https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17)
- [Wix v4.0 and later](https://github.com/wixtoolset/wix/releases)
- [IsWix v5 and later](https://github.com/iswix-llc/iswix/releases)
- [Wix v3.11 and later](https://wixtoolset.org/releases/)
- [Wix VS 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension)
- [IsWix v4.15.34.0 and later](https://github.com/iswix-llc/iswix/releases)
23 changes: 13 additions & 10 deletions ffmpeg_essentials/FFmpeg Essentials/Code/Features.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment><Feature Id="FFmpeg_Essentials" Title="Core Files (6.0.0)" Description="Installs all the files needed for FFmpeg Essentials. This is required." Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION" AllowAbsent="no">
<MergeRef Id="FFmpeg_EssentialsMM" />
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder">
<Directory Id="INSTALLLOCATION" Name="FFmpeg">
<Merge Id="FFmpeg_EssentialsMM" SourceFile="..\FFmpeg EssentialsMM\bin\Release\FFmpeg_EssentialsMM.msm" DiskId="1" Language="1033"/>
</Directory>
</Directory>
</Directory>
<Feature Id="FFmpeg_Essentials" Title="Core Files (6.0.0)" Description="Installs all the files needed for FFmpeg Essentials. This is required." Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION" Absent="disallow">
<MergeRef Id="FFmpeg_EssentialsMM"/>
</Feature>
<Feature Id="FFmpeg_path" Title="PATH" Description="Add FFmpeg install location to SYSTEM PATH for easy Terminal use." Level="1" AllowAdvertise="no">
<Component Id="add_to_path" Guid="cda0842e-f774-4aaa-8ab0-7d5147609a15" Directory="TARGETDIR">
<Environment Id="PATH" Name="PATH" Value="[INSTALLLOCATION]bin" Permanent="no" Part="last" Action="set" System="yes" />
</Component>
</Feature>

<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="INSTALLLOCATION" Name="FFmpeg">
<Merge Id="FFmpeg_EssentialsMM" SourceFile="..\FFmpeg EssentialsMM\bin\Release\FFmpeg_EssentialsMM.msm" DiskId="1" Language="1033" />
</Directory>
</StandardDirectory>
</Fragment>
</Fragment>
</Wix>
11 changes: 6 additions & 5 deletions ffmpeg_essentials/FFmpeg Essentials/Code/IISMeta.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis">
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension">
<Fragment>

<ComponentGroup Id="webSite">
Expand All @@ -10,14 +11,14 @@
<Property Id="ASPNETINSTALLED">
<RegistrySearch Id="findASPNETINSTALLED" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Type="raw" />
</Property>
<Launch Condition="Installed OR NETFRAMEWORK45" Message="[ProductName] requires Microsoft .NET Framework 4.5." />
<Launch Condition="Installed OR IISMAJORVERSION" Message="[ProductName] requires Microsoft IIS" />
<Launch Condition="Installed OR ASPNETINSTALLED=&quot;#1&quot;" Message="[ProductName] requires the ASP.NET role service for IIS" />
<Condition Message="[ProductName] requires Microsoft .NET Framework 4.5.">Installed OR NETFRAMEWORK45</Condition>
<Condition Message="[ProductName] requires Microsoft IIS">Installed OR IISMAJORVERSION</Condition>
<Condition Message="[ProductName] requires the ASP.NET role service for IIS">Installed OR ASPNETINSTALLED="#1"</Condition>

<DirectoryRef Id="INSTALLLOCATION">
<Directory Id="webSite" Name="WebSite">
<Component Id="webSite" Guid="904eeda9-da9c-49df-9630-ac32998ae79f" KeyPath="yes">
<iis:WebAppPool Id="webSite" Name="FFmpeg_Essentials" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated" />
<iis:WebAppPool Id="webSite" Name="FFmpeg_Essentials" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated"/>
<iis:WebSite Id="webSite" SiteId="*" Description="FFmpeg_Essentials Web Site" Directory="webSite" ConfigureIfExists="no">
<iis:WebAddress Id="webSite" Port="8080" />
<iis:WebDirProperties Id="webSite" AnonymousAccess="yes" WindowsAuthentication="no" />
Expand Down
11 changes: 6 additions & 5 deletions ffmpeg_essentials/FFmpeg Essentials/Code/Product.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!--
MSIProductVersion is defined in FFmpeg_Essentials.wixproj as 0.0.1 for local desktop builds.
You should pass in the MSBuild Property 'MSIProductVersion' to override it during an automated build.
Expand All @@ -7,21 +8,21 @@
The Product@Id attribute (ProductCode Property) will be a random GUID for each build. This is to support "Major Upgrades" where each install
is a seamless uninstall/reinstall.
-->
<Package Name="FFmpeg Essentials" Language="1033" Version="6.0.0.20230306" Manufacturer="icedterminal" UpgradeCode="384a74ec-865a-4907-8561-9de765ee6e14" InstallerVersion="301">
<SummaryInformation Manufacturer="icedterminal" />
<Product Id="*" Name="FFmpeg Essentials" Language="1033" Version="6.1.0.20231219" Manufacturer="icedterminal" UpgradeCode="384a74ec-865a-4907-8561-9de765ee6e14">
<Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Manufacturer="icedterminal" Platform="x64" InstallPrivileges="elevated" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<!-- Major Upgrade Rule to disallow downgrades -->
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<!--Common Launch Condition-->
<!-- Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
<PropertyRef Id="NETFRAMEWORK40FULL" />
<Launch Condition="Installed OR NETFRAMEWORK40FULL" Message="[ProductName] requires .NET Framework 4.0." />
<Condition Message="[ProductName] requires .NET Framework 4.0.">Installed OR NETFRAMEWORK40FULL</Condition>
<!-- Include User Interface Experience -->
<Icon Id="Icon.ico" SourceFile="Resources\Icon.ico" />
<Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property>
<Property Id="ARPNOMODIFY" Value="yes"></Property>
<UIRef Id="UI" />
<!-- Include Features and Directories Fragment -->
<DirectoryRef Id="INSTALLLOCATION" />
</Package>
</Product>
</Wix>
43 changes: 23 additions & 20 deletions ffmpeg_essentials/FFmpeg Essentials/Code/UI-CustomDialog.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<UI Id="CustomDlg">
<Dialog Id="CustomDlg" Height="270" Width="370" Title="[ProductName] Setup">

<!-- Header -->
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Text="{\WixUI_Font_Title}Custom Dialog" Transparent="yes" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Text="Place your custom description here" Transparent="yes" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner"/>
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Text="{\WixUI_Font_Title}Custom Dialog" Transparent="yes"/>
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Text="Place your custom description here" Transparent="yes"/>
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0"/>

<!-- Body -->
<Control Id="CustomLabel" Type="Text" X="20" Y="60" Width="290" Height="15" Text="Customer:" TabSkip="yes" />
<Control Id="Custom" Type="Edit" X="20" Y="80" Width="320" Height="18" Property="CUSTOM" />
<Control Id="CustomLabel" Type="Text" X="20" Y="60" Width="290" Height="15" Text="Customer:" TabSkip="yes"/>
<Control Id="Custom" Type="Edit" X="20" Y="80" Width="320" Height="18" Property="CUSTOM"/>


<!-- Footer -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/>
<Control Id="Next" Type="PushButton" Text="&amp;Next" TabSkip="no" Default="yes" Height="17" Width="56" X="236" Y="243">
<Publish Event="NewDialog" Value="CustomizeDlg" />
<Publish Event="NewDialog" Value="CustomizeDlg"/>
</Control>
<Control Id="Cancel" Type="PushButton" Text="Cancel" TabSkip="no" Height="17" Width="56" X="304" Y="243" Cancel="yes">
<Publish Event="SpawnDialog" Value="CancelDlg" />
<Control Id="Cancel" Type="PushButton" Text="Cancel" TabSkip="no" Height="17" Width="56" X="304" Y="243" Cancel="yes">
<Publish Event="SpawnDialog" Value="CancelDlg"/>
</Control>
<Control Id="Back" Type="PushButton" Text="&amp;Back" TabSkip="no" Height="17" Width="56" X="180" Y="243">
<Publish Event="NewDialog" Value="LicenseAgreementDlg" />
<Control Id="Back" Type="PushButton" Text="&amp;Back" TabSkip="no" Height="17" Width="56" X="180" Y="243">
<Publish Event="NewDialog" Value="LicenseAgreementDlg"/>
</Control>

</Dialog>

<!-- Insert into dialog sequencing by inserting control events on previous and next dialogs-->
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomDlg" />
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="CustomDlg" Order="3" Condition="NOT Installed" />
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomDlg">1</Publish>
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="CustomDlg" Order="3">NOT Installed</Publish>

</UI>

<!-- Make Property a SecureCustom Property-->
<Property Id="CUSTOM" Secure="yes" />
<Property Id="CUSTOM" Secure="yes"/>

<!-- Note: You must author a registry component somewhere in your installer to persist the property for later retrieval
Example:
Expand All @@ -47,15 +48,17 @@
-->

<!-- Attempt to retrieve previously persisted property -->
<Property Id="FINDCUSTOM" Secure="yes">
<RegistrySearch Id="CustomerNumber" Root="HKLM" Key="SOFTWARE\CompanyName\ProductName" Name="Custom" Type="raw" />
<Property Id='FINDCUSTOM' Secure='yes'>
<RegistrySearch Id='CustomerNumber' Root='HKLM'
Key='SOFTWARE\CompanyName\ProductName'
Name='Custom' Type='raw' />
</Property>

<!-- Assign default value if retrieval failed -->
<SetProperty Id="FINDCUSTOM" Value="default value" After="AppSearch" Sequence="first" Condition="Not FINDCUSTOM" />
<SetProperty Id='FINDCUSTOM' Value='default value' After='AppSearch' Sequence='first'>Not FINDCUSTOM</SetProperty>

<!-- Assign retrieved / defaulted value to actual property if it doesn't already have a value -->
<SetProperty Id="CUSTOM" Value="[FINDCUSTOM]" After="SetFINDCUSTOM" Sequence="first" Condition="Not CUSTOM" />
<SetProperty Id='CUSTOM' Value='[FINDCUSTOM]' After='SetFINDCUSTOM' Sequence='first'>Not CUSTOM</SetProperty>

</Fragment>
</Wix>
5 changes: 3 additions & 2 deletions ffmpeg_essentials/FFmpeg Essentials/Code/UI.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<UI Id="UI">

<!-- See http://wix.sourceforge.net/manual-wix3/WixUI_index.htm for more information-->
<ui:WixUI Id="WixUI_FeatureTree" />
<UIRef Id="WixUI_FeatureTree"/>

<!--Uncomment to inject a custom dialog into the install wizard loop -->
<!--<UIRef Id="CustomDlg"/>-->
Expand Down
Loading

0 comments on commit 694e21e

Please sign in to comment.