Add a script to create macOS installer packages.
diff --git a/packaging/createmsi.py b/packaging/createmsi.py
old mode 100644
new mode 100755
index 1136681..fa1e644
--- a/packaging/createmsi.py
+++ b/packaging/createmsi.py
@@ -39,6 +39,48 @@
'''
return str(uuid.uuid4()).upper()
+def get_all_modules_from_dir(dirname):
+ '''
+ Get all modules required for Meson build MSI package
+ from directories.
+ '''
+ modname = os.path.basename(dirname)
+ modules = [os.path.splitext(os.path.split(x)[1])[0] for x in glob(os.path.join(dirname, '*'))]
+ modules = ['mesonbuild.' + modname + '.' + x for x in modules if not x.startswith('_')]
+ return modules
+
+def get_more_modules():
+ '''
+ Getter for missing Modules.
+ Python packagers want to be minimal and only copy the things
+ that they can see that being used. They are blind to many things.
+ '''
+ return ['distutils.archive_util',
+ 'distutils.cmd',
+ 'distutils.config',
+ 'distutils.core',
+ 'distutils.debug',
+ 'distutils.dep_util',
+ 'distutils.dir_util',
+ 'distutils.dist',
+ 'distutils.errors',
+ 'distutils.extension',
+ 'distutils.fancy_getopt',
+ 'distutils.file_util',
+ 'distutils.spawn',
+ 'distutils.util',
+ 'distutils.version',
+ 'distutils.command.build_ext',
+ 'distutils.command.build',
+ 'filecmp',
+ ]
+
+def get_modules():
+ modules = get_all_modules_from_dir('mesonbuild/modules')
+ modules += get_all_modules_from_dir('mesonbuild/scripts')
+ modules += get_more_modules()
+ return modules
+
class Node:
'''
Node to hold path and directory values
@@ -107,44 +149,6 @@
for s_d in self.staging_dirs:
self.feature_components[s_d] = []
- @staticmethod
- def get_all_modules_from_dir(dirname):
- '''
- Get all modules required for Meson build MSI package
- from directories.
- '''
- modname = os.path.basename(dirname)
- modules = [os.path.splitext(os.path.split(x)[1])[0] for x in glob(os.path.join(dirname, '*'))]
- modules = ['mesonbuild.' + modname + '.' + x for x in modules if not x.startswith('_')]
- return modules
-
- @staticmethod
- def get_more_modules():
- '''
- Getter for missing Modules.
- Python packagers want to be minimal and only copy the things
- that they can see that being used. They are blind to many things.
- '''
- return ['distutils.archive_util',
- 'distutils.cmd',
- 'distutils.config',
- 'distutils.core',
- 'distutils.debug',
- 'distutils.dep_util',
- 'distutils.dir_util',
- 'distutils.dist',
- 'distutils.errors',
- 'distutils.extension',
- 'distutils.fancy_getopt',
- 'distutils.file_util',
- 'distutils.spawn',
- 'distutils.util',
- 'distutils.version',
- 'distutils.command.build_ext',
- 'distutils.command.build',
- 'filecmp',
- ]
-
def build_dist(self):
'''
Build dist file from PyInstaller info
@@ -153,9 +157,7 @@
if os.path.exists(sdir):
shutil.rmtree(sdir)
main_stage, ninja_stage = self.staging_dirs
- modules = self.get_all_modules_from_dir('mesonbuild/modules')
- modules += self.get_all_modules_from_dir('mesonbuild/scripts')
- modules += self.get_more_modules()
+ modules = get_modules()
pyinstaller = shutil.which('pyinstaller')
if not pyinstaller:
diff --git a/packaging/createpkg.py b/packaging/createpkg.py
new file mode 100755
index 0000000..ab3c51c
--- /dev/null
+++ b/packaging/createpkg.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+
+# Copyright 2017-2021 The Meson development team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import subprocess
+import shutil, sys, os
+
+import xml.etree.ElementTree as ET
+
+sys.path.append(os.getcwd())
+from mesonbuild import coredata
+
+from packaging.createmsi import get_modules
+
+class PkgGenerator:
+
+ def __init__(self):
+ self.pkg_dir = 'macpkg'
+ self.sharedir = os.path.join(self.pkg_dir, 'usr/local/share')
+ self.bindir = os.path.join(self.pkg_dir, 'usr/local/bin')
+ self.product_name = 'Meson Build System'
+ self.identifier = 'com.mesonbuild.meson'
+ self.version = coredata.version.replace('dev', '')
+ self.mesonstashdir = os.path.join(self.sharedir, f'meson-{self.version}')
+ self.pkgname = f'meson.pkg'
+ self.productname = f'meson-{self.version}.pkg'
+ self.distribution_file = 'meson-distribution.xml'
+ self.resourcedir = 'packaging/macpages'
+
+ def build_dist(self):
+ if os.path.exists(self.pkg_dir):
+ shutil.rmtree(self.pkg_dir)
+ os.mkdir(self.pkg_dir)
+ pyinstaller_bin = '/Users/jpakkane/Library/Python/3.8/bin/pyinstaller'
+ pyinst_cmd = [pyinstaller_bin,
+ '--clean',
+ '--distpath',
+ self.pkg_dir]
+ for m in get_modules():
+ pyinst_cmd += ['--hidden-import', m]
+ pyinst_cmd += ['meson.py']
+ subprocess.check_call(pyinst_cmd )
+ tmpdir = os.path.join(self.pkg_dir, 'meson')
+ shutil.move(tmpdir, self.mesonstashdir)
+ os.makedirs(self.bindir)
+ ln_base = os.path.relpath(self.mesonstashdir, self.bindir)
+ ninja_bin = shutil.which('ninja')
+ assert(ninja_bin)
+ shutil.copy(ninja_bin, self.bindir)
+ subprocess.check_call(['strip', os.path.join(self.bindir, 'ninja')])
+ os.symlink(os.path.join(ln_base, 'meson'), os.path.join(self.bindir, 'meson'))
+
+ def build_package(self):
+ subprocess.check_call(['pkgbuild',
+ '--root',
+ self.pkg_dir,
+ '--identifier',
+ self.identifier,
+ self.pkgname])
+ self.generate_distribution()
+ subprocess.check_call(['productbuild',
+ '--distribution',
+ self.distribution_file,
+ '--resources',
+ self.resourcedir,
+ self.productname])
+
+ def generate_distribution(self):
+ root = ET.Element('installer-gui-script', {'minSpecVersion': '1'})
+ ET.SubElement(root, 'welcome', {'file': 'welcome.html',
+ 'mime-type': 'text/html'})
+ ET.SubElement(root, 'license', {'file': 'license.html',
+ 'mime-type': 'text/html'})
+ ET.SubElement(root, 'conclusion', {'file': 'conclusion.html',
+ 'mime-type': 'text/html'})
+ ET.SubElement(root, 'pkg-ref', {'id': self.identifier})
+ ET.SubElement(root, 'options', {'customize': 'never',
+ 'require-scripts': 'false',
+ 'hostArhcitectures': 'x86_64,arm64'})
+ choices_outline = ET.SubElement(root, 'choices-outline')
+ line = ET.SubElement(choices_outline, 'line', {'choice': 'default'})
+ ET.SubElement(line, 'line', {'choice': self.identifier})
+ ET.SubElement(root, 'choice', {'id': 'default'})
+ choice = ET.SubElement(root, 'choice', {'id': self.identifier, 'visible': 'false'})
+ ET.SubElement(choice, 'pkg-ref', {'id': self.identifier})
+ ET.SubElement(root, 'pkg-ref', {'id': self.identifier,
+ 'version': '0',#self.version,
+ 'onConclusion': 'none'}).text = self.pkgname
+ ET.ElementTree(root).write(self.distribution_file, encoding='utf-8', xml_declaration=True)
+ # ElementTree can not do prettyprinting so do it manually
+ import xml.dom.minidom
+ doc = xml.dom.minidom.parse(self.distribution_file)
+ with open(self.distribution_file, 'w') as open_file:
+ open_file.write(doc.toprettyxml())
+
+
+if __name__ == '__main__':
+ if not os.path.exists('meson.py'):
+ sys.exit(print('Run me in the top level source dir.'))
+ subprocess.check_call(['pip3', 'install', '--user', '--upgrade', 'pyinstaller'])
+
+ pg = PkgGenerator()
+ pg.build_dist()
+ pg.build_package()
+
diff --git a/packaging/macpages/English.lproj/conclusion.html b/packaging/macpages/English.lproj/conclusion.html
new file mode 100644
index 0000000..0522455
--- /dev/null
+++ b/packaging/macpages/English.lproj/conclusion.html
@@ -0,0 +1,24 @@
+<html>
+ <head>
+ </head>
+ <body>
+
+ <h1>Install finished</h1>
+
+ <p>The Meson build system is now installed. Note that Meson does not
+ provide any GUI applications, it is only usable from the command
+ line. You can verify if your installation of Meson is working by
+ running the following command in a terminal
+ </p>
+
+ <pre>
+ $ meson --version
+ </pre>
+
+ <p>If the system reports that the program could not be found
+ you might need to edit your configuration files so
+ that <code>/usr/local/bin</code> is in your path.
+ </p>
+
+ </body>
+</html>
diff --git a/packaging/macpages/English.lproj/license.html b/packaging/macpages/English.lproj/license.html
new file mode 100644
index 0000000..235e582
--- /dev/null
+++ b/packaging/macpages/English.lproj/license.html
@@ -0,0 +1,209 @@
+<html>
+ <head>
+ </head>
+ <body>
+ <pre>
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ <pre>
+ </body>
+</html>
diff --git a/packaging/macpages/English.lproj/welcome.html b/packaging/macpages/English.lproj/welcome.html
new file mode 100644
index 0000000..3832223
--- /dev/null
+++ b/packaging/macpages/English.lproj/welcome.html
@@ -0,0 +1,12 @@
+<html>
+ <head>
+ </head>
+ <body>
+
+ <h1>Meson build system installer</h1>
+
+ <p> This package will install the command line tools of Meson to
+ this computer.
+ </p>
+ </body>
+</html>
