From 72e40248e1f0e651b3c4053945f86907d73a5ec5 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 22 May 2021 17:55:49 +0100 Subject: [PATCH] chore(cli): remove deprecated flags and update readme usage --- README.md | 8 ++++---- build-emacs-for-macos | 19 +------------------ 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index f011f24..104fc7e 100644 --- a/README.md +++ b/README.md @@ -72,14 +72,14 @@ available here: https://github.com/emacs-mirror/emacs Options: -j, --parallel COUNT Compile using COUNT parallel processes (detected: 8) --git-sha SHA Override detected git SHA of specified branch allowing builds of old commits - --[no-]xwidgets Enable/disable XWidgets (default: enabled if supported) + --[no-]xwidgets Enable/disable XWidgets if supported (default: enabled) --[no-]native-comp Enable/disable native-comp (default: enabled if supported) --[no-]native-full-aot Enable/disable NATIVE_FULL_AOT / Ahead of Time compilation (default: disabled) - --rsvg Enable SVG image support via librsvg, can yield a unstable build (default: disabled) + --[no-]rsvg Enable/disable SVG image support via librsvg (default: enabled) --no-titlebar Apply no-titlebar patch (default: disabled) --no-frame-refocus Apply no-frame-refocus patch (default: disabled) - --[no-]native-fast-boot DEPRECATED: use --[no-]native-full-aot instead - --[no-]launcher DEPRECATED: Launcher script is no longer used. + --work-dir DIR Specify a working directory where tarballs, sources, and builds will be stored and worked with + --plan FILE Follow given plan file, instead of using given git ref/sha ``` Resulting applications are saved to the `builds` directory in a bzip2 compressed diff --git a/build-emacs-for-macos b/build-emacs-for-macos index 0070a5f..4cd1ea5 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -863,7 +863,7 @@ if __FILE__ == $PROGRAM_NAME opts.on('-j', '--parallel COUNT', 'Compile using COUNT parallel processes ' \ - "(default: #{cli_options[:parallel]})") do |v| + "(detected: #{cli_options[:parallel]})") do |v| cli_options[:parallel] = v end @@ -918,23 +918,6 @@ if __FILE__ == $PROGRAM_NAME ) do |v| cli_options[:plan] = v end - - opts.on('--[no-]native-fast-boot', - 'DEPRECATED: use --[no-]native-full-aot instead') do |v| - if v - raise Error, '--native-fast-boot option is deprecated, ' \ - 'use --no-native-full-aot instead' - else - raise Error, '--no-native-fast-boot option is deprecated, ' \ - 'use --native-full-aot instead' - end - end - - opts.on('--[no-]launcher', - 'DEPRECATED: Launcher script is no longer used.') do |_| - raise Error, '--[no-]launcher option is deprecated, launcher ' \ - 'script is no longer used.' - end end.parse! work_dir = cli_options.delete(:work_dir)