Mercurial > hg
changeset 38012:e5d2248dcc39
packaging: move contrib/macosx to contrib/packaging/
And update various references throughout the code.
Differential Revision: https://phab.mercurial-scm.org/D3550
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 12 May 2018 10:57:04 -0700 |
| parents | 6f5b4ceea95b |
| children | 917f635b5c6a |
| files | Makefile contrib/macosx/Readme.html contrib/macosx/Welcome.html contrib/macosx/distribution.xml contrib/packaging/macosx/Readme.html contrib/packaging/macosx/Welcome.html contrib/packaging/macosx/distribution.xml setup.py |
| diffstat | 8 files changed, 80 insertions(+), 80 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat May 12 10:50:30 2018 -0700 +++ b/Makefile Sat May 12 10:57:04 2018 -0700 @@ -197,10 +197,10 @@ --identifier org.mercurial-scm.mercurial \ --version "$${HGVER}" \ build/mercurial.pkg && \ - productbuild --distribution contrib/macosx/distribution.xml \ + productbuild --distribution contrib/packaging/macosx/distribution.xml \ --package-path build/ \ --version "$${HGVER}" \ - --resources contrib/macosx/ \ + --resources contrib/packaging/macosx/ \ "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg deb:
--- a/contrib/macosx/Readme.html Sat May 12 10:50:30 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<!-- This is the second screen displayed during the install. --> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta http-equiv="Content-Style-Type" content="text/css"> - <title>Read Me - Important Information</title> - <style type="text/css"> - p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} - p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} - p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica} - p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed} - span.s1 {text-decoration: underline} - span.s2 {font: 12.0px Courier} - </style> -</head> -<body> -<p class="p1"><b>Before you install</b></p> -<p class="p2"><br></p> -<p class="p3">This is an OS X version of Mercurial that depends on the default Python installation.</p> -<p class="p2"><br></p> -<p class="p1"><b>After you install</b></p> -<p class="p2"><br></p> -<p class="p3">This package installs the <span class="s2">hg</span> executable as <span class="s2">/usr/local/bin/hg</span>. See <span class="s2">hg debuginstall</span> for more info on file locations.</p> -<p class="p2"><br></p> -<p class="p1"><b>Documentation</b></p> -<p class="p2"><br></p> -<p class="p3">Visit the <a href="https://mercurial-scm.org/">Mercurial web site and wiki</a></p> -<p class="p2"><br></p> -<p class="p3">There's also a free book, <a href="https://book.mercurial-scm.org/">Distributed revision control with Mercurial</a></p> -<p class="p2"><br></p> -<p class="p1"><b>Reporting problems</b></p> -<p class="p2"><br></p> -<p class="p3">If you run into any problems, please file a bug online:</p> -<p class="p3"><a href="https://bz.mercurial-scm.org/">https://bz.mercurial-scm.org/</a></p> -</body> -</html>
--- a/contrib/macosx/Welcome.html Sat May 12 10:50:30 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<!-- This is the first screen displayed during the install. --> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta http-equiv="Content-Style-Type" content="text/css"> - <title></title> - <style type="text/css"> - p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} - p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} - </style> -</head> -<body> -<p class="p1">This is a prepackaged release of <a href="https://mercurial-scm.org/">Mercurial</a> for Mac OS X.</p> -<p class="p2"><br></p> -<br> -<p> -Please be sure to read the latest <a href="https://mercurial-scm.org/wiki/WhatsNew">release notes</a>.</p> -</body> -</html>
--- a/contrib/macosx/distribution.xml Sat May 12 10:50:30 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<installer-gui-script minSpecVersion="1"> - <title>Mercurial SCM</title> - <organization>org.mercurial-scm</organization> - <options customize="never" require-scripts="false" rootVolumeOnly="true" /> - <welcome file="Welcome.html" mime-type="text/html" /> - <license file="../../COPYING" mime-type="text/plain" /> - <readme file="Readme.html" mime-type="text/html" /> - <pkg-ref id="org.mercurial-scm.mercurial" - version="0" - auth="root" - onConclusion="none">mercurial.pkg</pkg-ref> - <choices-outline> - <line choice="org.mercurial-scm.mercurial"/> - </choices-outline> - <choice id="org.mercurial-scm.mercurial" visible="false"> - <pkg-ref id="org.mercurial-scm.mercurial"/> - </choice> -</installer-gui-script>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/macosx/Readme.html Sat May 12 10:57:04 2018 -0700 @@ -0,0 +1,37 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<!-- This is the second screen displayed during the install. --> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <title>Read Me - Important Information</title> + <style type="text/css"> + p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} + p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} + p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica} + p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000fed} + span.s1 {text-decoration: underline} + span.s2 {font: 12.0px Courier} + </style> +</head> +<body> +<p class="p1"><b>Before you install</b></p> +<p class="p2"><br></p> +<p class="p3">This is an OS X version of Mercurial that depends on the default Python installation.</p> +<p class="p2"><br></p> +<p class="p1"><b>After you install</b></p> +<p class="p2"><br></p> +<p class="p3">This package installs the <span class="s2">hg</span> executable as <span class="s2">/usr/local/bin/hg</span>. See <span class="s2">hg debuginstall</span> for more info on file locations.</p> +<p class="p2"><br></p> +<p class="p1"><b>Documentation</b></p> +<p class="p2"><br></p> +<p class="p3">Visit the <a href="https://mercurial-scm.org/">Mercurial web site and wiki</a></p> +<p class="p2"><br></p> +<p class="p3">There's also a free book, <a href="https://book.mercurial-scm.org/">Distributed revision control with Mercurial</a></p> +<p class="p2"><br></p> +<p class="p1"><b>Reporting problems</b></p> +<p class="p2"><br></p> +<p class="p3">If you run into any problems, please file a bug online:</p> +<p class="p3"><a href="https://bz.mercurial-scm.org/">https://bz.mercurial-scm.org/</a></p> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/macosx/Welcome.html Sat May 12 10:57:04 2018 -0700 @@ -0,0 +1,20 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<!-- This is the first screen displayed during the install. --> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta http-equiv="Content-Style-Type" content="text/css"> + <title></title> + <style type="text/css"> + p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica} + p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px} + </style> +</head> +<body> +<p class="p1">This is a prepackaged release of <a href="https://mercurial-scm.org/">Mercurial</a> for Mac OS X.</p> +<p class="p2"><br></p> +<br> +<p> +Please be sure to read the latest <a href="https://mercurial-scm.org/wiki/WhatsNew">release notes</a>.</p> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/macosx/distribution.xml Sat May 12 10:57:04 2018 -0700 @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<installer-gui-script minSpecVersion="1"> + <title>Mercurial SCM</title> + <organization>org.mercurial-scm</organization> + <options customize="never" require-scripts="false" rootVolumeOnly="true" /> + <welcome file="Welcome.html" mime-type="text/html" /> + <license file="../../../COPYING" mime-type="text/plain" /> + <readme file="Readme.html" mime-type="text/html" /> + <pkg-ref id="org.mercurial-scm.mercurial" + version="0" + auth="root" + onConclusion="none">mercurial.pkg</pkg-ref> + <choices-outline> + <line choice="org.mercurial-scm.mercurial"/> + </choices-outline> + <choice id="org.mercurial-scm.mercurial" visible="false"> + <pkg-ref id="org.mercurial-scm.mercurial"/> + </choice> +</installer-gui-script>
--- a/setup.py Sat May 12 10:50:30 2018 -0700 +++ b/setup.py Sat May 12 10:57:04 2018 -0700 @@ -1082,8 +1082,8 @@ 'bdist_mpkg': { 'zipdist': False, 'license': 'COPYING', - 'readme': 'contrib/macosx/Readme.html', - 'welcome': 'contrib/macosx/Welcome.html', + 'readme': 'contrib/packaging/macosx/Readme.html', + 'welcome': 'contrib/packaging/macosx/Welcome.html', }, }, **extra)