2006-10-02 Nikolas Zimmermann <zimmermann@kde.org>
authoraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Oct 2006 16:33:48 +0000 (16:33 +0000)
committeraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Oct 2006 16:33:48 +0000 (16:33 +0000)
JavaScriptCore:

        Reviewed/landed by Adam.

        Build testkjs on Qt/Linux.

        * CMakeLists.txt:

WebKitTools:

        Reviewed/landed by Adam.

        Proper build-webkit support for Qt/Linux.

        Compilation process is similar to OSX now, aka.
        the build directory is RootCheckoutDir/WebKitBuild now.

        * Scripts/build-webkit: Recognize Qt.
        * Scripts/webkitdirs.pm: Add buildCMakeProject() logic.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/CMakeLists.txt
JavaScriptCore/ChangeLog
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.m
WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
WebKitTools/Scripts/build-webkit
WebKitTools/Scripts/webkitdirs.pm

index 939801be5f493c912dd2120a63f99ecf61aab02a..6ea3145665d10596d138ba4f345abc6be14ca23a 100644 (file)
@@ -130,3 +130,8 @@ set_target_properties(kjs-unity PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERS
 
 install (TARGETS wtf-unity DESTINATION ${LIB_INSTALL_DIR})
 install (TARGETS kjs-unity DESTINATION ${LIB_INSTALL_DIR})
+
+# testkjs
+set(testkjs_SRCS kjs/testkjs.cpp)
+kde4_add_executable(testkjs RUN_UNINSTALLED ${testkjs_SRCS})
+target_link_libraries(testkjs ${KDE4_KDECORE_LIBS} kjs-unity pcre-unity icuuc)
index e3a45b0e5234a3ab5d5ea7bb7b2ac87824e853c6..d68d21ce77b48e9a11098f577ed92cf3213ce584 100644 (file)
@@ -1,3 +1,11 @@
+2006-10-02  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed/landed by Adam.
+
+        Build testkjs on Qt/Linux.
+
+        * CMakeLists.txt:
+
 2006-10-02  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by eseidel.  Landed by eseidel.
index 3bcb71015a28cacc6f6872ab513889e148e727c1..9ea0d48ed5abf8de2efb00af54da5c5ebce66412 100644 (file)
@@ -1,3 +1,15 @@
+2006-10-02  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed/landed by Adam.
+
+        Proper build-webkit support for Qt/Linux.
+
+        Compilation process is similar to OSX now, aka.
+        the build directory is RootCheckoutDir/WebKitBuild now.
+
+        * Scripts/build-webkit: Recognize Qt.
+        * Scripts/webkitdirs.pm: Add buildCMakeProject() logic.
+
 2006-10-01  Mark Rowe  <opendarwin.org@bdash.net.nz>
 
         Reviewed by Maciej.
index 0802047746b9e5191be31b79baae26f07ffe9cb2..3c50880af36ccb4448edc600ca342af0be29dca4 100644 (file)
@@ -460,8 +460,12 @@ static void dump(void)
             printf("ERROR: nil result from %s", dumpAsText ? "[documentElement innerText]" : "[frame renderTreeAsExternalRepresentation]");
         else {
             fputs([result UTF8String], stdout);
+            // FIXME: Buildbots seem to scroll to (-2,0) on a number of tests, but we can't reproduce locally.
+            // Once we fix that issue, we can turn this back on.
+            /*
             if (!dumpAsText)
                 dumpFrameScrollPosition(frame);
+             */
         }
 
         if (dumpBackForwardList) {
index cce13b69e99ca3ee063250b07b80a706151d29fe..877296f333387f00e12a472c761ed521fd073e77 100644 (file)
                22181BD009DC8C4B008342E8 /* ObjCPluginFunction.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ObjCPluginFunction.m; sourceTree = "<group>"; };
                32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpRenderTreePrefix.h; sourceTree = "<group>"; };
                9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-               9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
+               9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
                93442CF408F8BA4900BFE8CA /* TextInputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextInputController.h; sourceTree = "<group>"; };
                93442CF508F8BA4900BFE8CA /* TextInputController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextInputController.m; sourceTree = "<group>"; };
                A803FCB709CAAAB0009B2A37 /* EventSendingController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EventSendingController.h; sourceTree = "<group>"; };
                        mainGroup = 08FB7794FE84155DC02AAC07 /* DumpRenderTree */;
                        productRefGroup = 9340995508540CAF007F3BC8 /* Products */;
                        projectDirPath = "";
+                       projectRoot = "";
                        targets = (
                                A84F608D08B1370600E9745F /* All */,
                                9340994A08540CAE007F3BC8 /* DumpRenderTree */,
index 0982763493cf365822c1f798992f1110bea8e165..7567e3fa9141b16e4c15b36a31e1c3d48ccbabd5 100755 (executable)
@@ -94,7 +94,12 @@ for my $dir (@projects) {
         if ($dir eq "WebKit") {
             $result = buildVisualStudioProject($dir);
         }
+    } elsif (isQt()) {
+        if ($dir eq "WebKit") {
+            $result = buildCMakeProject($dir);
+        }
     }
+
     exit WEXITSTATUS($result) if WEXITSTATUS($result);
     chdir ".." or die;
 }
index e7b4cad1b606a568fe13862b4678529d41dc46ca..926bde63f40514d7bf13892b37d210771087b331 100644 (file)
@@ -125,11 +125,6 @@ sub determineConfiguration
     } else {
         $configuration = "Release";
     }
-
-    if (isQt()) {
-        # We only support one build type for now
-        $configuration = "";
-    }
 }
 
 sub determineConfigurationProductDir
@@ -393,4 +388,28 @@ sub buildVisualStudioProject($)
     return $result;
 }
 
+sub buildCMakeProject($)
+{
+    my ($project) = @_;
+
+    if ($project ne "WebKit") { 
+        die "Qt/Linux builds JavaScriptCore/WebCore/WebKitQt in one shot! Only call it for 'WebKit'.\n";
+    }
+
+    my $config = configuration();
+    print "Calling 'cmake -DCMAKE_BUILD_TYPE=$config ../' in " . baseProductDir() . " ...\n\n";
+
+    system "mkdir -p " . baseProductDir();
+    chdir baseProductDir() or die "Failed to cd into " . baseProductDir() . "\n";
+
+    my $result = system "cmake", "-DCMAKE_BUILD_TYPE=$config", "../";
+    if($result ne 0) {
+       die "Failed to setup build environment using cmake!\n";
+    }
+
+    $result = system "make";
+    chdir ".." or die;
+    return $result;
+}
+
 1;