Skip to content

Commit c941790

Browse files
committed
Rev to 1.1.0 and adding ps1 for PackML Auto Install
1 parent 1d7c5e6 commit c941790

File tree

8 files changed

+568
-9
lines changed

8 files changed

+568
-9
lines changed

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ TrialLicense.tclrs
2828
## Folder contains TwinCAT scope data. Should not be source controlled.
2929
ScopeData
3030

31-
.tmcRefac
32-
33-
*.library
34-
3531
## Ignore TwinCAT HMI temporary files, build results, and
3632
## files generated by popular TwinCAT HMI add-ons.
3733

Installer Projects/AdvancedInstaller/TcEventVideoPlayback.aip

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<DOCUMENT Type="Advanced Installer" CreateVersion="21.9" version="21.9" Modules="professional" RootPath="." Language="en" Id="{5127F310-AB29-4818-A80B-2D0998236E3F}">
2+
<DOCUMENT Type="Advanced Installer" CreateVersion="21.9" version="22.0" Modules="professional" RootPath="." Language="en" Id="{5127F310-AB29-4818-A80B-2D0998236E3F}">
33
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
44
<ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0" MultiBuildValue="DefaultBuild:3"/>
55
<ROW Property="AI_EXTERNALUIUNINSTALLERNAME" MultiBuildValue="DefaultBuild:aiui"/>
@@ -111,10 +111,10 @@
111111
<ROW Property="CTRLS" Value="1"/>
112112
<ROW Property="DialogBitmap" Value="dialog.jpg" MultiBuildValue="DefaultBuild:dialog.scale200RedBigCam.bmp" Type="1" MsiKey="DialogBitmap"/>
113113
<ROW Property="Manufacturer" Value="Beckhoff Automation LLC"/>
114-
<ROW Property="ProductCode" Value="1033:{A702AC40-0273-415C-9F1D-1C1119AC0571} " Type="16"/>
114+
<ROW Property="ProductCode" Value="1033:{9526281A-3D6E-40F7-83E9-F61AA1168D1A} " Type="16"/>
115115
<ROW Property="ProductLanguage" Value="1033"/>
116116
<ROW Property="ProductName" Value="TcEventVideoPlayback"/>
117-
<ROW Property="ProductVersion" Value="1.0.0" Options="32"/>
117+
<ROW Property="ProductVersion" Value="1.1.0" Options="32"/>
118118
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
119119
<ROW Property="UpgradeCode" Value="{3C39B478-DF17-4E94-9972-5542BA9C5639}"/>
120120
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -148,7 +148,7 @@
148148
</COMPONENT>
149149
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
150150
<ROW Component="A0BFC224E0E9125ADE0B2DBF343" ComponentId="{3EE52C4D-A611-4D03-B8AE-17EA43C0851C}" Directory_="APPDIR" Attributes="260" KeyPath="A0BFC224E0E9125ADE0B2DBF343" Options="2"/>
151-
<ROW Component="AI_CustomARPName" ComponentId="{7CF11FA9-BBBD-4307-9235-5E54E85C509C}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
151+
<ROW Component="AI_CustomARPName" ComponentId="{A5ABC6F0-9778-4583-84A6-0D1E58A22C12}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
152152
<ROW Component="AI_ExePath" ComponentId="{D53110D3-0677-4D5F-B3B9-8E1A7220620B}" Directory_="APPDIR" Attributes="260" KeyPath="AI_ExePath"/>
153153
<ROW Component="APPDIR" ComponentId="{F4380A9C-D16C-407E-9696-354E3D85F9FF}" Directory_="APPDIR" Attributes="0"/>
154154
<ROW Component="AddToExistingProject.pdf" ComponentId="{1C5BFEAF-5BC1-4DCB-BE95-2F1759D48390}" Directory_="Documentation_Dir" Attributes="0" KeyPath="AddToExistingProject.pdf" Type="0"/>
@@ -254,6 +254,7 @@
254254
<ROW Action="AddHMI4024" Description="Installing HMI Control"/>
255255
<ROW Action="AddHMI4026" Description="Installing HMI Control"/>
256256
<ROW Action="InstallPLCLibs" Description="Installing PLC Library"/>
257+
<ROW Action="InstallPackML" Description="Attempting TcPkg Install of PackML V2 Library"/>
257258
<ROW Action="UninstallHMI" Description="Uninstalling HMI Control"/>
258259
<ROW Action="UninstallPLCLibs" Description="Uninstalling PLC Libraries"/>
259260
<ROW Action="UninstallSamples" Description="Uninstalling Sample Projects"/>
@@ -270,6 +271,7 @@
270271
<COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
271272
<ROW Name="ExternalUICleaner.dll" SourcePath="&lt;AI_CUSTACTS&gt;ExternalUICleaner.dll"/>
272273
<ROW Name="PSInstallPLCLibs.ps1" SourcePath="..\Includes\Powershell\PSInstallPLCLibs.ps1"/>
274+
<ROW Name="PSInstallPackML.ps1" SourcePath="..\Includes\Powershell\PSInstallPackML.ps1"/>
273275
<ROW Name="PSUninstallHMIControl.ps1" SourcePath="..\Includes\Powershell\PSUninstallHMIControl.ps1"/>
274276
<ROW Name="PSUninstallSamples.ps1" SourcePath="..\Includes\Powershell\PSUninstallSamples.ps1"/>
275277
<ROW Name="PSUnistallPLCLibs.ps1" SourcePath="..\Includes\Powershell\PSUnistallPLCLibs.ps1"/>
@@ -336,6 +338,7 @@
336338
<ROW Action="AI_DATA_SETTER_5" Type="51" Source="UninstallPLCLibs" Target="AEYAbABhAGcAcwACADEAAQBQAGEAcgBhAG0AcwACAAEAUwBjAHIAaQBwAHQAUwByAGMAQgBpAG4AYQByAHkAUgBvAHcASQBkAAIAUABTAFUAbgBpAHMAdABhAGwAbABQAEwAQwBMAGkAYgBzAC4AcABzADE="/>
337339
<ROW Action="AI_DATA_SETTER_6" Type="51" Source="UninstallHMI" Target="AEYAbABhAGcAcwACADEAAQBQAGEAcgBhAG0AcwACAAEAUwBjAHIAaQBwAHQAUwByAGMAQgBpAG4AYQByAHkAUgBvAHcASQBkAAIAUABTAFUAbgBpAG4AcwB0AGEAbABsAEgATQBJAEMAbwBuAHQAcgBvAGwALgBwAHMAMQ=="/>
338340
<ROW Action="AI_DATA_SETTER_7" Type="51" Source="CustomActionData" Target="[AI_SETUPEXEPATH]"/>
341+
<ROW Action="AI_DATA_SETTER_8" Type="51" Source="InstallPackML" Target="AEYAbABhAGcAcwACADEAAQBQAGEAcgBhAG0AcwACAAEAUwBjAHIAaQBwAHQAUwByAGMAQgBpAG4AYQByAHkAUgBvAHcASQBkAAIAUABTAEkAbgBzAHQAYQBsAGwAUABhAGMAawBNAEwALgBwAHMAMQ=="/>
339342
<ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
340343
<ROW Action="AI_DeleteCadLzma" Type="51" Source="AI_DeleteLzma" Target="[AI_SETUPEXEPATH]"/>
341344
<ROW Action="AI_DeleteLzma" Type="1025" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
@@ -372,6 +375,7 @@
372375
<ROW Action="AddHMI4026" Type="1089" Source="aicustact.dll" Target="CopyFileFolder" Options="1" AdditionalSeq="AI_DATA_SETTER_2"/>
373376
<ROW Action="AddSamples" Type="1089" Source="aicustact.dll" Target="CopyFileFolder" Options="1" AdditionalSeq="AI_DATA_SETTER"/>
374377
<ROW Action="InstallPLCLibs" Type="1089" Source="PowerShellScriptLauncher.dll" Target="RunPowerShellFileScript" Options="134217728" AdditionalSeq="AI_DATA_SETTER_3"/>
378+
<ROW Action="InstallPackML" Type="1089" Source="PowerShellScriptLauncher.dll" Target="RunPowerShellFileScript" Options="134217728" AdditionalSeq="AI_DATA_SETTER_8"/>
375379
<ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFiles64Folder][Manufacturer]\[ProductName]"/>
376380
<ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
377381
<ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
@@ -447,6 +451,8 @@
447451
<ROW Action="AI_DeleteLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="6599" Builds="DefaultBuild"/>
448452
<ROW Action="AI_ExtractFiles" Sequence="1399" Builds="DefaultBuild"/>
449453
<ROW Action="AI_DATA_SETTER_7" Sequence="1398"/>
454+
<ROW Action="InstallPackML" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( (&amp;TwinCAT_PLC_Lib = 3) )" Sequence="5938"/>
455+
<ROW Action="AI_DATA_SETTER_8" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) ) AND ( (&amp;TwinCAT_PLC_Lib = 3) )" Sequence="5937"/>
450456
</COMPONENT>
451457
<COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
452458
<ROW Action="AI_PRESERVE_INSTALL_TYPE" Sequence="199"/>

0 commit comments

Comments
 (0)