ChangeLog

 12010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [Qt] Generate forwarding headers for WebKit2
 6
 7 https://bugs.webkit.org/show_bug.cgi?id=43336
 8
 9 * DerivedSources.pro: Added WebKit2/DerivedSources.pro to SUBDIRS if webkit2 is on.
 10
1112010-07-30 Patrick Gansterer <paroga@paroga.com>
212
313 Reviewed by Nikolas Zimmermann.

DerivedSources.pro

@@SUBDIRS += \
66 WebCore/DerivedSources.pro \
77 WebKit/qt/Api/DerivedSources.pro
88
 9webkit2 {
 10 SUBDIRS += WebKit2/DerivedSources.pro
 11}
 12
913for(subpro, SUBDIRS) {
1014 subdir = $${dirname(subpro)}
1115 subtarget = $$replace(subpro, [^a-zA-Z0-9_], -)

WebCore/ChangeLog

 12010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [Qt] Generate forwarding headers for WebKit2
 6
 7 https://bugs.webkit.org/show_bug.cgi?id=43336
 8
 9 * WebCore.pri: Removed header copying logic.
 10 * WebCore.pro: Add include paths for WebKit2.
 11
1122010-08-01 Nikolas Zimmermann <nzimmermann@rim.com>
213
314 Reviewed by Dirk Schulze.

WebCore/WebCore.pri

@@IDL_BINDINGS += \
667667
668668INSPECTOR_INTERFACES = inspector/Inspector.idl
669669
670 WEBCORE_HEADERS_FOR_WEBKIT2 += \
671  bindings/js/DOMWrapperWorld.h \
672  platform/FileChooser.h \
673  platform/network/qt/ResourceError.h \
674  platform/network/qt/ResourceRequest.h \
675  platform/network/qt/ResourceResponse.h \
676  dom/KeyboardEvent.h \
677  editing/EditCommand.h \
678  history/BackForwardList.h \
679  history/BackForwardControllerClient.h \
680  history/HistoryItem.h \
681  html/HTMLFormElement.h \
682  html/HTMLFrameOwnerElement.h \
683  inspector/InspectorClient.h \
684  loader/appcache/ApplicationCacheStorage.h \
685  loader/DocumentLoader.h \
686  loader/FormState.h \
687  loader/FrameLoader.h \
688  loader/FrameLoaderClient.h \
689  loader/FrameLoaderTypes.h \
690  loader/PolicyChecker.h \
691  loader/ProgressTracker.h \
692  page/animation/AnimationController.h \
693  page/Chrome.h \
694  page/ChromeClient.h \
695  page/ContextMenuClient.h \
696  page/DragClient.h \
697  page/EditorClient.h \
698  page/EventHandler.h \
699  page/FocusController.h \
700  page/Frame.h \
701  page/FrameLoadRequest.h \
702  page/FrameView.h \
703  page/Page.h \
704  page/Settings.h \
705  page/WindowFeatures.h \
706  platform/Cursor.h \
707  platform/PlatformKeyboardEvent.h \
708  platform/PlatformMouseEvent.h \
709  platform/PlatformWheelEvent.h \
710  platform/Widget.h \
711  platform/KURL.h \
712  platform/graphics/Color.h \
713  platform/graphics/ColorSpace.h \
714  platform/graphics/GraphicsTypes.h \
715  platform/graphics/Image.h \
716  platform/graphics/ImageSource.h \
717  platform/graphics/FloatRect.h \
718  platform/graphics/GraphicsContext.h \
719  platform/graphics/GraphicsLayerClient.h \
720  platform/graphics/IntPoint.h \
721  platform/graphics/IntRect.h \
722  platform/graphics/IntSize.h \
723  platform/graphics/Tile.h \
724  platform/graphics/TiledBackingStore.h \
725  platform/graphics/TiledBackingStoreClient.h \
726  platform/sql/SQLiteDatabase.h \
727  platform/text/PlatformString.h \
728  platform/text/StringImpl.h \
729  platform/MIMETypeRegistry.h \
730  rendering/RenderTreeAsText.h \
731  plugins/PluginData.h \
732 
733 JSC_HEADERS_FOR_WEBKIT2 += \
734  ../JavaScriptCore/runtime/JSObject.h \
735 
736 WEBKIT2_API_HEADERS += \
737  ../WebKit2/UIProcess/API/C/WKAPICast.h \
738  ../WebKit2/UIProcess/API/C/WKBase.h \
739  ../WebKit2/UIProcess/API/C/WKContext.h \
740  ../WebKit2/UIProcess/API/C/WKContextPrivate.h \
741  ../WebKit2/UIProcess/API/C/WKFrame.h \
742  ../WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
743  ../WebKit2/UIProcess/API/C/WKNavigationData.h \
744  ../WebKit2/UIProcess/API/C/WKPage.h \
745  ../WebKit2/UIProcess/API/C/WKPageNamespace.h \
746  ../WebKit2/UIProcess/API/C/WKPagePrivate.h \
747  ../WebKit2/UIProcess/API/C/WKPreferences.h \
748  ../WebKit2/UIProcess/API/C/WKString.h \
749  ../WebKit2/UIProcess/API/C/WKURL.h \
750  ../WebKit2/UIProcess/API/C/WebKit2.h \
751  ../WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
752  ../WebKit2/UIProcess/API/qt/qgraphicswkview.h \
753  ../WebKit2/UIProcess/API/qt/qwkpage.h \
754  ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBase.h \
755  ../WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
756 
757670mathmlnames.output = $${WC_GENERATED_SOURCES_DIR}/MathMLNames.cpp
758671mathmlnames.input = MATHML_NAMES
759672mathmlnames.wkScript = $$PWD/dom/make_names.pl

@@webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../WebKit/
917830webkitversion.clean = ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
918831webkitversion.wkAddOutputToSources = false
919832addExtraCompiler(webkitversion)
920 
921 webkit2 {
922 
923 # GENERATOR 12: Copy WebCore headers for WebKit2
924 webcoreheaders.output = ../include/WebCore/${QMAKE_FILE_BASE}.h
925 webcoreheaders.input = WEBCORE_HEADERS_FOR_WEBKIT2
926 webcoreheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
927 webcoreheaders.clean = ${QMAKE_FILE_OUT}
928 webcoreheaders.wkAddOutputToSources = false
929 addExtraCompiler(webcoreheaders)
930 
931 # GENERATOR 12-B: Copy JavaScriptCore headers for WebKit2
932 jscheaders.output = ../include/JavaScriptCore/${QMAKE_FILE_BASE}.h
933 jscheaders.input = JSC_HEADERS_FOR_WEBKIT2
934 jscheaders.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
935 jscheaders.clean = ${QMAKE_FILE_OUT}
936 jscheaders.wkAddOutputToSources = false
937 addExtraCompiler(jscheaders)
938 
939 # GENERATOR 13: Copy WebKit2 headers
940 webkit2headers.output = ../include/WebKit2/${QMAKE_FILE_BASE}.h
941 webkit2headers.input = WEBKIT2_API_HEADERS
942 webkit2headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
943 webkit2headers.clean = ${QMAKE_FILE_OUT}
944 webkit2headers.wkAddOutputToSources = false
945 addExtraCompiler(webkit2headers)
946 
947 }

WebCore/WebCore.pro

@@SOURCES += \
33863386 ../WebKit2/WebProcess/WebProcess.cpp \
33873387 ../WebKit2/WebProcess/qt/WebProcessMainQt.cpp
33883388
 3389INCLUDEPATH = \
 3390 $$OUTPUT_DIR/WebCore/generated \
 3391 $$INCLUDEPATH \
 3392 $$OUPUT_DIR/include
 3393
33893394}
33903395
33913396symbian {

WebKit2/ChangeLog

 12010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [Qt] Generate forwarding headers for WebKit2
 6
 7 https://bugs.webkit.org/show_bug.cgi?id=43336
 8
 9 * DerivedSources.pro: Added.
 10
1112010-08-01 Anders Carlsson <andersca@apple.com>
212
313 Reviewed by Sam Weinig.

WebKit2/DerivedSources.pro

 1TEMPLATE = lib
 2TARGET = dummy
 3
 4CONFIG -= debug_and_release
 5
 6WEBCORE_HEADERS_FOR_WEBKIT2 += \
 7 bindings/js/DOMWrapperWorld.h \
 8 bindings/js/GCController.h \
 9 bindings/js/JSPluginElementFunctions.h \
 10 bridge/IdentifierRep.h \
 11 bridge/npapi.h \
 12 bridge/npruntime.h \
 13 config.h \
 14 css/CSSComputedStyleDeclaration.h \
 15 dom/Event.h \
 16 dom/KeyboardEvent.h \
 17 dom/Node.h \
 18 dom/Range.h \
 19 editing/EditCommand.h \
 20 editing/EditorInsertAction.h \
 21 editing/TextAffinity.h \
 22 history/BackForwardControllerClient.h \
 23 history/BackForwardList.h \
 24 history/HistoryItem.h \
 25 html/HTMLFormElement.h \
 26 html/HTMLFrameOwnerElement.h \
 27 html/HTMLPlugInElement.h \
 28 inspector/InspectorClient.h \
 29 loader/appcache/ApplicationCacheStorage.h \
 30 loader/Cache.h \
 31 loader/DocumentLoader.h \
 32 loader/FormState.h \
 33 loader/FrameLoaderClient.h \
 34 loader/FrameLoader.h \
 35 loader/FrameLoaderTypes.h \
 36 loader/NetscapePlugInStreamLoader.h \
 37 loader/PolicyChecker.h \
 38 loader/ProgressTracker.h \
 39 page/animation/AnimationController.h \
 40 page/ChromeClient.h \
 41 page/Chrome.h \
 42 page/ContextMenuClient.h \
 43 page/DragClient.h \
 44 page/EditorClient.h \
 45 page/EventHandler.h \
 46 page/FocusController.h \
 47 page/Frame.h \
 48 page/FrameLoadRequest.h \
 49 page/FrameView.h \
 50 page/MediaCanStartListener.h \
 51 page/PageGroup.h \
 52 page/Page.h \
 53 page/SecurityOrigin.h \
 54 page/Settings.h \
 55 page/WindowFeatures.h \
 56 platform/Cursor.h \
 57 platform/FileChooser.h \
 58 platform/FileSystem.h \
 59 platform/graphics/FloatRect.h \
 60 platform/graphics/FontRenderingMode.h \
 61 platform/graphics/GraphicsContext.h \
 62 platform/graphics/GraphicsLayerClient.h \
 63 platform/graphics/GraphicsLayer.h \
 64 platform/graphics/IntPoint.h \
 65 platform/graphics/IntRect.h \
 66 platform/graphics/IntSize.h \
 67 platform/HostWindow.h \
 68 platform/KURL.h \
 69 platform/LocalizationStrategy.h \
 70 platform/MIMETypeRegistry.h \
 71 platform/network/android/ResourceError.h \
 72 platform/network/android/ResourceRequest.h \
 73 platform/network/android/ResourceResponse.h \
 74 platform/network/HTTPHeaderMap.h \
 75 platform/PlatformKeyboardEvent.h \
 76 platform/PlatformMouseEvent.h \
 77 platform/PlatformStrategies.h \
 78 platform/PlatformWheelEvent.h \
 79 platform/PopupMenu.h \
 80 platform/PopupMenuClient.h \
 81 platform/SchemeRegistry.h \
 82 platform/ScrollView.h \
 83 platform/SearchPopupMenu.h \
 84 platform/SharedBuffer.h \
 85 platform/text/PlatformString.h \
 86 platform/text/StringHash.h \
 87 platform/Widget.h \
 88 platform/win/BitmapInfo.h \
 89 platform/WindowsKeyboardCodes.h \
 90 platform/win/WebCoreInstanceHandle.h \
 91 platform/win/WindowMessageBroadcaster.h \
 92 platform/win/WindowMessageListener.h \
 93 plugins/npfunctions.h \
 94 plugins/PluginData.h \
 95 plugins/PluginStrategy.h \
 96 plugins/PluginViewBase.h \
 97 rendering/RenderLayer.h \
 98 rendering/RenderTreeAsText.h \
 99
 100WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
 101 $$OUTPUT_DIR/WebCore/generated/JSElement.h \
 102 $$OUTPUT_DIR/WebCore/generated/JSCSSStyleDeclaration.h
 103
 104JSC_HEADERS_FOR_WEBKIT2 += \
 105 API/APICast.h \
 106 API/JavaScript.h \
 107 API/JSBase.h \
 108 runtime/Error.h \
 109 runtime/FunctionPrototype.h \
 110 runtime/InternalFunction.h \
 111 runtime/JSGlobalObject.h \
 112 runtime/JSLock.h \
 113 runtime/JSObject.h \
 114 runtime/JSObjectWithGlobalObject.h \
 115 runtime/ObjectPrototype.h \
 116 runtime/Protect.h \
 117 wtf/Platform.h \
 118 wtf/text/StringHash.h \
 119
 120WEBKIT2_API_HEADERS += \
 121 UIProcess/API/C/WKAPICast.h \
 122 UIProcess/API/C/WKBase.h \
 123 UIProcess/API/C/WKContext.h \
 124 UIProcess/API/C/WKContextPrivate.h \
 125 UIProcess/API/C/WKFrame.h \
 126 UIProcess/API/C/WKFramePolicyListener.h \
 127 UIProcess/API/C/WKNavigationData.h \
 128 UIProcess/API/C/WKPage.h \
 129 UIProcess/API/C/WKPageNamespace.h \
 130 UIProcess/API/C/WKPagePrivate.h \
 131 UIProcess/API/C/WKPreferences.h \
 132 UIProcess/API/C/WKString.h \
 133 UIProcess/API/C/WKURL.h \
 134 UIProcess/API/C/WebKit2.h \
 135 UIProcess/API/cpp/WKRetainPtr.h \
 136 UIProcess/API/qt/qgraphicswkview.h \
 137 UIProcess/API/qt/qwkpage.h \
 138 WebProcess/InjectedBundle/API/c/WKBundleBase.h \
 139 WebProcess/InjectedBundle/API/c/WKBundlePage.h \
 140
 141
 142QUOTE = ""
 143DOUBLE_ESCAPED_QUOTE = ""
 144ESCAPE = ""
 145MKDIR = ""
 146win32-msvc* {
 147 ESCAPE = "^"
 148 MKDIR = md
 149} else symbian {
 150 ESCAPE = "^"
 151 MKDIR = mkdir
 152} else:win32-g++*:isEmpty(QMAKE_SH) {
 153 # MinGW's make will run makefile commands using sh, even if make
 154 # was run from the Windows shell, if it finds sh in the path.
 155 ESCAPE = "^"
 156 MKDIR = md
 157} else {
 158 QUOTE = "\'"
 159 DOUBLE_ESCAPED_QUOTE = "\\\'"
 160 MKDIR = mkdir
 161}
 162
 163DIRS = \
 164 $$OUTPUT_DIR/include/JavaScriptCore \
 165 $$OUTPUT_DIR/include/WebCore \
 166 $$OUTPUT_DIR/include/WebKit2
 167
 168for(DIR, DIRS) {
 169 !exists($$DIR): system($$MKDIR $$DIR)
 170}
 171
 172QMAKE_EXTRA_TARGETS += createdirs
 173
 174SRC_ROOT_DIR = $$replace(PWD, /WebKit2, /)
 175
 176for(HEADER, WEBCORE_HEADERS_FOR_WEBKIT2) {
 177 DESTDIR_BASE = "WebCore"
 178
 179 HEADER_NAME = $$basename(HEADER)
 180 HEADER_PATH = $$SRC_ROOT_DIR/$$DESTDIR_BASE/$$HEADER
 181 HEADER_TARGET = $$replace(HEADER_PATH, [^a-zA-Z0-9_], -)
 182 HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
 183 DESTDIR = $$OUTPUT_DIR/include/$$DESTDIR_BASE
 184
 185 #FIXME: This should be organized out into a function
 186 eval($${HEADER_TARGET}.target = $$DESTDIR/$$HEADER_NAME)
 187 eval($${HEADER_TARGET}.depends = $$HEADER_PATH)
 188 eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER_PATH\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
 189
 190 QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
 191 generated_files.depends += $$eval($${HEADER_TARGET}.target)
 192}
 193
 194for(HEADER, WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2) {
 195 HEADER_NAME = $$basename(HEADER)
 196 HEADER_PATH = $$HEADER
 197 HEADER_TARGET = $$replace(HEADER_PATH, [^a-zA-Z0-9_], -)
 198 HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
 199 DESTDIR = $$OUTPUT_DIR/include/"WebCore"
 200
 201 eval($${HEADER_TARGET}.target = $$DESTDIR/$$HEADER_NAME)
 202 eval($${HEADER_TARGET}.depends = $$HEADER_PATH)
 203 eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER_PATH\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
 204
 205 QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
 206 generated_files.depends += $$eval($${HEADER_TARGET}.target)
 207}
 208
 209for(HEADER, JSC_HEADERS_FOR_WEBKIT2) {
 210 DESTDIR_BASE = "JavaScriptCore"
 211
 212 HEADER_NAME = $$basename(HEADER)
 213 HEADER_PATH = $$SRC_ROOT_DIR/$$DESTDIR_BASE/$$HEADER
 214 HEADER_TARGET = $$replace(HEADER_PATH, [^a-zA-Z0-9_], -)
 215 HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
 216 DESTDIR = $$OUTPUT_DIR/include/$$DESTDIR_BASE
 217
 218 eval($${HEADER_TARGET}.target = $$DESTDIR/$$HEADER_NAME)
 219 eval($${HEADER_TARGET}.depends = $$HEADER_PATH)
 220 eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER_PATH\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
 221
 222 QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
 223 generated_files.depends += $$eval($${HEADER_TARGET}.target)
 224}
 225
 226for(HEADER, WEBKIT2_API_HEADERS) {
 227 DESTDIR_BASE = "WebKit2"
 228
 229 HEADER_NAME = $$basename(HEADER)
 230 HEADER_PATH = $$PWD/$$HEADER
 231 HEADER_TARGET = $$replace(HEADER_PATH, [^a-zA-Z0-9_], -)
 232 HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
 233 DESTDIR = $$OUTPUT_DIR/include/$$DESTDIR_BASE
 234
 235 eval($${HEADER_TARGET}.target = $$DESTDIR/$$HEADER_NAME)
 236 eval($${HEADER_TARGET}.depends = $$HEADER_PATH)
 237 eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER_PATH\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
 238
 239 QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
 240 generated_files.depends += $$eval($${HEADER_TARGET}.target)
 241}
 242
 243QMAKE_EXTRA_TARGETS += generated_files

WebKitTools/ChangeLog

 12010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [Qt] Generate forwarding headers for WebKit2
 6
 7 https://bugs.webkit.org/show_bug.cgi?id=43336
 8
 9 * Scripts/webkitdirs.pm: Call make on WebKit2/Makefile.DerivedSources.
 10
1112010-08-01 Kent Tamura <tkent@chromium.org>
212
313 Reviewed by Dimitri Glazkov.

WebKitTools/Scripts/webkitdirs.pm

@@sub buildQMakeProject($@)
14181418
14191419 print "Generating derived sources\n\n";
14201420
 1421 push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
 1422
14211423 my @dsQmakeArgs = @buildArgs;
14221424 push @dsQmakeArgs, "-r";
14231425 push @dsQmakeArgs, sourceDir() . "/DerivedSources.pro";

@@sub buildQMakeProject($@)
14311433 my $dsMakefile = "Makefile.DerivedSources";
14321434
14331435 # Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60
1434  for my $subdir ("JavaScriptCore", "WebCore", "WebKit/qt/Api") {
 1436 my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
 1437 if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
 1438 push @subdirs, "WebKit2";
 1439 }
 1440
 1441 for my $subdir (@subdirs) {
14351442 print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/$subdir\n\n";
14361443 if ($make eq "nmake") {
14371444 my $subdirWindows = $subdir;

@@sub buildQMakeProject($@)
14451452 }
14461453 }
14471454
1448  push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
14491455 push @buildArgs, sourceDir() . "/WebKit.pro";
14501456 if ($config =~ m/debug/i) {
14511457 push @buildArgs, "CONFIG-=release";