Skip to content

Commit 14ab144

Browse files
michaelrsweetmichaelrsweet
committed
Update Windows packaging.
1 parent 9e5a73b commit 14ab144

5 files changed

+43
-11
lines changed

‎vcnet/ippeveprinter.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</Midl>
6060
<ClCompile>
6161
<Optimization>Disabled</Optimization>
62-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
62+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6363
<PreprocessorDefinitions>CUPS_LITE;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6464
<MinimalRebuild>true</MinimalRebuild>
6565
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -82,7 +82,7 @@
8282
<TargetEnvironment>X64</TargetEnvironment>
8383
</Midl>
8484
<ClCompile>
85-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
85+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8686
<PreprocessorDefinitions>CUPS_LITE;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8787
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8888
<PrecompiledHeader />

‎vcnet/ippevesubmit.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Midl>
5858
<ClCompile>
5959
<Optimization>Disabled</Optimization>
60-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
60+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6161
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6262
<MinimalRebuild>true</MinimalRebuild>
6363
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
7979
<TargetEnvironment>X64</TargetEnvironment>
8080
</Midl>
8181
<ClCompile>
82-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8383
<PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8585
<PrecompiledHeader />

‎vcnet/ippfind.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Midl>
5858
<ClCompile>
5959
<Optimization>Disabled</Optimization>
60-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
60+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6161
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6262
<MinimalRebuild>true</MinimalRebuild>
6363
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -80,7 +80,7 @@
8080
<TargetEnvironment>X64</TargetEnvironment>
8181
</Midl>
8282
<ClCompile>
83-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
83+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8484
<PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8585
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8686
<PrecompiledHeader />

‎vcnet/ipptool.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Midl>
5858
<ClCompile>
5959
<Optimization>Disabled</Optimization>
60-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
60+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6161
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6262
<MinimalRebuild>true</MinimalRebuild>
6363
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -81,7 +81,7 @@
8181
<TargetEnvironment>X64</TargetEnvironment>
8282
</Midl>
8383
<ClCompile>
84-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
84+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8585
<PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8686
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8787
<PrecompiledHeader />

‎vcnet/sw-ippeveselfcert.aip

+35-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="19.1" Modules="professional" RootPath="." Language="en" Id="{52F3020C-FC5E-4DD6-8480-E71A5B45869D}">
2+
<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="19.3" Modules="professional" RootPath="." Language="en" Id="{52F3020C-FC5E-4DD6-8480-E71A5B45869D}">
33
<COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
4+
<ROW Name="HiddenItems" Value="ActSyncAppComponent;AutorunComponent;CPLAppletComponent;GameUxComponent;SilverlightSlnComponent"/>
45
<ROW Name="MigrationUninstallCode" Value="{C3B8AB45-EB4D-43BC-A1A1-DBE9D8C65BA0}"/>
56
</COMPONENT>
67
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
@@ -27,10 +28,10 @@
2728
<ROW Property="ARPURLINFOABOUT" Value="https://www.pwg.org/ipp/everywhere.html"/>
2829
<ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
2930
<ROW Property="Manufacturer" Value="IEEE-ISTO Printer Working Group"/>
30-
<ROW Property="ProductCode" Value="1033:{7C58790E-56EE-4F46-A48B-8BB0C842EFD0} " Type="16"/>
31+
<ROW Property="ProductCode" Value="1033:{AD85776D-3A5D-41A3-BBF3-2DFFAE5634CF} " Type="16"/>
3132
<ROW Property="ProductLanguage" Value="1033"/>
3233
<ROW Property="ProductName" Value="IPP Everywhere v1.1 Update 4 Printer Self-Certification Tools"/>
33-
<ROW Property="ProductVersion" Value="11.4.6" Type="32"/>
34+
<ROW Property="ProductVersion" Value="11.4.7"/>
3435
<ROW Property="REBOOT" MultiBuildValue="DefaultBuild:Suppress"/>
3536
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
3637
<ROW Property="UpgradeCode" Value="{C3B8AB45-EB4D-43BC-A1A1-DBE9D8C65BA0}"/>
@@ -63,7 +64,10 @@
6364
<ROW Component="ippeveprinter_PrimaryOutput" ComponentId="{0E94B345-160F-4DC9-A15A-2127BC4FF91B}" Directory_="APPDIR" Attributes="256" KeyPath="ippeveprinter.exe"/>
6465
<ROW Component="ippfind_PrimaryOutput" ComponentId="{61AB74A9-1B77-45B9-B09E-B66A5508A818}" Directory_="APPDIR" Attributes="256" KeyPath="ippfind.exe"/>
6566
<ROW Component="ipptool_PrimaryOutput" ComponentId="{E9A26042-462B-4E7D-B1C4-AF1B5D7DFC65}" Directory_="APPDIR" Attributes="256" KeyPath="ipptool.exe"/>
67+
<ROW Component="libcrypto1_1x64.dll" ComponentId="{7B035A1A-44AB-49D0-B866-A11790AF36FB}" Directory_="APPDIR" Attributes="256" KeyPath="libcrypto1_1x64.dll"/>
6668
<ROW Component="libcups2_PrimaryOutput" ComponentId="{7BA0107B-BF98-47AF-BEA9-D545E9FE679C}" Directory_="APPDIR" Attributes="256" KeyPath="libcups2.dll"/>
69+
<ROW Component="libssl1_1x64.dll" ComponentId="{B7B09A35-A0EE-4F9A-BDDC-CF13679260DC}" Directory_="APPDIR" Attributes="256" KeyPath="libssl1_1x64.dll"/>
70+
<ROW Component="zlib.dll" ComponentId="{23698618-7C6B-4D4F-887B-F33FD9531687}" Directory_="APPDIR" Attributes="256" KeyPath="zlib.dll"/>
6771
</COMPONENT>
6872
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
6973
<ROW Feature="AiAppXAssets" Title="AiAppXAssets" Description="Description" Display="3" Level="0" Directory_="APPDIR" Attributes="0" Options="271" Builds="Build_MSIX_APPX"/>
@@ -109,6 +113,9 @@
109113
<ROW File="ippfindSquare150x150Logo.scale100.png" Component_="Square50x50Logo.scale100.png" FileName="IPPFIN~2.PNG|ippfindSquare150x150Logo.scale-100.png" Attributes="0" SourcePath="&lt;AI_RES&gt;appx\Logo.png" SelfReg="false"/>
110114
<ROW File="ippevesubmitSquare44x44Logo.scale100.png" Component_="Square50x50Logo.scale100.png" FileName="IPPEVE~3.PNG|ippevesubmitSquare44x44Logo.scale-100.png" Attributes="0" SourcePath="&lt;AI_RES&gt;appx\SmallLogo10.png" SelfReg="false"/>
111115
<ROW File="ippevesubmitSquare150x150Logo.scale100.png" Component_="Square50x50Logo.scale100.png" FileName="IPPEVE~4.PNG|ippevesubmitSquare150x150Logo.scale-100.png" Attributes="0" SourcePath="&lt;AI_RES&gt;appx\Logo.png" SelfReg="false"/>
116+
<ROW File="libcrypto1_1x64.dll" Component_="libcrypto1_1x64.dll" FileName="LIBCRY~1.DLL|libcrypto-1_1-x64.dll" Attributes="0" SourcePath="packages\zeroc.openssl.v143.1.1.1.1\build\native\bin\x64\Release\libcrypto-1_1-x64.dll" SelfReg="false"/>
117+
<ROW File="libssl1_1x64.dll" Component_="libssl1_1x64.dll" FileName="LIBSSL~1.DLL|libssl-1_1-x64.dll" Attributes="0" SourcePath="packages\zeroc.openssl.v143.1.1.1.1\build\native\bin\x64\Release\libssl-1_1-x64.dll" SelfReg="false"/>
118+
<ROW File="zlib.dll" Component_="zlib.dll" FileName="zlib.dll" Attributes="0" SourcePath="packages\zlib_native.redist.1.2.11\build\native\bin\x64\Release\zlib.dll" SelfReg="false"/>
112119
<ATTRIBUTE name="IcoToPng" value="Square50x50Logo.scale100.png:0:50"/>
113120
</COMPONENT>
114121
<COMPONENT cid="caphyon.advinst.msicomp.AppPathsComponent">
@@ -156,6 +163,10 @@
156163
<ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
157164
</COMPONENT>
158165
<COMPONENT cid="caphyon.advinst.msicomp.GenericXmlAttributeComponent">
166+
<ROW XmlAttribute="Alias" XmlElement="ExecutionAlias" Name="Alias" Flags="0" Order="0" Value="[|AI_PROPPATH_FILENAME_PERBUILD_ipptool.exe"/>
167+
<ROW XmlAttribute="Alias_1" XmlElement="ExecutionAlias_1" Name="Alias" Flags="0" Order="0" Value="[|AI_PROPPATH_FILENAME_PERBUILD_ippeveprinter.exe"/>
168+
<ROW XmlAttribute="Alias_2" XmlElement="ExecutionAlias_2" Name="Alias" Flags="0" Order="0" Value="[|AI_PROPPATH_FILENAME_PERBUILD_ippevesubmit.exe"/>
169+
<ROW XmlAttribute="Alias_3" XmlElement="ExecutionAlias_3" Name="Alias" Flags="0" Order="0" Value="[|AI_PROPPATH_FILENAME_PERBUILD_ippfind.exe"/>
159170
<ROW XmlAttribute="BackgroundColor" XmlElement="VisualElements" Name="BackgroundColor" Flags="0" Order="0" Value="transparent"/>
160171
<ROW XmlAttribute="BackgroundColor_1" XmlElement="VisualElements_1" Name="BackgroundColor" Flags="0" Order="0" Value="transparent"/>
161172
<ROW XmlAttribute="BackgroundColor_2" XmlElement="VisualElements_2" Name="BackgroundColor" Flags="0" Order="0" Value="transparent"/>
@@ -164,6 +175,10 @@
164175
<ROW XmlAttribute="Category_1" XmlElement="Extension_1" Name="Category" Flags="0" Order="0" Value="windows.desktopAppMigration"/>
165176
<ROW XmlAttribute="Category_2" XmlElement="Extension_2" Name="Category" Flags="0" Order="0" Value="windows.desktopAppMigration"/>
166177
<ROW XmlAttribute="Category_3" XmlElement="Extension_3" Name="Category" Flags="0" Order="0" Value="windows.desktopAppMigration"/>
178+
<ROW XmlAttribute="Category_4" XmlElement="Extension_4" Name="Category" Flags="0" Order="0" Value="windows.appExecutionAlias"/>
179+
<ROW XmlAttribute="Category_5" XmlElement="Extension_5" Name="Category" Flags="0" Order="0" Value="windows.appExecutionAlias"/>
180+
<ROW XmlAttribute="Category_6" XmlElement="Extension_6" Name="Category" Flags="0" Order="0" Value="windows.appExecutionAlias"/>
181+
<ROW XmlAttribute="Category_7" XmlElement="Extension_7" Name="Category" Flags="0" Order="0" Value="windows.appExecutionAlias"/>
167182
<ROW XmlAttribute="Description" XmlElement="VisualElements" Name="Description" Flags="0" Order="0" Value="ipptool"/>
168183
<ROW XmlAttribute="Description_1" XmlElement="VisualElements_1" Name="Description" Flags="0" Order="0" Value="ippeveprinter"/>
169184
<ROW XmlAttribute="Description_2" XmlElement="VisualElements_2" Name="Description" Flags="0" Order="0" Value="ippfind"/>
@@ -233,6 +248,10 @@
233248
<ROW XmlAttribute="xmlnsuap" XmlElement="Package" Name="xmlns:uap" Flags="0" Order="2" Value="http://schemas.microsoft.com/appx/manifest/uap/windows10"/>
234249
</COMPONENT>
235250
<COMPONENT cid="caphyon.advinst.msicomp.GenericXmlElementComponent">
251+
<ROW XmlElement="AppExecutionAlias" ParentElement="Extension_4" Name="AppExecutionAlias" Order="0" Flags="0" Type="0"/>
252+
<ROW XmlElement="AppExecutionAlias_1" ParentElement="Extension_5" Name="AppExecutionAlias" Order="0" Flags="0" Type="0"/>
253+
<ROW XmlElement="AppExecutionAlias_2" ParentElement="Extension_6" Name="AppExecutionAlias" Order="0" Flags="0" Type="0"/>
254+
<ROW XmlElement="AppExecutionAlias_3" ParentElement="Extension_7" Name="AppExecutionAlias" Order="0" Flags="0" Type="0"/>
236255
<ROW XmlElement="Application" ParentElement="Applications" Name="Application" Order="1" Flags="0" Type="4"/>
237256
<ROW XmlElement="Application_1" ParentElement="Applications" Name="Application" Order="2" Flags="0" Type="4"/>
238257
<ROW XmlElement="Application_2" ParentElement="Applications" Name="Application" Order="3" Flags="0" Type="4"/>
@@ -255,10 +274,18 @@
255274
<ROW XmlElement="DesktopApp_6" ParentElement="DesktopAppMigration_3" Name="DesktopApp" Order="0" Flags="0" Type="0"/>
256275
<ROW XmlElement="DesktopApp_7" ParentElement="DesktopAppMigration_3" Name="DesktopApp" Order="1" Flags="0" Type="0"/>
257276
<ROW XmlElement="DisplayName" ParentElement="Properties" Name="DisplayName" Order="1" Flags="0" Text="IPP Everywhere v1.1 Printer Self-Certification Tools" Type="0"/>
277+
<ROW XmlElement="ExecutionAlias" ParentElement="AppExecutionAlias" Name="ExecutionAlias" Order="0" Flags="0" Type="0"/>
278+
<ROW XmlElement="ExecutionAlias_1" ParentElement="AppExecutionAlias_1" Name="ExecutionAlias" Order="0" Flags="0" Type="0"/>
279+
<ROW XmlElement="ExecutionAlias_2" ParentElement="AppExecutionAlias_2" Name="ExecutionAlias" Order="0" Flags="0" Type="0"/>
280+
<ROW XmlElement="ExecutionAlias_3" ParentElement="AppExecutionAlias_3" Name="ExecutionAlias" Order="0" Flags="0" Type="0"/>
258281
<ROW XmlElement="Extension" ParentElement="Extensions" Name="Extension" Order="0" Flags="0" Type="55"/>
259282
<ROW XmlElement="Extension_1" ParentElement="Extensions_1" Name="Extension" Order="0" Flags="0" Type="55"/>
260283
<ROW XmlElement="Extension_2" ParentElement="Extensions_2" Name="Extension" Order="0" Flags="0" Type="55"/>
261284
<ROW XmlElement="Extension_3" ParentElement="Extensions_3" Name="Extension" Order="0" Flags="0" Type="55"/>
285+
<ROW XmlElement="Extension_4" ParentElement="Extensions" Name="Extension" Order="1" Flags="0" Type="54"/>
286+
<ROW XmlElement="Extension_5" ParentElement="Extensions_1" Name="Extension" Order="1" Flags="0" Type="54"/>
287+
<ROW XmlElement="Extension_6" ParentElement="Extensions_3" Name="Extension" Order="1" Flags="0" Type="54"/>
288+
<ROW XmlElement="Extension_7" ParentElement="Extensions_2" Name="Extension" Order="1" Flags="0" Type="54"/>
262289
<ROW XmlElement="Extensions" ParentElement="Application" Name="Extensions" Order="1" Flags="0" Type="0"/>
263290
<ROW XmlElement="Extensions_1" ParentElement="Application_1" Name="Extensions" Order="1" Flags="0" Type="0"/>
264291
<ROW XmlElement="Extensions_2" ParentElement="Application_2" Name="Extensions" Order="1" Flags="0" Type="0"/>
@@ -349,6 +376,9 @@
349376
<ROW Feature_="MainFeature" Component_="APPDIR"/>
350377
<ROW Feature_="AiAppXAssets" Component_="Square50x50Logo.scale100.png"/>
351378
<ROW Feature_="MainFeature" Component_="AI_PROPPATH_FILENAME_PERBUILD_ippevesubmit.exe"/>
379+
<ROW Feature_="MainFeature" Component_="libcrypto1_1x64.dll"/>
380+
<ROW Feature_="MainFeature" Component_="libssl1_1x64.dll"/>
381+
<ROW Feature_="MainFeature" Component_="zlib.dll"/>
352382
</COMPONENT>
353383
<COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
354384
<ROW Name="ippeverywhere.ico" SourcePath="ipp-everywhere.ico" Index="0"/>
@@ -376,7 +406,9 @@
376406
</COMPONENT>
377407
<COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
378408
<ROW Registry="Path" Root="2" Key="Software\cups.org" Name="installdir" Value="[APPDIR]" Component_="ProductInformation"/>
409+
<ROW Registry="Software" Root="2" Key="Software" Name="\"/>
379410
<ROW Registry="Version" Root="2" Key="Software\cups.org" Name="version" Value="[ProductVersion]" Component_="ProductInformation"/>
411+
<ROW Registry="cups.org" Root="2" Key="Software\cups.org" Name="\"/>
380412
</COMPONENT>
381413
<COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
382414
<ROW Shortcut="IPPEverywherePrinterSelfCertifica_1" Directory_="DesktopFolder" Name="IPPEVE~1|IPP Everywhere Printer Self-Certification Tools" Component_="libcups2_PrimaryOutput" Target="C:\Windows\System32\cmd.exe" Arguments="Your Arguments" Hotkey="0" Icon_="ippeverywhere.ico" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

0 commit comments

Comments
 (0)