Add "--cairo" flag to 'build-webkit' command

[Brent Fulgham]

The build-webkit Script needs to be extended to allow a user to indicate that they wish to build the Cairo-based webkit.  When the "--cairo" flag is added to the build-webkit command line, the "Debug" and "Release" targets are changed to "Debug_Cairo" and "Release_Cairo".

This option is only honored for the Visual Studio build.  It is ignored for all other build environments (Mac, Qt, GTK, etc.)

[Brent Fulgham]

Created attachment 19887 [details]
Extend build-webkit with new "--cairo" build option

* Add "--cairo" to help screen for build-webkit script.
* Add "isCairo" test and when present for the Visual Studio build switch to the Cairo debug/release targets.

[Eric Seidel (no email)]

I'm confused as to why this is necessary?  (Why do the executables need a _cairo suffix?)

[Brent Fulgham]

(In reply to comment #2)
> I'm confused as to why this is necessary?  (Why do the executables need a
> _cairo suffix?)

The executables don't need a _cairo suffix.  However, the naming of the Cairo-based build targets in Visual Studio are constructed with "_cairo" suffixes.

This patch causes the build script to build using the "Release_cairo" and "Debug_cairo" build targets.  Any executable output names are generated outside the scope of this patch.

[Darin Adler]

Comment on attachment 19887 [details]
Extend build-webkit with new "--cairo" build option

+    if (checkArgv("--cairo")) {
+        $isCairo = 1;
+    } else {
+        $isWx = 0;
+    }

Seems wrong to set $isWx here.

But also, I think you'd want this setting to be a persistent one. It seems really inconvenient to have to pass --cairo every single time. It should work more like configuration where you can set it once and then it's persistent until you reset it.

review- because of the $isWx mistake, but please consider my suggestion.

[Brent Fulgham]

Created attachment 20445 [details]
Support cairo via command-line flag

Script modified per Darin's comments:
* --cairo flag handled more like the --debug/--release flags, such that they persist in the Configuration file if the "set-webkit-configuration" script is used.
* No longer incorrectly set the "isWx" value.

[Adam Roben (:aroben)]

Comment on attachment 20445 [details]
Support cairo via command-line flag

+    my $isCairo = grep(/^--cairo$/i, @ARGV);
+
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];
         if ($opt =~ /^--debug$/i || $opt =~ /^--devel/i) {
             splice(@ARGV, $i, 1);
             $passedConfiguration = "Debug";
+            $passedConfiguration .= "_Cairo" if $isCairo;
             return;
         }
         if ($opt =~ /^--release$/i || $opt =~ /^--deploy/i) {
             splice(@ARGV, $i, 1);
             $passedConfiguration = "Release";
+            $passedConfiguration .= "_Cairo" if $isCairo;
             return;
         }

This seems very Windows-specific, since only the Windows .vcproj files have these _Cairo configurations. Perhaps the flag should only have an effect on Windows? Perhaps it should be named something more specific, like --cairo-win32?

[Brent Fulgham]

Created attachment 21650 [details]
Extend build-webkit with new "--cairo-win32" build option

Updated based on Adam's comments:
* Changed --cairo flag to --cairo-win32
* --cairo-win32 is only honored if "isCygwin()" is true

[Brent Fulgham]

Created attachment 21651 [details]
Minor update to merge against TOT

Same as above, with minor update to build against TOT.

[Darin Adler]

Comment on attachment 21651 [details]
Minor update to merge against TOT

r=me

[Matt Lilek]

Committed revision 34706.