Patchwork D6138: wix: introduce variable to hold path to wix packaging directory

login
register
mail settings
Submitter phabricator
Date March 16, 2019, 3:11 a.m.
Message ID <0088cd0025f033e804ac3afd4f908188@localhost.localdomain>
Download mbox | patch
Permalink /patch/39277/
State Not Applicable
Headers show

Comments

phabricator - March 16, 2019, 3:11 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG39f65c506899: wix: introduce variable to hold path to wix packaging directory (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6138?vs=14501&id=14517

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

AFFECTED FILES
  contrib/packaging/hgpackaging/wix.py

CHANGE DETAILS




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

Patch

diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py
--- a/contrib/packaging/hgpackaging/wix.py
+++ b/contrib/packaging/hgpackaging/wix.py
@@ -146,9 +146,9 @@ 
 
     hg_build_dir = source_dir / 'build'
     dist_dir = source_dir / 'dist'
+    wix_dir = source_dir / 'contrib' / 'packaging' / 'wix'
 
-    requirements_txt = (source_dir / 'contrib' / 'packaging' /
-                        'wix' / 'requirements.txt')
+    requirements_txt = wix_dir / 'requirements.txt'
 
     build_py2exe(source_dir, hg_build_dir,
                  python_exe, 'wix', requirements_txt,
@@ -177,11 +177,11 @@ 
     defines = {'Platform': arch}
 
     for wxs, rel_path in SUPPORT_WXS:
-        wxs = source_dir / 'contrib' / 'packaging' / 'wix' / wxs
+        wxs = wix_dir / wxs
         wxs_source_dir = source_dir / rel_path
         run_candle(wix_path, build_dir, wxs, wxs_source_dir, defines=defines)
 
-    source = source_dir / 'contrib' / 'packaging' / 'wix' / 'mercurial.wxs'
+    source = wix_dir / 'mercurial.wxs'
     defines['Version'] = version
     defines['Comments'] = 'Installs Mercurial version %s' % version
     defines['VCRedistSrcDir'] = str(hg_build_dir)