diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-04-05 01:59:40 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2019-04-05 01:59:40 +0300 |
| commit | 88931266b2d136ce324dbe9d450bac4de246ff62 (patch) | |
| tree | 46e7eea0e3a4f369bd57c24f5a2f2b2840e25a16 /macx | |
| parent | 1813fe1af30ee1a953025ddb3017c2faf0f14ccf (diff) | |
macx/scripts/osxdist.py: add "--no-compat-warning" option
QMake always passes "-arch x86_64" after the parameters specified in our project file, meaning that we can't build the application as 32 bit.
This option allows us to disable the feature (warning when trying to run Mumble on a 32 bit system) for the CI build.
Diffstat (limited to 'macx')
| -rwxr-xr-x | macx/scripts/osxdist.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py index c758bb4b9..9587e7f40 100755 --- a/macx/scripts/osxdist.py +++ b/macx/scripts/osxdist.py @@ -296,7 +296,8 @@ def package_client(): a.copy_resources(['icons/mumble.icns']) a.update_plist() if not options.universal: - a.add_compat_warning() + if options.compat_warning: + a.add_compat_warning() a.set_min_macosx_version('10.6.0') else: a.set_min_macosx_version('10.4.8') @@ -388,6 +389,7 @@ if __name__ == '__main__': parser.add_option('', '--universal', dest='universal', help='Build an universal snapshot.', action='store_true', default=False) parser.add_option('', '--only-appbundle', dest='only_appbundle', help='Only prepare the appbundle. Do not package.', action='store_true', default=False) parser.add_option('', '--only-overlay', dest='only_overlay', help='Only create the overlay installer.', action='store_true', default=False) + parser.add_option('', '--no-compat-warning', dest='compat_warning', help='No warning message when running the image on x86. This option should only be used when the warning application cannot be built as 32 bit (rendering it useless).', action='store_false', default=True) parser.add_option('', '--developer-id', dest='developer_id', help='Identity (Developer ID) to use for code signing. The name is also used for GPG signing. (If not set, no code signing will occur)') parser.add_option('', '--keychain', dest='keychain', help='The keychain to use when invoking code signing utilities. (Defaults to login.keychain', default='login.keychain') parser.add_option('', '--server', dest='server', help='Build a Murmur package.', action='store_true', default=False) |