Skip to content
Permalink
Browse files
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:




Canonical link: https://commits.webkit.org/26321@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@33446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Julien Chaffraix committed May 14, 2008
1 parent 8a87fba commit f012e28cca4ccd1600e75abf0fe03607db093009
Showing 3 changed files with 18 additions and 10 deletions.
@@ -1,3 +1,17 @@
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()

0 comments on commit f012e28

Please sign in to comment.