Changeset 21138 in webkit

Timestamp:

Apr 27, 2007 12:37:26 AM (17 years ago)

Author:

bdash

Message:

2007-04-27 Holger Freyther <​freyther@kde.org>

Reviewed by Maciej.

Remove unmaintained CMake build system.

• CMakeLists.txt: Removed.

2007-04-27 Holger Freyther <​freyther@kde.org>

Reviewed by Maciej.

Remove unmaintained CMake build system.

• CMakeLists.txt: Removed.
• pcre/CMakeLists.txt: Removed.

2007-04-27 Holger Freyther <​freyther@kde.org>

Reviewed by Maciej.

Remove unmaintained CMake build system.

• CMakeLists.txt: Removed.

2007-04-27 Holger Freyther <​freyther@kde.org>

Reviewed by Maciej.

Remove unmaintained CMake build system.

• QtLauncher/CMakeLists.txt: Removed.
• WebKitPart/CMakeLists.txt: Removed.

2007-04-27 Holger Freyther <​freyther@kde.org>

Reviewed by Maciej.

Remove unmaintained CMake build system.

• DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Removed.
• Scripts/build-webkit: Remove references to CMake.
• Scripts/webkitdirs.pm: Remove references to CMake.

Location:

trunk

Files:

• CMakeLists.txt (deleted)
• ChangeLog (modified) (1 diff)
• JavaScriptCore/CMakeLists.txt (deleted)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/pcre/CMakeLists.txt (deleted)
• WebCore/CMakeLists.txt (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebKitQt/ChangeLog (modified) (1 diff)
• WebKitQt/QtLauncher/CMakeLists.txt (deleted)
• WebKitQt/WebKitPart/CMakeLists.txt (deleted)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt (deleted)
• WebKitTools/Scripts/build-webkit (modified) (1 diff)
• WebKitTools/Scripts/webkitdirs.pm (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-04-27  Holger Freyther <freyther@kde.org>
+
+        Reviewed by Maciej.
+
+        Remove unmaintained CMake build system.
+
+        * CMakeLists.txt: Removed.
+
 2007-01-30  Simon Hausmann  <hausmann@kde.org>
 

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-04-27  Holger Freyther <freyther@kde.org>
+
+        Reviewed by Maciej.
+
+        Remove unmaintained CMake build system.
+
+        * CMakeLists.txt: Removed.
+        * pcre/CMakeLists.txt: Removed.
+
 2007-04-27  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-27  Holger Freyther <freyther@kde.org>
+
+        Reviewed by Maciej.
+
+        Remove unmaintained CMake build system.
+
+        * CMakeLists.txt: Removed.
+
 2007-04-26  Matt Perry  <mpComplete@gmail.com>
 

trunk/WebKitQt/ChangeLog

@@ +1 @@
+2007-04-27  Holger Freyther <freyther@kde.org>
+
+        Reviewed by Maciej.
+
+        Remove unmaintained CMake build system.
+
+        * QtLauncher/CMakeLists.txt: Removed.
+        * WebKitPart/CMakeLists.txt: Removed.
+
 2007-04-25  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-04-27  Holger Freyther <freyther@kde.org>
+
+        Reviewed by Maciej.
+
+        Remove unmaintained CMake build system.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Removed.
+        * Scripts/build-webkit: Remove references to CMake.
+        * Scripts/webkitdirs.pm: Remove references to CMake.
+
 2007-04-26  Alp Toker  <alp@atoker.com>
 

trunk/WebKitTools/Scripts/build-webkit

@@ -46 +46 @@
 my $colorSupport = 1; # Default: colorize make output
 
-our @cmakeBuild;
-
 GetOptions('svg!' => \$svgSupport,
            'svg-experimental!' => \$svgExperimentalSupport,
            'xpath!' => \$xpathSupport,
            'xslt!' => \$xsltSupport,
-           'color!' => \$colorSupport,
-           'cmake!' => \@cmakeBuild);
+           'color!' => \$colorSupport);
 
 checkRequiredSystemConfig();

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -353 +353 @@
 sub isQtWithQMake()
 {
-    our @cmakeBuild;
-    return (isQt() and (@cmakeBuild eq 0))
+    return isQt();
 }
 
@@ -441 +440 @@
 }
 
-sub buildCMakeProject($$)
+sub buildQMakeProject($$)
 {
     my ($project, $colorize) = @_;
 
-    if ($project ne "WebKit") { 
+    if ($project ne "WebKit") {
         die "Qt/Linux builds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
     }
@@ -451 +450 @@
     my $config = configuration();
     my $prefix = $ENV{"WebKitInstallationPrefix"};
- 
-    my @buildArgs = ("-DCMAKE_BUILD_TYPE=$config");
-    push @buildArgs, "-DCMAKE_INSTALL_PREFIX=" . $prefix if(defined($prefix));
-    push @buildArgs, "-DWEBKIT_DO_NOT_USE_COLORFUL_OUTPUT=" . ($colorize ? "OFF" : "ON");
-    push @buildArgs, "../../";
-
-    print "Calling 'cmake @buildArgs' in " . baseProductDir() . "/$config ...\n\n";
+
+    my @buildArgs = ("-r");
+    push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
+    push @buildArgs, sourceDir() . "/WebKit.pro";
+
+    print "Calling 'qmake @buildArgs' in " . baseProductDir() . "/$config ...\n\n";
     print "Installation directory: $prefix\n" if(defined($prefix));
 
@@ -463 +461 @@
     chdir baseProductDir() . "/$config" or die "Failed to cd into " . baseProductDir() . "/$config \n";
 
-    my $result = system "cmake", @buildArgs;
+    my $result = system "qmake", @buildArgs;
     if($result ne 0) {
-       die "Failed to setup build environment using cmake!\n";
+       die "Failed to setup build environment using qmake!\n";
+    }
+
+    my $clean = $ENV{"WEBKIT_FULLBUILD"};
+
+    if(defined $clean) {
+      system "make clean";
     }
 
@@ -473 +477 @@
 }
 
-sub buildQMakeProject($$)
-{
-    my ($project, $colorize) = @_;
-
-    if ($project ne "WebKit") {
-        die "Qt/Linux builds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
-    }
-
-    my $config = configuration();
-    my $prefix = $ENV{"WebKitInstallationPrefix"};
-
-    my @buildArgs = ("-r");
-    push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
-    push @buildArgs, sourceDir() . "/WebKit.pro";
-
-    print "Calling 'qmake @buildArgs' in " . baseProductDir() . "/$config ...\n\n";
-    print "Installation directory: $prefix\n" if(defined($prefix));
-
-    system "mkdir -p " . baseProductDir() . "/$config";
-    chdir baseProductDir() . "/$config" or die "Failed to cd into " . baseProductDir() . "/$config \n";
-
-    my $result = system "qmake", @buildArgs;
-    if($result ne 0) {
-       die "Failed to setup build environment using qmake!\n";
-    }
-
-    my $clean = $ENV{"WEBKIT_FULLBUILD"};
-
-    if(defined $clean) {
-      system "make clean";
-    }
-
-    $result = system "make";
-    chdir ".." or die;
-    return $result;
-}
-
 1;