win-install: getting rid of the nonsensical license agreement screen

OCamlPro · Jul 4, 2013 · 0cd8812 · 0cd8812
1 parent 5e49beb
commit 0cd8812
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 9 deletions.
diff --git a/Makefile.win32 b/Makefile.win32
@@ -60,3 +60,7 @@ inst/dlls.wxs: inst/ocaml-top
 ocaml-top.msi: inst/data.wixobj inst/dlls.wixobj windows/ocaml-top.wixobj
 	cd inst && $(WIXDIR)/light.exe -ext WixUIExtension -out ../ocaml-top.msi \
 	   data.wixobj dlls.wixobj ../windows/ocaml-top.wixobj
+
+.PHONY: testmsi
+testmsi: ocaml-top.msi
+	msiexec /i $^ /l'*' msi.log
diff --git a/windows/bannrbmp.bmp b/windows/bannrbmp.bmp
diff --git a/windows/dlgbmp.bmp b/windows/dlgbmp.bmp
diff --git a/windows/ocaml-top.wxs b/windows/ocaml-top.wxs
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
-  <Product Name='ocaml-top 0.1' Id='9cf7c3da-f460-4442-81a8-5304e5f4b53c'
+  <Product Name='OCaml-Top' Id='9cf7c3da-f460-4442-81a8-5304e5f4b53c'
            UpgradeCode='6b5569c2-58f9-4555-bd4c-13ce398afaa2'
            Language='1033' Codepage='1252' Version='0.1.0'
            Manufacturer='OCamlPro'>
@@ -42,6 +42,12 @@
                 <Verb Id='open' Command='Open' Argument='"%1"' />
               </Extension>
             </ProgId>
+            <ProgId Id='ocaml_top.mlifile' Description="OCaml interface file" Icon='icon.ico'
+                    Advertise="yes">
+              <Extension Id='mli' ContentType='text/x-ml-interface' Advertise="yes">
+                <Verb Id='open' Command='Open' Argument='"%1"' />
+              </Extension>
+            </ProgId>
           </Component>
         </Directory>
       </Directory>
@@ -73,16 +79,66 @@
         <ComponentGroupRef Id='dlls' />
       </Feature>
     </Feature>
-    <Icon Id='icon.ico' SourceFile="ocaml-top/data/logo.ico" />
+    <Icon Id='icon.ico' SourceFile="ocaml-top\data\logo.ico" />
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
 
-    <UIRef Id="WixUI_Advanced" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-    <Property Id="ApplicationFolderName" Value="ocaml-top" />
-    <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
 
-    <!--UIRef Id="WixUI_InstallDir" />
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" /-->
-    <WixVariable Id="WixUILicenseRtf" Value="gpl.rtf" />
+    <!-- UI definition -->
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+
+    <WixVariable Id="WixUIBannerBmp" Value="..\windows\bannrbmp.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="..\windows\dlgbmp.bmp" />
+
+    <UI Id="WixUI_InstallDir_NoLicense">
+      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+      <Property Id="WixUI_Mode" Value="InstallDir" />
+
+      <DialogRef Id="BrowseDlg" />
+      <DialogRef Id="DiskCostDlg" />
+      <DialogRef Id="ErrorDlg" />
+      <DialogRef Id="FatalError" />
+      <DialogRef Id="FilesInUse" />
+      <DialogRef Id="MsiRMFilesInUse" />
+      <DialogRef Id="PrepareDlg" />
+      <DialogRef Id="ProgressDlg" />
+      <DialogRef Id="ResumeDlg" />
+      <DialogRef Id="UserExit" />
+
+      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+      <Property Id="ARPNOMODIFY" Value="1" />
+    </UI>
+
+    <UIRef Id="WixUI_Common" />
+
   </Product>
 </Wix>