# HG changeset patch # User Gregory Szorc # Date 1526147824 25200 # Node ID e5d2248dcc396305e1d16a9f069509cec2480682 # Parent 6f5b4ceea95b401af1e38c771ee147f151a11fb7 packaging: move contrib/macosx to contrib/packaging/ And update various references throughout the code. Differential Revision: https://phab.mercurial-scm.org/D3550 diff -r 6f5b4ceea95b -r e5d2248dcc39 Makefile --- 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: diff -r 6f5b4ceea95b -r e5d2248dcc39 contrib/macosx/Readme.html --- 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 @@ - - - - - - - Read Me - Important Information - - - -

Before you install

-


-

This is an OS X version of Mercurial that depends on the default Python installation.

-


-

After you install

-


-

This package installs the hg executable as /usr/local/bin/hg. See hg debuginstall for more info on file locations.

-


-

Documentation

-


-

Visit the Mercurial web site and wiki

-


-

There's also a free book, Distributed revision control with Mercurial

-


-

Reporting problems

-


-

If you run into any problems, please file a bug online:

-

https://bz.mercurial-scm.org/

- - diff -r 6f5b4ceea95b -r e5d2248dcc39 contrib/macosx/Welcome.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 @@ - - - - - - - - - - -

This is a prepackaged release of Mercurial for Mac OS X.

-


-
-

-Please be sure to read the latest release notes.

- - diff -r 6f5b4ceea95b -r e5d2248dcc39 contrib/macosx/distribution.xml --- 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 @@ - - - Mercurial SCM - org.mercurial-scm - - - - - mercurial.pkg - - - - - - - diff -r 6f5b4ceea95b -r e5d2248dcc39 contrib/packaging/macosx/Readme.html --- /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 @@ + + + + + + + Read Me - Important Information + + + +

Before you install

+


+

This is an OS X version of Mercurial that depends on the default Python installation.

+


+

After you install

+


+

This package installs the hg executable as /usr/local/bin/hg. See hg debuginstall for more info on file locations.

+


+

Documentation

+


+

Visit the Mercurial web site and wiki

+


+

There's also a free book, Distributed revision control with Mercurial

+


+

Reporting problems

+


+

If you run into any problems, please file a bug online:

+

https://bz.mercurial-scm.org/

+ + diff -r 6f5b4ceea95b -r e5d2248dcc39 contrib/packaging/macosx/Welcome.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 @@ + + + + + + + + + + +

This is a prepackaged release of Mercurial for Mac OS X.

+


+
+

+Please be sure to read the latest release notes.

+ + diff -r 6f5b4ceea95b -r e5d2248dcc39 contrib/packaging/macosx/distribution.xml --- /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 @@ + + + Mercurial SCM + org.mercurial-scm + + + + + mercurial.pkg + + + + + + + diff -r 6f5b4ceea95b -r e5d2248dcc39 setup.py --- 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)