[Tools v2] testbot: Run make_makefiles when a file is added or removed.

[Francois Gouget]

That works.

On Wed, 29 Nov 2017, Zebediah Figura wrote:

> Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
> ---
> v2: also run 'git add -A' so that new files will actually be seen by
> make_makefiles.
> 
>  testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++--
>  1 file changed, 22 insertions(+), 2 deletions(-)
> 
> diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
> index 051039f..cf1f1f3 100755
> --- a/testbot/bin/build/Build.pl
> +++ b/testbot/bin/build/Build.pl
[...]
> @@ -111,13 +112,18 @@ sub ApplyPatch($$$)
>        {
>          $NeedConfigure = 1;
>        }
> +      elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename=)
> +      {
> +        $NeedMakeMakefiles = 1;

+        $NeedMakeMakefiles = $NeedConfigure = 1;

Just a nitpick: I would also set NeedConfigure here so we can get out of 
the loop early if all the $NeedXxx are set (not that this is really 
likely to happen but it would be in keeping with the current spirit of 
the code).


[...]
> +  if ($NeedMakeMakefiles)
> +  {
> +    InfoMsg "Running make_makefiles\n";
> +    system("( cd $DataDir/wine && set -x && " .
> +           " ./tools/make_makefiles " .
> +           ") >> $LogDir/Build.log 2>&1");
> +    if ($? != 0)
> +    {
> +      LogMsg "make_makefiles failed\n";
> +      return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure);
> +    }
> +    $NeedConfigure = 1;

And then we don't need this one.


-- 
Francois Gouget <fgouget at codeweavers.com>