D6096: wix: move contrib/wix to contrib/packaging/wix

[indygreg (Gregory Szorc)]

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  We're trying to consolidate all our packaging code into
  contrib/packaging. Let's move the WiX files there.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6096

AFFECTED FILES
  contrib/packaging/wix/COPYING.rtf
  contrib/packaging/wix/README.txt
  contrib/packaging/wix/contrib.wxs
  contrib/packaging/wix/defines.wxi
  contrib/packaging/wix/dist.wxs
  contrib/packaging/wix/doc.wxs
  contrib/packaging/wix/guids.wxi
  contrib/packaging/wix/help.wxs
  contrib/packaging/wix/i18n.wxs
  contrib/packaging/wix/locale.wxs
  contrib/packaging/wix/mercurial.wxs
  contrib/packaging/wix/templates.wxs
  contrib/wix/COPYING.rtf
  contrib/wix/README.txt
  contrib/wix/contrib.wxs
  contrib/wix/defines.wxi
  contrib/wix/dist.wxs
  contrib/wix/doc.wxs
  contrib/wix/guids.wxi
  contrib/wix/help.wxs
  contrib/wix/i18n.wxs
  contrib/wix/locale.wxs
  contrib/wix/mercurial.wxs
  contrib/wix/templates.wxs
  tests/test-install.t

CHANGE DETAILS

diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -196,7 +196,7 @@
   > 
   > tracked = [f for f in hgdirectory(sys.argv[1])]
   > 
-  > xml = ET.parse("%s/../contrib/wix/%s.wxs" % (testdir, sys.argv[1]))
+  > xml = ET.parse("%s/../contrib/packaging/wix/%s.wxs" % (testdir, sys.argv[1]))
   > root = xml.getroot()
   > dir = root.find('.//{%(wix)s}DirectoryRef' % ns)
   > 
diff --git a/contrib/wix/templates.wxs b/contrib/packaging/wix/templates.wxs
rename from contrib/wix/templates.wxs
rename to contrib/packaging/wix/templates.wxs
diff --git a/contrib/wix/mercurial.wxs b/contrib/packaging/wix/mercurial.wxs
rename from contrib/wix/mercurial.wxs
rename to contrib/packaging/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/packaging/wix/mercurial.wxs
@@ -69,7 +69,7 @@
                     KeyPath='yes'/>
           </Component>
           <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>
-            <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf'
+            <File Id='COPYING' Name='COPYING.rtf' Source='contrib\packaging\wix\COPYING.rtf'
                   KeyPath='yes'/>
           </Component>
 
@@ -144,7 +144,7 @@
     <UIRef Id="WixUI_FeatureTree" />
     <UIRef Id="WixUI_ErrorProgressText" />
 
-    <WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="contrib\packaging\wix\COPYING.rtf" />
 
     <Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" />
 
diff --git a/contrib/wix/locale.wxs b/contrib/packaging/wix/locale.wxs
rename from contrib/wix/locale.wxs
rename to contrib/packaging/wix/locale.wxs
diff --git a/contrib/wix/i18n.wxs b/contrib/packaging/wix/i18n.wxs
rename from contrib/wix/i18n.wxs
rename to contrib/packaging/wix/i18n.wxs
diff --git a/contrib/wix/help.wxs b/contrib/packaging/wix/help.wxs
rename from contrib/wix/help.wxs
rename to contrib/packaging/wix/help.wxs
diff --git a/contrib/wix/guids.wxi b/contrib/packaging/wix/guids.wxi
rename from contrib/wix/guids.wxi
rename to contrib/packaging/wix/guids.wxi
diff --git a/contrib/wix/doc.wxs b/contrib/packaging/wix/doc.wxs
rename from contrib/wix/doc.wxs
rename to contrib/packaging/wix/doc.wxs
diff --git a/contrib/wix/dist.wxs b/contrib/packaging/wix/dist.wxs
rename from contrib/wix/dist.wxs
rename to contrib/packaging/wix/dist.wxs
diff --git a/contrib/wix/defines.wxi b/contrib/packaging/wix/defines.wxi
rename from contrib/wix/defines.wxi
rename to contrib/packaging/wix/defines.wxi
diff --git a/contrib/wix/contrib.wxs b/contrib/packaging/wix/contrib.wxs
rename from contrib/wix/contrib.wxs
rename to contrib/packaging/wix/contrib.wxs
diff --git a/contrib/wix/README.txt b/contrib/packaging/wix/README.txt
rename from contrib/wix/README.txt
rename to contrib/packaging/wix/README.txt
diff --git a/contrib/wix/COPYING.rtf b/contrib/packaging/wix/COPYING.rtf
rename from contrib/wix/COPYING.rtf
rename to contrib/packaging/wix/COPYING.rtf



To: indygreg, #hg-reviewers
Cc: mercurial-devel