Show More
@@ -146,9 +146,9 b' def build_installer(source_dir: pathlib.' | |||||
146 |
|
146 | |||
147 | hg_build_dir = source_dir / 'build' |
|
147 | hg_build_dir = source_dir / 'build' | |
148 | dist_dir = source_dir / 'dist' |
|
148 | dist_dir = source_dir / 'dist' | |
|
149 | wix_dir = source_dir / 'contrib' / 'packaging' / 'wix' | |||
149 |
|
150 | |||
150 |
requirements_txt = |
|
151 | requirements_txt = wix_dir / 'requirements.txt' | |
151 | 'wix' / 'requirements.txt') |
|
|||
152 |
|
152 | |||
153 | build_py2exe(source_dir, hg_build_dir, |
|
153 | build_py2exe(source_dir, hg_build_dir, | |
154 | python_exe, 'wix', requirements_txt, |
|
154 | python_exe, 'wix', requirements_txt, | |
@@ -177,11 +177,11 b' def build_installer(source_dir: pathlib.' | |||||
177 | defines = {'Platform': arch} |
|
177 | defines = {'Platform': arch} | |
178 |
|
178 | |||
179 | for wxs, rel_path in SUPPORT_WXS: |
|
179 | for wxs, rel_path in SUPPORT_WXS: | |
180 | wxs = source_dir / 'contrib' / 'packaging' / 'wix' / wxs |
|
180 | wxs = wix_dir / wxs | |
181 | wxs_source_dir = source_dir / rel_path |
|
181 | wxs_source_dir = source_dir / rel_path | |
182 | run_candle(wix_path, build_dir, wxs, wxs_source_dir, defines=defines) |
|
182 | run_candle(wix_path, build_dir, wxs, wxs_source_dir, defines=defines) | |
183 |
|
183 | |||
184 |
source = |
|
184 | source = wix_dir / 'mercurial.wxs' | |
185 | defines['Version'] = version |
|
185 | defines['Version'] = version | |
186 | defines['Comments'] = 'Installs Mercurial version %s' % version |
|
186 | defines['Comments'] = 'Installs Mercurial version %s' % version | |
187 | defines['VCRedistSrcDir'] = str(hg_build_dir) |
|
187 | defines['VCRedistSrcDir'] = str(hg_build_dir) |
General Comments 0
You need to be logged in to leave comments.
Login now