Commit 47633d0b authored by jchaffraix@webkit.org's avatar jchaffraix@webkit.org

2008-05-14 Julien Chaffraix <jchaffraix@webkit.org>

       
        Reviewed by Eric.
       
        - isDarwin() and isCygwin() returned an empty string if the platform equality check fails.
          We now force the return value to be numeric.

        - Removed platform checks as it was a work around the previous issue.

        - Replaced isDarwin() by isOSX() as they have now the same behaviour.

        * Scripts/build-webkit:
        * Scripts/webkitdirs.pm:




git-svn-id: http://svn.webkit.org/repository/webkit/trunk@33446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 57442fcd
2008-05-14 Julien Chaffraix <jchaffraix@webkit.org>
Reviewed by Eric.
- isDarwin() and isCygwin() returned an empty string if the platform equality check fails.
We now force the return value to be numeric.
- Removed platform checks as it was a work around the previous issue.
- Replaced isDarwin() by isOSX() as they have now the same behaviour.
* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
2008-05-12 Adam Roben <aroben@apple.com>
Support for testing NPN_PostURL
......
......@@ -54,7 +54,7 @@ my $svgAsImageSupport = 1;
my $xpathSupport = 1;
my $xsltSupport = 1;
my $coverageSupport = 0;
my $videoSupport = (isOSX() || isCygwin()) ? 1 : 0; # Enable by default on OSX and Windows
my $videoSupport = (isOSX() || isCygwin()); # Enable by default on OSX and Windows
my $showHelp = 0;
my $clean = 0;
my $buildUniversal = 0;
......@@ -273,7 +273,7 @@ if (isOSX()) {
}
}
if (isGtk() && isDarwin() && useQmake() && !$ENV{QMAKESPEC}) {
if (isGtk() && isOSX() && useQmake() && !$ENV{QMAKESPEC}) {
# The qmake from Trolltech's binary "QT for Mac" distribution tries to
# create xcode projects, not Makefiles
$ENV{QMAKESPEC} = "macx-g++";
......
......@@ -519,18 +519,12 @@ sub isDebianBased()
sub isCygwin()
{
return ($^O eq "cygwin");
}
sub isDarwin()
{
return ($^O eq "darwin");
return ($^O eq "cygwin") || 0;
}
sub isOSX()
{
return isDarwin() unless (isQt() or isGtk() or isWx());
return 0;
return ($^O eq "darwin") || 0;
}
sub determineOSXVersion()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment