Git commit 1967eb5ebe5b757e2e20e140e49d32a31f34d63e by Nate Graham, on behalf of Andrew Shark. Committed on 29/11/2023 at 16:32. Pushed by ashark into branch 'docbook_historied_per_file'.
Delete the kdesrc-build-setup This is duplicating the work of --generate-config. But it is mostly broken and creates redundant source of "options defaults", see #132 Can I be made the maintainer of this project? Original commit: 036f5092 https://invent.kde.org/sdk/kdesrc-build/-/commit/036f5092adc382e3cc0e4c5a4946b1dbcb10ec03 M +2 -9 doc/getting-started/before-building.docbook M +2 -4 doc/kdesrc-buildrc/conf-options-table.docbook https://invent.kde.org/sdk/kdesrc-build/-/commit/1967eb5ebe5b757e2e20e140e49d32a31f34d63e diff --git a/doc/getting-started/before-building.docbook b/doc/getting-started/before-building.docbook index b4853081..3e6a70fd 100644 --- a/doc/getting-started/before-building.docbook +++ b/doc/getting-started/before-building.docbook @@ -157,16 +157,11 @@ This file is located at <filename>~/.config/kdesrc-buildrc</filename> (<filename>$XDG_CONFIG_HOME/kdesrc-buildrc</filename>, if <envar>$XDG_CONFIG_HOME</envar> is set).</para> -<para>You can use a program included with &kdesrc-build;, called -<application>kdesrc-build-setup</application> in order to prepare a simple +<para>You can use <application>kdesrc-build --generate-config</application> in order to prepare a simple kdesrc-build configuration. You can then edit the <filename>~/.config/kdesrc-buildrc</filename> configuration file to make any changes you see fit.</para> -<para><application>kdesrc-build-setup</application> itself runs from a terminal -(instead of using a graphical interface), just like &kdesrc-build;, so you can -use it even if you have no graphical interface available yet.</para> - <sect4 id="setup-rcfile-manually"> <title>Manual setup of configuration file</title> @@ -178,9 +173,7 @@ its <link linkend="conf-options-table">table of configuration options</link>. </para> <para>&kdesrc-build; contains many recommended configuration files to support -&kde; Frameworks 5, &plasma; 5, and other &kde; applications. The -<application>kdesrc-build-setup</application> refers to these files in the -configuration file it generates, but you can also use them yourself. See +&kde; Frameworks 5, &plasma; 5, and other &kde; applications. See <xref linkend="kdesrc-buildrc-including"/> for information on how to use other configuration files from your own <filename>kdesrc-buildrc</filename>. </para> diff --git a/doc/kdesrc-buildrc/conf-options-table.docbook b/doc/kdesrc-buildrc/conf-options-table.docbook index 5545dc53..038b25e0 100644 --- a/doc/kdesrc-buildrc/conf-options-table.docbook +++ b/doc/kdesrc-buildrc/conf-options-table.docbook @@ -280,8 +280,7 @@ number, the "nicer" the program is.</para> <member>Default value</member><member>Depends on system</member> <member>Available since</member><member>20.07</member> </simplelist> -<para>This option is defined by &kdesrc-build; (when using the kdesrc-build-setup tool -or <command>kdesrc-build --generate-config</command>), set to be the number of +<para>This option is defined by &kdesrc-build; (when using <command>kdesrc-build --generate-config</command>), set to be the number of available CPUs (as indicated by the external application <application>nproc</application>). If &kdesrc-build; cannot detect the number of CPUs, this value is set to 4.</para> @@ -299,8 +298,7 @@ option's usage.</para> <member>Default value</member><member>Depends on system</member> <member>Available since</member><member>20.07</member> </simplelist> -<para>This option is defined by &kdesrc-build; (when using the kdesrc-build-setup tool -or <command>kdesrc-build --generate-config</command>), set to be the number of +<para>This option is defined by &kdesrc-build; (when using <command>kdesrc-build --generate-config</command>), set to be the number of CPUs that is deemed safe for heavyweight or other highly-intensive modules, such as <literal>qtwebengine</literal>, to avoid running out of memory during the build.</para>