Skip to content

Commit ad5241a

Browse files
committed
MDEV-36532 Enable Feedback Plugin for Windows
Revert "Remove feedback from Windows MSI" (a89f1fa) but change the default value to OFF
1 parent a0b77eb commit ad5241a

File tree

1 file changed

+56
-2
lines changed

1 file changed

+56
-2
lines changed

win/packaging/extra.wxs.in

+56-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
<!-- Disable advertised shortcuts weirdness -->
5353
<Property Id="DISABLEADVTSHORTCUTS" Secure="yes" Value="1"/>
5454

55+
<!-- Activate feedback plugin-->
56+
<Property Id="FEEDBACK" Secure="yes"/>
57+
58+
5559
<!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
5660
<Property Id="STDCONFIG" Secure="yes" Value="1"/>
5761

@@ -167,6 +171,43 @@
167171
</Control>
168172
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
169173
</Dialog>
174+
175+
<!-- Feedback dialog -->
176+
<Dialog Id="Feedback" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
177+
178+
<Control Id="CheckBoxFeedback" Type="CheckBox" X="8" Y="61" Width="360" Height="12" Property="FEEDBACK" CheckBoxValue="1" TabSkip="no">
179+
<Text>{\Font1}Enable the Feedback plugin and submit anonymous usage information</Text>
180+
</Control>
181+
182+
<Control Id="Text" Type="Text" X="23" Y="82" Width="290" Height="55">
183+
<Text>Feedback plugin for MariaDB, if enabled, collects basic anonymous statistical information. This information is used by the developers to improve MariaDB. Enabling this plugin is an easy way to help with MariaDB development. Collected statistics, and more information on the plugin, can be viewed at http://mariadb.org/feedback_plugin</Text>
184+
</Control>
185+
186+
<Control Id="MoreInfo" Type="PushButton" X="23" Y="140" Width="56" Height="17" Text="More Info" ToolTip="http://mariadb.org/feedback_plugin" >
187+
<Publish Property="WixShellExecTarget" Value="http://mariadb.org/feedback_plugin" Order="1">1</Publish>
188+
<Publish Event="DoAction" Value="LaunchUrl" Order="2">1</Publish>
189+
</Control>
190+
191+
192+
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
193+
<Publish Event="NewDialog" Value="ServicePortDlg">1</Publish>
194+
</Control>
195+
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&amp;Next">
196+
<Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
197+
</Control>
198+
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
199+
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
200+
</Control>
201+
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
202+
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
203+
<Text>Submit usage information</Text>
204+
</Control>
205+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
206+
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
207+
<Text>{\WixUI_Font_Title}[ProductName] setup</Text>
208+
</Control>
209+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
210+
</Dialog>
170211

171212
<!-- Error popup dialog -->
172213
<Dialog Id="WarningDlg" Width="320" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
@@ -327,7 +368,7 @@
327368
</Publish>
328369
<Publish Event="DoAction" Value="CheckDatabaseProperties">NOT WarningText</Publish>
329370
<Publish Event="SpawnDialog" Value="WarningDlg">WarningText</Publish>
330-
<Publish Event="NewDialog" Value="VerifyReadyDlg">Not WarningText</Publish>
371+
<Publish Event="NewDialog" Value="Feedback">Not WarningText</Publish>
331372
</Control>
332373
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="no" Text="Cancel">
333374
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
@@ -358,7 +399,7 @@
358399
NOT Installed AND UpgradableServiceFound
359400
</Publish>
360401

361-
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ServicePortDlg" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
402+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="Feedback" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
362403
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3"> <![CDATA[OLDERVERSIONBEINGUPGRADED <>""]]></Publish>
363404
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="1" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
364405

@@ -456,6 +497,19 @@
456497
Key="innodb_buffer_pool_size"
457498
Value="[BUFFERPOOLSIZE]M" />
458499
</Component>
500+
<Component Id="C.feedback" Guid="*" Directory="DATADIR">
501+
<Condition>FEEDBACK</Condition>
502+
<RegistryValue Root='HKLM'
503+
Key='SOFTWARE\@CPACK_WIX_PACKAGE_NAME@'
504+
Name='FEEDBACK' Value='1' Type='string' KeyPath='yes'/>
505+
<IniFile Id="Ini5"
506+
Action="createLine"
507+
Directory="DATADIR"
508+
Section="mysqld"
509+
Name="my.ini"
510+
Key="feedback"
511+
Value="OFF" />
512+
</Component>
459513

460514
<Component Id="C.utf8" Guid="*" Directory="DATADIR">
461515
<Condition>UTF8</Condition>

0 commit comments

Comments
 (0)