D3550: packaging: move contrib/macosx to contrib/packaging/
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Sat May 12 21:19:31 UTC 2018
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
And update various references throughout the code.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3550
AFFECTED 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
CHANGE DETAILS
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -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)
diff --git a/contrib/macosx/distribution.xml b/contrib/packaging/macosx/distribution.xml
rename from contrib/macosx/distribution.xml
rename to contrib/packaging/macosx/distribution.xml
--- a/contrib/macosx/distribution.xml
+++ b/contrib/packaging/macosx/distribution.xml
@@ -4,7 +4,7 @@
<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" />
+ <license file="../../../COPYING" mime-type="text/plain" />
<readme file="Readme.html" mime-type="text/html" />
<pkg-ref id="org.mercurial-scm.mercurial"
version="0"
diff --git a/contrib/macosx/Welcome.html b/contrib/packaging/macosx/Welcome.html
rename from contrib/macosx/Welcome.html
rename to contrib/packaging/macosx/Welcome.html
diff --git a/contrib/macosx/Readme.html b/contrib/packaging/macosx/Readme.html
rename from contrib/macosx/Readme.html
rename to contrib/packaging/macosx/Readme.html
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -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:
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list