[Cmake-commits] CMake branch, next, updated. v3.4.1-1748-gb1ee0f0

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b1ee0f0c0c6999b4c83e66ee6fe009d0c53f8d57 (commit)
       via  26df433e9e54e6a2c6bc862e2b19ad63c037082d (commit)
      from  abe5e4a93c0f0a2041cf670371c4b8604595ae59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1ee0f0c0c6999b4c83e66ee6fe009d0c53f8d57
commit b1ee0f0c0c6999b4c83e66ee6fe009d0c53f8d57
Merge: abe5e4a 26df433
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Dec 15 12:35:54 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 15 12:35:54 2015 -0500

    Merge topic 'release-wix-config-ng' into next
    
    26df433e CMake: !fixup Support downgrades with WiX installers


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26df433e9e54e6a2c6bc862e2b19ad63c037082d
commit 26df433e9e54e6a2c6bc862e2b19ad63c037082d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Dec 15 18:22:34 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Dec 15 18:22:34 2015 +0100

    CMake: !fixup Support downgrades with WiX installers

diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 09568c3..25af0c9 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -252,6 +252,10 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
     "@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch_path_env.xml"
   )
 
+  set(CPACK_WIX_TEMPLATE
+    "@CMake_SOURCE_DIR@/Utilities/Release/WiX/WIX.template.in"
+  )
+
   set(BUILD_QtDialog "@BUILD_QtDialog@")
 
   if(BUILD_QtDialog)
diff --git a/Utilities/Release/WiX/WIX.template.in b/Utilities/Release/WiX/WIX.template.in
new file mode 100644
index 0000000..8f10f61
--- /dev/null
+++ b/Utilities/Release/WiX/WIX.template.in
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?include "cpack_variables.wxi"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+    RequiredVersion="3.6.3303.0">
+
+    <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
+        Name="$(var.CPACK_PACKAGE_NAME)"
+        Language="1033"
+        Version="$(var.CPACK_PACKAGE_VERSION)"
+        Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
+        UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
+
+        <Package InstallerVersion="301" Compressed="yes"/>
+
+        <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
+
+        <MajorUpgrade
+            Schedule="afterInstallInitialize"
+            AllowDowngrades="yes"/>
+
+        <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="$(var.CPACK_WIX_UI_REF)" />
+
+        <?include "properties.wxi"?>
+        <?include "product_fragment.wxi"?>
+    </Product>
+</Wix>

-----------------------------------------------------------------------

Summary of changes:
 CMakeCPackOptions.cmake.in                         |    4 ++++
 {Modules => Utilities/Release/WiX}/WIX.template.in |    3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)
 copy {Modules => Utilities/Release/WiX}/WIX.template.in (90%)


hooks/post-receive
-- 
CMake