View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

CMake-WIX-Feature-Request.diff [^] (1,513 bytes) 2012-12-12 19:03 [Show Content] [Hide Content]

diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in
index 63fad7c..0b87711 100644
--- a/Modules/WIX.template.in
+++ b/Modules/WIX.template.in
@@ -24,6 +24,19 @@
         <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
         <Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/>
 
+	<?ifdef CPACK_WIX_PRODUCT_ICON ?>
+            <Property Id="ARPPRODUCTICON">ApplicationIcon</Property>
+            <Icon Id="ApplicationIcon" SourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"/>
+	<?endif?>
+
+	<?ifdef CPACK_WIX_UI_BANNER ?>
+	    <WixVariable Id="WixUIBannerBmp" Value="$(var.CPACK_WIX_UI_BANNER)"/>
+	<?endif?>
+
+	<?ifdef CPACK_WIX_UI_DIALOG ?>
+	    <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/>
+	<?endif?>
+
         <FeatureRef Id="ProductFeature"/>
 
         <UIRef Id="WixUI_InstallDir" />
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 8b58625..e8b0ea9 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -221,6 +221,9 @@ bool cmCPackWIXGenerator::CreateWiXVariablesIncludeFile()
   CopyDefinition(includeFile, "CPACK_PACKAGE_NAME");
   CopyDefinition(includeFile, "CPACK_PACKAGE_VERSION");
   CopyDefinition(includeFile, "CPACK_WIX_LICENSE_RTF");
+  CopyDefinition(includeFile, "CPACK_WIX_PRODUCT_ICON");
+  CopyDefinition(includeFile, "CPACK_WIX_UI_BANNER");
+  CopyDefinition(includeFile, "CPACK_WIX_UI_DIALOG");
 
   return true;
 }

0001-CMake-Nightly-Date-Stamp.patch [^] (659 bytes) 2012-12-13 21:58 [Show Content] [Hide Content]

From f6a9a64f16a6f79095dd3eb9563999253fa18f9f Mon Sep 17 00:00:00 2001
From: Kitware Robot <kwrobot@kitware.com>
Date: Thu, 13 Dec 2012 00:01:03 -0500
Subject: [PATCH] CMake Nightly Date Stamp

---
 Source/CMakeVersion.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 41fc6a2..59bac2d 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,5 +2,5 @@
 set(CMake_VERSION_MAJOR 2)
 set(CMake_VERSION_MINOR 8)
 set(CMake_VERSION_PATCH 10)
-set(CMake_VERSION_TWEAK 20121212)
+set(CMake_VERSION_TWEAK 20121213)
 #set(CMake_VERSION_RC 1)
-- 
1.8.0.msysgit.0

CMake-WIX-Feature-Request-2.diff [^] (2,604 bytes) 2012-12-13 21:59 [Show Content] [Hide Content]

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index f278953..2cecf49 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -49,6 +49,32 @@
 # by the WiX Generator in case CPACK_RESOURCE_FILE_LICENSE
 # is in an unsupported format or the .txt -> .rtf
 # conversion does not work as expected.
+#
+##end
+#
+##variable
+# CPACK_WIX_PRODUCT_ICON - The Icon shown next to the program name in Add/Remove programs.
+#
+# If set, this icon is used in place of the default icon.
+#
+##end
+#
+##variable
+# CPACK_WIX_UI_BANNER - The bitmap will appear at the top of all installer pages other than the welcome and completion dialogs.
+#
+# If set, this image will replace the default banner image.
+#
+# This image must be 493 by 58 pixels
+#
+##end
+#
+##variable
+# CPACK_WIX_UI_DIALOG - Background bitmap used on the welcome and completion dialogs.
+#
+# If this variable is set, the installer will replace the default dialog image.
+#
+# This image must be 493 by 312 pixels.
+#
 ##end
 
 #=============================================================================
diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in
index 63fad7c..0b87711 100644
--- a/Modules/WIX.template.in
+++ b/Modules/WIX.template.in
@@ -24,6 +24,19 @@
         <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
         <Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/>
 
+	<?ifdef CPACK_WIX_PRODUCT_ICON ?>
+            <Property Id="ARPPRODUCTICON">ApplicationIcon</Property>
+            <Icon Id="ApplicationIcon" SourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"/>
+	<?endif?>
+
+	<?ifdef CPACK_WIX_UI_BANNER ?>
+	    <WixVariable Id="WixUIBannerBmp" Value="$(var.CPACK_WIX_UI_BANNER)"/>
+	<?endif?>
+
+	<?ifdef CPACK_WIX_UI_DIALOG ?>
+	    <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/>
+	<?endif?>
+
         <FeatureRef Id="ProductFeature"/>
 
         <UIRef Id="WixUI_InstallDir" />
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 8b58625..e8b0ea9 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -221,6 +221,9 @@ bool cmCPackWIXGenerator::CreateWiXVariablesIncludeFile()
   CopyDefinition(includeFile, "CPACK_PACKAGE_NAME");
   CopyDefinition(includeFile, "CPACK_PACKAGE_VERSION");
   CopyDefinition(includeFile, "CPACK_WIX_LICENSE_RTF");
+  CopyDefinition(includeFile, "CPACK_WIX_PRODUCT_ICON");
+  CopyDefinition(includeFile, "CPACK_WIX_UI_BANNER");
+  CopyDefinition(includeFile, "CPACK_WIX_UI_DIALOG");
 
   return true;
 }

0001-WIX-Product-Icon-UI-Banner-UI-Dialog-support.patch [^] (3,121 bytes) 2012-12-14 15:55 [Show Content] [Hide Content]

From fe9033dfb8532966fa3e2389b8492ec804e9133a Mon Sep 17 00:00:00 2001
From: Eric LaFranchi <eric@lafranchi.com>
Date: Fri, 14 Dec 2012 12:50:18 -0800
Subject: [PATCH] WIX Product Icon, UI Banner, UI Dialog support

---
 Modules/CPackWIX.cmake                   | 26 ++++++++++++++++++++++++++
 Modules/WIX.template.in                  | 13 +++++++++++++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |  3 +++
 3 files changed, 42 insertions(+)

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index f278953..0c0a8f1 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -49,6 +49,32 @@
 # by the WiX Generator in case CPACK_RESOURCE_FILE_LICENSE
 # is in an unsupported format or the .txt -> .rtf
 # conversion does not work as expected.
+#
+##end
+#
+##variable
+# CPACK_WIX_PRODUCT_ICON - The Icon shown next to the program name in Add/Remove programs.
+#
+# If set, this icon is used in place of the default icon.
+#
+##end
+#
+##variable
+# CPACK_WIX_UI_BANNER - The bitmap will appear at the top of all installer pages other than the welcome and completion dialogs.
+#
+# If set, this image will replace the default banner image.
+#
+# This image must be 493 by 58 pixels.
+#
+##end
+#
+##variable
+# CPACK_WIX_UI_DIALOG - Background bitmap used on the welcome and completion dialogs.
+#
+# If this variable is set, the installer will replace the default dialog image.
+#
+# This image must be 493 by 312 pixels.
+#
 ##end
 
 #=============================================================================
diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in
index 63fad7c..e6a9d24 100644
--- a/Modules/WIX.template.in
+++ b/Modules/WIX.template.in
@@ -24,6 +24,19 @@
         <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
         <Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/>
 
+        <?ifdef CPACK_WIX_PRODUCT_ICON?>
+            <Property Id="ARPPRODUCTICON">ProductIcon.ico</Property>
+            <Icon Id="ProductIcon.ico" SourceFile="$(var.CPACK_WIX_PRODUCT_ICON)"/>
+        <?endif?>
+
+        <?ifdef CPACK_WIX_UI_BANNER?>
+            <WixVariable Id="WixUIBannerBmp" Value="$(var.CPACK_WIX_UI_BANNER)"/>
+        <?endif?>
+
+        <?ifdef CPACK_WIX_UI_DIALOG?>
+            <WixVariable Id="WixUIDialogBmp" Value="$(var.CPACK_WIX_UI_DIALOG)"/>
+        <?endif?>
+
         <FeatureRef Id="ProductFeature"/>
 
         <UIRef Id="WixUI_InstallDir" />
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 8b58625..e8b0ea9 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -221,6 +221,9 @@ bool cmCPackWIXGenerator::CreateWiXVariablesIncludeFile()
   CopyDefinition(includeFile, "CPACK_PACKAGE_NAME");
   CopyDefinition(includeFile, "CPACK_PACKAGE_VERSION");
   CopyDefinition(includeFile, "CPACK_WIX_LICENSE_RTF");
+  CopyDefinition(includeFile, "CPACK_WIX_PRODUCT_ICON");
+  CopyDefinition(includeFile, "CPACK_WIX_UI_BANNER");
+  CopyDefinition(includeFile, "CPACK_WIX_UI_DIALOG");
 
   return true;
 }
-- 
1.8.0.msysgit.0

Relationships

has duplicate

0013828

closed

Nils Gladitz

Need additional functionality for WiX packager

Notes
(0031874) David Cole (manager) 2012-12-12 23:01	Can you re-do the diff as a *.patch file as produced by "git format-patch -1" -- that way, your authorship information is preserved without me having to do anything special. I can just run "git am -3 0001-your-commit.patch" and it's all quite simple... Thanks.

(0031875) Eric NOULARD (developer) 2012-12-13 02:52	Hi Eric, The documentation of the new variables should be put in: ./Modules/CPackWIX.cmake as others. That way they will get handled by cpack --help-variable[-list] automatically.

(0031881) Eric LaFranchi (reporter) 2012-12-13 22:00 edited on: 2012-12-13 22:01	Add documentation as Eric suggested. Uploaded a new set of diffs. To be honest, I don't understand git format-patch, so let me know what might not be correct.

(0031883) Eric NOULARD (developer) 2012-12-14 01:59	Hi Eric, For using "git format -1" as suggested by David you need to: 1) clone CMake git master. git clone git://cmake.org/cmake.git [^] see indication http://www.cmake.org/Wiki/CMake/Git [^] 2) create your local branch from there git checkout -b CPackWIX-Improvement 3) Do your modification and commit them in your local branch git commit -a ... 4) Then in the end you'll be able to use git format-patch -1 which means "produce a patch which consist in the last commit of this local tree". The idea is that if you use this process the patch will contains all needed informations: patch content AND proper authorship Name, E-mail etc... you did setup with git. Hopes this helps.

(0031900) Eric LaFranchi (reporter) 2012-12-14 15:57	Thanks for the straight forward directions (new to git). Patch attached.

(0031952) David Cole (manager) 2012-12-28 15:41	Did the test pass for you with this change? And can you build a WiX installer with this patch applied...? I got the following test failure when I ran the CPackWiXGenerator test: -- Running WiX Tool: wixcop C:/Users/davidcole/Dashboards/My Tests/CMake Win32-vs9-Release/Tests/CPackWiXGenerator/_CPac k_Packages/win32//WIX//main.wxs -- wixcop Output: Windows Installer Xml Cop version 3.6.3303.0 Copyright (C) Outercurve Foundation. All rights reserved. C:\Users\davidcole\Dashboards\My Tests\CMake Win32-vs9-Release\Tests\CPackWiXGenerator\_CPack_Packages\win32\WIX\main.wx s(28) : error WXCP0007 : The whitespace preceding this node is incorrect. (WhitespacePrecedingNodeWrong) C:\Users\davidcole\Dashboards\My Tests\CMake Win32-vs9-Release\Tests\CPackWiXGenerator\_CPack_Packages\win32\WIX\main.wx s(29) : error WXCP0007 : The whitespace preceding this node is incorrect. (WhitespacePrecedingNodeWrong) C:\Users\davidcole\Dashboards\My Tests\CMake Win32-vs9-Release\Tests\CPackWiXGenerator\_CPack_Packages\win32\WIX\main.wx s(33) : error WXCP0007 : The whitespace preceding this node is incorrect. (WhitespacePrecedingNodeWrong) C:\Users\davidcole\Dashboards\My Tests\CMake Win32-vs9-Release\Tests\CPackWiXGenerator\_CPack_Packages\win32\WIX\main.wx s(37) : error WXCP0007 : The whitespace preceding this node is incorrect. (WhitespacePrecedingNodeWrong) CMake Error at C:/Users/davidcole/Dashboards/My Tests/CMake/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake:54 (messa ge): WiX wixcop failed: 2 Call Stack (most recent call first): C:/Users/davidcole/Dashboards/My Tests/CMake/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake:66 (run_wix_command) After adjusting the whitespace in the template input file, the test passed just fine. So I pushed it to stage and merged it to 'next' -- as long as the dashboards look good tomorrow and moving forward, we should be able to merge this to master for the upcoming 2.8.11 release. Here's the commit now in 'next': http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3793dca08a41fd9199e65ff834b839b4f65397c7 [^]

(0031953) David Cole (manager) 2012-12-28 15:43	Expecting resolved in 2.8.11 as long as the dashboards look good tomorrow. (See previous note)

(0033177) Robert Maynard (manager) 2013-06-03 09:05	Closing resolved issues that have not been updated in more than 4 months.

Issue History
Date Modified	Username	Field	Change
2012-12-12 19:03	Eric LaFranchi	New Issue
2012-12-12 19:03	Eric LaFranchi	File Added: CMake-WIX-Feature-Request.diff
2012-12-12 23:01	David Cole	Note Added: 0031874
2012-12-13 02:52	Eric NOULARD	Note Added: 0031875
2012-12-13 21:58	Eric LaFranchi	File Added: 0001-CMake-Nightly-Date-Stamp.patch
2012-12-13 21:59	Eric LaFranchi	File Added: CMake-WIX-Feature-Request-2.diff
2012-12-13 22:00	Eric LaFranchi	Note Added: 0031881
2012-12-13 22:01	Eric LaFranchi	Note Edited: 0031881
2012-12-14 01:59	Eric NOULARD	Note Added: 0031883
2012-12-14 06:13	David Cole	Assigned To	=> David Cole
2012-12-14 06:13	David Cole	Status	new => assigned
2012-12-14 06:14	David Cole	Target Version	=> CMake 2.8.11
2012-12-14 15:55	Eric LaFranchi	File Added: 0001-WIX-Product-Icon-UI-Banner-UI-Dialog-support.patch
2012-12-14 15:57	Eric LaFranchi	Note Added: 0031900
2012-12-20 11:06	Eric NOULARD	Category	CMake => CPack
2012-12-28 15:41	David Cole	Note Added: 0031952
2012-12-28 15:43	David Cole	Note Added: 0031953
2012-12-28 15:43	David Cole	Status	assigned => resolved
2012-12-28 15:43	David Cole	Fixed in Version	=> CMake 2.8.11
2012-12-28 15:43	David Cole	Resolution	open => fixed
2013-01-03 10:46	Eric NOULARD	Relationship added	has duplicate 0013828
2013-06-03 09:05	Robert Maynard	Note Added: 0033177
2013-06-03 09:05	Robert Maynard	Status	resolved => closed