Git commit 8a270eeabc2258b895f78ddcca7e0c5449ce42f8 by Michael Pyne. Committed on 13/02/2010 at 04:12. Pushed by ashark into branch 'docbook_historied_per_file'.
Add a feature to kdesvn-build contributed by Tom Albers, --resume-after. It's just like --resume-from, except that if you've already verified that your fix allows the module to build and install there's no reason to run kdesvn-build through the same process again. Using --resume-after tells kdesvn-build to pick up with the module after the one you've supplied (which would normally be the module that failed). CCMAIL:[email protected] svn path=/trunk/KDE/kdesdk/doc/scripts/kdesvn-build/; revision=1089384 Original commit: 4506f185 https://invent.kde.org/sdk/kdesrc-build/-/commit/4506f18570e209a96441278c1443e66ec67810fb M +20 -1 doc/cmdline/supported-cmdline-params.docbook M +1 -0 doc/index.docbook M +12 -3 doc/using-kdesvn-build/advanced-features.docbook https://invent.kde.org/sdk/kdesrc-build/-/commit/8a270eeabc2258b895f78ddcca7e0c5449ce42f8 diff --git a/doc/cmdline/supported-cmdline-params.docbook b/doc/cmdline/supported-cmdline-params.docbook index 08c5757e..f068282f 100644 --- a/doc/cmdline/supported-cmdline-params.docbook +++ b/doc/cmdline/supported-cmdline-params.docbook @@ -204,7 +204,26 @@ 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 specify other module names on the command line. -</para></listitem> +</para> +<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 &kdesvn-build; to complete the +build.</para></listitem> +</varlistentry> + +<varlistentry id="cmdline-resume-after"> +<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 +specify other module names on the command line. +</para> +<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 +yourself, and want &kdesvn-build; to start again with the next +module.</para></listitem> </varlistentry> <varlistentry id="cmdline-rc-file"> diff --git a/doc/index.docbook b/doc/index.docbook index c1fdfe55..62b1b51a 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -46,6 +46,7 @@ <!ENTITY cmd-nice '<link linkend="cmdline-nice">--nice</link>'> <!ENTITY cmd-ignore-modules '<link linkend="cmdline-ignore-modules">--ignore-modules</link>'> <!ENTITY cmd-resume-from '<link linkend="cmdline-resume-from">--resume-from</link>'> + <!ENTITY cmd-resume-after '<link linkend="cmdline-resume-after">--resume-after</link>'> <!ENTITY cmd-reconfigure '<link linkend="cmdline-reconfigure">--reconfigure</link>'> <!ENTITY cmd-refresh-build '<link linkend="cmdline-refresh-build">--refresh-build</link>'> <!ENTITY introduction SYSTEM "introduction/index.docbook"> diff --git a/doc/using-kdesvn-build/advanced-features.docbook b/doc/using-kdesvn-build/advanced-features.docbook index c034de01..79fef174 100644 --- a/doc/using-kdesvn-build/advanced-features.docbook +++ b/doc/using-kdesvn-build/advanced-features.docbook @@ -319,10 +319,10 @@ end global <para>You can tell &kdesvn-build; to start building from a different module 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.</para> +&cmd-resume-from; option and the &cmd-resume-after; option.</para> -<note><para>Using &cmd-resume-from; will skip the source code update.</para> -</note> +<note><para>Using either of the resume options will skip the source code +update.</para> </note> <informalexample> <para>Resuming the build starting from kdebase:</para> @@ -332,6 +332,15 @@ if you canceled a build run in the middle. You can control this using the </screen> </informalexample> +<informalexample> +<para>Resuming the build starting after kdebase (in case you manually fixed +the issue and installed the module yourself):</para> + +<screen> +<prompt>%</prompt> <userinput><command>kdesvn-build</command> <option>--resume-after=<replaceable>kdebase</replaceable></option></userinput> +</screen> +</informalexample> + </sect3> <sect3 id="ignoring-modules">
