Changeset: 7f22fb6645bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f22fb6645bc
Modified Files:
NT/mkgeomwxs.py
Branch: Jul2017
Log Message:
Check that MonetDB5/SQL is installed, and remove install dir dialog.
diffs (59 lines):
diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py
--- a/NT/mkgeomwxs.py
+++ b/NT/mkgeomwxs.py
@@ -48,6 +48,9 @@ def main():
print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>')
print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
+ print(r' <Condition Message="MonetDB5-SQL needs to be installed
first.">')
+ print(r' INSTALLDIR')
+ print(r' </Condition>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch))
print(r' <Directory Id="%s">' % folder)
@@ -83,7 +86,44 @@ def main():
print(r' <ComponentRef Id="%s"/>' % f)
print(r' <MergeRef Id="VCRedist"/>')
print(r' </Feature>')
- print(r' <UIRef Id="WixUI_InstallDir"/>')
+ # the <UI> section was lifted from
+ # ...\SDK\wixui\WixUI_InstallDir.wxs and modified to remove the
+ # InstallDirDlg subsection
+ # see
http://wixtoolset.org/documentation/manual/v3/wixui/wixui_customizations.html
+ print(r' <UI Id="MyWixUI_InstallDir">')
+ print(r' <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma"
Size="8"/>')
+ print(r' <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma"
Size="12"/>')
+ print(r' <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9"
Bold="yes"/>')
+ print(r' <Property Id="DefaultUIFont" Value="WixUI_Font_Normal"/>')
+ print(r' <Property Id="WixUI_Mode" Value="InstallDir"/>')
+ print(r' <DialogRef Id="BrowseDlg"/>')
+ print(r' <DialogRef Id="DiskCostDlg"/>')
+ print(r' <DialogRef Id="ErrorDlg"/>')
+ print(r' <DialogRef Id="FatalError"/>')
+ print(r' <DialogRef Id="FilesInUse"/>')
+ print(r' <DialogRef Id="MsiRMFilesInUse"/>')
+ print(r' <DialogRef Id="PrepareDlg"/>')
+ print(r' <DialogRef Id="ProgressDlg"/>')
+ print(r' <DialogRef Id="ResumeDlg"/>')
+ print(r' <DialogRef Id="UserExit"/>')
+ print(r' <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction"
Value="WixUIValidatePath" Order="3">1</Publish>')
+ print(r' <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog"
Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND
WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>')
+ print(r' <Publish Dialog="ExitDialog" Control="Finish"
Event="EndDialog" Value="Return" Order="999">1</Publish>')
+ print(r' <Publish Dialog="WelcomeDlg" Control="Next"
Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>')
+ print(r' <Publish Dialog="WelcomeDlg" Control="Next"
Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>')
+ print(r' <Publish Dialog="LicenseAgreementDlg" Control="Back"
Event="NewDialog" Value="WelcomeDlg">1</Publish>')
+ print(r' <Publish Dialog="LicenseAgreementDlg" Control="Next"
Event="NewDialog" Value="VerifyReadyDlg">LicenseAccepted = "1"</Publish>')
+ print(r' <Publish Dialog="VerifyReadyDlg" Control="Back"
Event="NewDialog" Value="LicenseAgreementDlg" Order="1">NOT
Installed</Publish>')
+ print(r' <Publish Dialog="VerifyReadyDlg" Control="Back"
Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT
PATCH</Publish>')
+ print(r' <Publish Dialog="VerifyReadyDlg" Control="Back"
Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>')
+ print(r' <Publish Dialog="MaintenanceWelcomeDlg" Control="Next"
Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>')
+ print(r' <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton"
Event="NewDialog" Value="VerifyReadyDlg">1</Publish>')
+ print(r' <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton"
Event="NewDialog" Value="VerifyReadyDlg">1</Publish>')
+ print(r' <Publish Dialog="MaintenanceTypeDlg" Control="Back"
Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>')
+ print(r' <Property Id="ARPNOMODIFY" Value="1"/>')
+ print(r' </UI>')
+ print(r' <UIRef Id="WixUI_Common"/>')
+ print(r' <UIRef Id="MyWixUI_InstallDir"/>')
print(r' <UIRef Id="WixUI_ErrorProgressText"/>')
print(r' <Icon Id="monetdb.ico" SourceFile="monetdb.ico"/>')
print(r' </Product>')
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
