[Webkit-unassigned] [Bug 27619] Switch wx to using waf for builds

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=27619





--- Comment #7 from Jan Alonzo <jmalonzo at gmail.com>  2009-07-31 21:44:03 PDT ---
(From update of attachment 33374)
> +    # get / update waf if needed
> +    my $waf = 'WebKitTools/wx/waf';
> +    my $wafURL = 'http://wxwebkit.wxcommunity.com/downloads/deps/waf';
> +    if (!-f $waf) {
> +        my $result = system "curl -o $waf $wafURL";
> +        chmod 0755, $waf;
> +    }

Is downloading waf easier for wx instead of just making it a dependency?

> @@ -323,6 +340,16 @@
>          if ($dir eq "WebKit") {
>              $result = buildVisualStudioProject("win/WebKit.vcproj/WebKit.sln", $clean);
>          }
> +    } elsif (isWx()) {
> +        @options = ();
> +        if (defined($makeArgs)) {
> +            @options = split(/ /, $makeArgs);
> +        }
> +        if ($dir eq "WebKit" && isWx()) {
> +            chdir 'wx' or die;

Is there a reason why you're checking for isWx() twice?

> +        }
> +            
> +        $result = buildWafProject($dir, $clean, @options);
>      }
>  
>      if (exitStatus($result)) {
> @@ -335,7 +362,7 @@
>          }
>          exit exitStatus($result);
>      }
> -    chdir ".." or die;
> +    chdirWebKit();

Any reason for this change?

>  }
>  
>  # Don't report the "WebKit is now built" message after a clean operation.
> @@ -349,7 +376,11 @@
>  print "\n";
>  print "===========================================================\n";
>  print " WebKit is now built. To run $launcherName with this newly-built\n";
> -print " code, use the \"$launcherPath\" script.\n";
> +if (isWx()) {
> +    print " code, run \"$launcherPath\".\n";
> +} else {
> +    print " code, use the \"$launcherPath\" script.\n";
> +}

I think you should just add --wx support to run-launcher so we can avoid
conditionalizing this.

> +    } elsif (isWx()) {
> +        return productDir() . '/wxBrowser';

See my comment above to add --wx support to run-launcher.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.