[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3376: Create a custom derivative of WixUI_Mondo.wxs that removes t (vidalia/trunk/pkg/win32)
Author: edmanm
Date: 2008-12-09 18:49:58 -0500 (Tue, 09 Dec 2008)
New Revision: 3376
Added:
vidalia/trunk/pkg/win32/WixUI_Custom.wxs
Modified:
vidalia/trunk/pkg/win32/CMakeLists.txt
vidalia/trunk/pkg/win32/vidalia.wxs.in
Log:
Create a custom derivative of WixUI_Mondo.wxs that removes the license
agreement page, use the custom UI in vidalia.wxs.in, and add it to
the 'make win32-installer' CMake build target.
Modified: vidalia/trunk/pkg/win32/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/win32/CMakeLists.txt 2008-12-09 20:56:32 UTC (rev 3375)
+++ vidalia/trunk/pkg/win32/CMakeLists.txt 2008-12-09 23:49:58 UTC (rev 3376)
@@ -46,7 +46,12 @@
${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
@ONLY
)
-
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/WixUI_Custom.wxs
+ ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wxs
+ COPYONLY
+)
+
if (CONFIGURE_BUNDLE_NSI)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/vidalia-bundle.nsi.in
@@ -99,13 +104,19 @@
COMMAND ${WIX_CANDLE_EXECUTABLE}
${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
-o ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wixobj
-
+
+ COMMAND ${WIX_CANDLE_EXECUTABLE}
+ ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wxs
+ -o ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wixobj
+
COMMAND ${WIX_LIGHT_EXECUTABLE}
${CMAKE_CURRENT_BINARY_DIR}/vidalia.wixobj
+ ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wixobj
-o ${CMAKE_CURRENT_BINARY_DIR}/vidalia-${VERSION}.msi
-ext ${WIX_BINARY_DIR}/WixUIExtension.dll
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
+ ${CMAKE_CURRENT_SOURCE_DIR}/WixUI_Custom.wxs
COMMENT "Building vidalia-${VERSION}.msi"
)
Added: vidalia/trunk/pkg/win32/WixUI_Custom.wxs
===================================================================
--- vidalia/trunk/pkg/win32/WixUI_Custom.wxs (rev 0)
+++ vidalia/trunk/pkg/win32/WixUI_Custom.wxs 2008-12-09 23:49:58 UTC (rev 3376)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) Microsoft Corporation. All rights reserved.
+
+ The use and distribution terms for this software are covered by the
+ Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ which can be found in the file CPL.TXT at the root of this distribution.
+ By using this software in any fashion, you are agreeing to be bound by
+ the terms of this license.
+
+ You must not remove this notice, or any other, from this software.
+-->
+<!--
+ This file was modified for Vidalia (http://vidalia-project.net) and
+ is derived from WixUI_Mondo.wxs.
+-->
+<!--
+First-time install dialog sequence: Maintenance dialog sequence:
+ - WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg
+ - WixUI_SetupTypeDlg - WixUI_MaintenanceTypeDlg
+ - WixUI_VerifyReadyDlg - WixUI_CustomizeDlg
+ - WixUI_CustomizeDlg - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+ - WixUI_BrowseDlg
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <Fragment>
+ <UI Id="WixUI_Custom">
+ <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="Mondo" />
+
+ <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="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg">1</Publish>
+
+ <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog"
+ Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg"
+ Order="1">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg"
+ Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg"
+ Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg"
+ Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg"
+ Order="3">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg"
+ Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog"
+ Value="MaintenanceTypeDlg">1</Publish>
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog"
+ Value="CustomizeDlg">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>
+ </UI>
+
+ <UIRef Id="WixUI_Common" />
+ </Fragment>
+</Wix>
Property changes on: vidalia/trunk/pkg/win32/WixUI_Custom.wxs
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: vidalia/trunk/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.wxs.in 2008-12-09 20:56:32 UTC (rev 3375)
+++ vidalia/trunk/pkg/win32/vidalia.wxs.in 2008-12-09 23:49:58 UTC (rev 3376)
@@ -146,7 +146,7 @@
</Feature>
<!-- Set the UI options -->
- <UIRef Id="WixUI_Mondo" />
+ <UIRef Id="WixUI_Custom" />
<Icon Id="vidalia.ico" SourceFile="@Vidalia_SOURCE_DIR@\src\vidalia\res\icons\vidalia.ico" />
<WixVariable Id="WixUIBannerBmp" Value="@Vidalia_SOURCE_DIR@\pkg\win32\msi-header.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="@Vidalia_SOURCE_DIR@\pkg\win32\msi-welcome.bmp" />