This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7170

packaging: stop installing Contributors.txt
ClosedPublic

Authored by indygreg on Oct 23 2019, 9:54 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG2574330dd0f6: packaging: stop installing Contributors.txt

Summary

This file isn't up to date. If we are going to call out
contributors, we should auto generate a file from hg log
or something. I don't think we need to include it in the
Windows install.

This change makes Inno more consistent with WiX, which
doesn't ship this file.

Diff Detail

Repository

rHG Mercurial

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

indygreg created this revision.Oct 23 2019, 9:54 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 23 2019, 9:54 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

indygreg added a child revision: D7171: packaging: write out editor.rc in Python.Oct 23 2019, 9:54 PM

indygreg updated this revision to Diff 17404.Oct 24 2019, 11:34 PM

indygreg added a commit: rHG2574330dd0f6: packaging: stop installing Contributors.txt.Nov 11 2019, 4:09 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG2574330dd0f6: packaging: stop installing Contributors.txt (authored by indygreg). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/packaging/hgpackaging/py2exe.py (1 line)
M			contrib/win32/ReadMe.html (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17391		Oct 23 2019, 9:54 PM	★	★
Diff 2	17404		Oct 24 2019, 11:34 PM	★	★
Diff 3	18023	rHG2574330dd0f69b67029ee8ed822502b551bc8f4a	Oct 23 2019, 4:25 PM	★	★

Commit	Parents	Author	Summary	Date
509a52c6aa57	6f0a0d7580f7	Gregory Szorc		Oct 23 2019, 4:25 PM

Status	Author	Revision
Closed	indygreg	D7173 packaging: stage files and dynamically generate WiX installer
Closed	indygreg	D7172 packaging: use lower case for RC files
Closed	indygreg	D7171 packaging: write out editor.rc in Python
Closed	indygreg	D7170 packaging: stop installing Contributors.txt
Closed	indygreg	D7169 packaging: remove hg-ssh.8.html from Inno installer
Closed	indygreg	D7168 packaging: install .rc files to hgrc.d
Closed	indygreg	D7167 packaging: install contrib/mq.el on WiX
Closed	indygreg	D7166 packaging: ship all help .txt files on WiX
Closed	indygreg	D7165 packaging: stop installing i18n files
Closed	indygreg	D7164 packaging: install hgk as hgk.tcl
Closed	indygreg	D7163 packaging: add logo-droplets.svg
Closed	indygreg	D7162 packaging: install documentation to doc/ directory
Closed	indygreg	D7161 packaging: always pass VERSION into Inno invocation
Closed	indygreg	D7160 packaging: remove hg.exe.local file
Closed	indygreg	D7159 packaging: stage installed files for Inno
Closed	indygreg	D7158 packaging: process Inno Setup files with Jinja2
Closed	indygreg	D7157 packaging: install and run Inno files in a build directory
Closed	indygreg	D7156 packaging: consolidate CLI functionality into packaging.py
Closed	indygreg	D7155 packaging: clean up excess packages for Inno
Abandoned	indygreg	D7154 tests: run black on run-tests.py

Diff 17404

contrib/packaging/hgpackaging/py2exe.py

	('dist/msvc*.dll', './'),			('dist/msvc*.dll', './'),
	('dist/python*.dll', './'),			('dist/python*.dll', './'),
	('doc/*.html', 'doc/'),			('doc/*.html', 'doc/'),
	('doc/style.css', 'doc/'),			('doc/style.css', 'doc/'),
	('mercurial/help/*/.txt', 'help/'),			('mercurial/help/*/.txt', 'help/'),
	('mercurial/default.d/*.rc', 'hgrc.d/'),			('mercurial/default.d/*.rc', 'hgrc.d/'),
	('mercurial/locale/*/', 'locale/'),			('mercurial/locale/*/', 'locale/'),
	('mercurial/templates/*/', 'Templates/'),			('mercurial/templates/*/', 'Templates/'),
	('CONTRIBUTORS', 'Contributors.txt'),
	('COPYING', 'Copying.txt'),			('COPYING', 'Copying.txt'),
	]			]

	# List of paths to exclude from the staging area.			# List of paths to exclude from the staging area.
	STAGING_EXCLUDES = [			STAGING_EXCLUDES = [
	'doc/hg-ssh.8.html',			'doc/hg-ssh.8.html',
	]			]

contrib/win32/ReadMe.html

	</p>			</p>

	<p>			<p>
	The Windows installer was written by <a			The Windows installer was written by <a
	href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.			href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.
	</p>			</p>

	<p>			<p>
	Mercurial is Copyright 2005-2019 Matt Mackall and others. See			Mercurial is Copyright 2005-2019 Matt Mackall and others.
	the <tt>Contributors.txt</tt> file for a list of contributors.
	</p>			</p>

	<p>			<p>
	Mercurial is free software; you can redistribute it and/or			Mercurial is free software; you can redistribute it and/or
	modify it under the terms of the <a			modify it under the terms of the <a
	href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU			href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
	General Public License version 2</a> or any later version.			General Public License version 2</a> or any later version.
	</p>			</p>