Git commit f0bc683f56aa4130797d48d6028dd1256090eee4 by Michael Pyne. Committed on 23/02/2011 at 03:45. Pushed by ashark into branch 'docbook_historied_per_file'.
Correct documentation regarding --resume-foo. Original commit: 45128e86 https://invent.kde.org/sdk/kdesrc-build/-/commit/45128e86d0ebb66ef3531416f49e2ac24615ea47 M +18 -4 doc/cmdline/supported-cmdline-params.docbook M +4 -2 doc/using-kdesrc-build/advanced-features.docbook https://invent.kde.org/sdk/kdesrc-build/-/commit/f0bc683f56aa4130797d48d6028dd1256090eee4 diff --git a/doc/cmdline/supported-cmdline-params.docbook b/doc/cmdline/supported-cmdline-params.docbook index 7a3e1e0f..181b1428 100644 --- a/doc/cmdline/supported-cmdline-params.docbook +++ b/doc/cmdline/supported-cmdline-params.docbook @@ -216,10 +216,17 @@ linkend="cmdline-refresh-build">--refresh-build</link></parameter> is used. <term><parameter>--resume-from</parameter></term> <listitem><para> This option is used to resume the build starting from the given module, which -should be the next option on the command line. This option implies <link -linkend="cmdline-no-src"><parameter>--no-src</parameter></link>. You should not +should be the next option on the command line. You should not specify other module names on the command line. </para> + +<note><para>This option formerly added <link + linkend="cmdline-no-src"><parameter>--no-src</parameter></link>, but does +not any longer (since &kdesrc-build; 1.13). If you want to avoid source updates +when resuming, simply pass <option><replaceable>--no-src</replaceable></option> +in addition to the other options. +</para></note> + <para>See also: <xref linkend="cmdline-resume-after"/> and <xref linkend="resuming-failed"/>. You would prefer to use this command line option if you have fixed the build error and want &kdesrc-build; to complete the @@ -230,10 +237,17 @@ build.</para></listitem> <term><parameter>--resume-after</parameter></term> <listitem><para> This option is used to resume the build starting after the given module, which -should be the next option on the command line. This option implies <link -linkend="cmdline-no-src"><parameter>--no-src</parameter></link>. You should not +should be the next option on the command line. You should not specify other module names on the command line. </para> + +<note><para>This option formerly added <link + linkend="cmdline-no-src"><parameter>--no-src</parameter></link>, but does +not any longer (since &kdesrc-build; 1.13). If you want to avoid source updates +when resuming, simply pass <option><replaceable>--no-src</replaceable></option> +in addition to the other options. +</para></note> + <para>See also: <xref linkend="cmdline-resume-from"/> and <xref linkend="resuming-failed"/>. You would prefer to use this command line option if you have fixed the build error and have also built and installed the module diff --git a/doc/using-kdesrc-build/advanced-features.docbook b/doc/using-kdesrc-build/advanced-features.docbook index 37e14d06..fd1deaa6 100644 --- a/doc/using-kdesrc-build/advanced-features.docbook +++ b/doc/using-kdesrc-build/advanced-features.docbook @@ -327,8 +327,10 @@ than it normally would. This can be useful when a set of modules failed, or if you canceled a build run in the middle. You can control this using the &cmd-resume-from; option and the &cmd-resume-after; option.</para> -<note><para>Using either of the resume options will skip the source code -update.</para> </note> +<note><para>Older versions of &kdesrc-build; would skip the source update when +resuming a build. This is no longer done by default, but you can always use +the <option><replaceable>--no-src</replaceable></option> command line option +to skip the source update.</para></note> <informalexample> <para>Resuming the build starting from kdebase:</para>