[PATCH] wix: add new json templates folder to MSI installers

Steve Borho steve at borho.org
Sat May 9 16:06:32 CDT 2015


# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1431205564 18000
#      Sat May 09 16:06:04 2015 -0500
# Branch stable
# Node ID bbf1d15a8951ab6945055b35e3b7710adba40245
# Parent  169d2470d283f19f7c94112dc1eff1d355f29f40
wix: add new json templates folder to MSI installers

diff -r 169d2470d283 -r bbf1d15a8951 contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi	Thu May 07 07:46:39 2015 +0900
+++ b/contrib/wix/guids.wxi	Sat May 09 16:06:04 2015 -0500
@@ -28,6 +28,7 @@
   <?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?>
   <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
   <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?>
+  <?define templates.json.guid = {F535BE7A-EC34-46E0-B9BE-013F3DBAFB19} ?>
   <?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?>
   <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?>
   <?define templates.raw.guid = {834DF8D7-9784-43A6-851D-A96CE1B3575B} ?>
diff -r 169d2470d283 -r bbf1d15a8951 contrib/wix/templates.wxs
--- a/contrib/wix/templates.wxs	Thu May 07 07:46:39 2015 +0900
+++ b/contrib/wix/templates.wxs	Sat May 09 16:06:04 2015 -0500
@@ -12,6 +12,7 @@
       <ComponentRef Id="templates.atom" />
       <ComponentRef Id="templates.coal" />
       <ComponentRef Id="templates.gitweb" />
+      <ComponentRef Id="templates.json" />
       <ComponentRef Id="templates.monoblue" />
       <ComponentRef Id="templates.paper" />
       <ComponentRef Id="templates.raw" />
@@ -36,6 +37,13 @@
           <File Name="map-cmdline.phases" />
         </Component>
 
+        <Directory Id="templates.jsondir" Name="json">
+          <Component Id="templates.json" Guid="$(var.templates.json.guid)" Win64='$(var.IsX64)'>
+            <File Id="json.changelist.tmpl" Name="changelist.tmpl" KeyPath="yes" />
+            <File Id="json.map"             Name="map" />
+          </Component>
+        </Directory>
+
         <Directory Id="templates.atomdir" Name="atom">
           <Component Id="templates.atom" Guid="$(var.templates.atom.guid)" Win64='$(var.IsX64)'>
             <File Id="atom.changelog.tmpl"      Name="changelog.tmpl" KeyPath="yes" />


More information about the Mercurial-devel mailing list