Clean up and split features.prf into a static list of feature defaults
Created attachment 140197 [details] Patch
Comment on attachment 140197 [details] Patch Tor Arne is still learning the ways of Bugzilla ;)
Comment on attachment 140197 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140197&action=review > Tools/qmake/mkspecs/features/features.prf:175 > + haveQt(5): DEFINES += WTF_USE_GRAPHICS_SURFACE=1 Missing mac scope. > Tools/qmake/mkspecs/features/features.prf:200 > +# Remove conflicting defines Maybe comment that this is purely a cosmetic change to DEFINES to shorten the command line.
Landed in r116107
Reopen, because it broke the --minimal build somehow: generated/JSDOMWindow.cpp: In function 'void* WebCore::jsDOMWindowPrototypeFunctionWebkitRequestAnimationFrame(JSC::ExecState*)': generated/JSDOMWindow.cpp:8924: error: 'RequestAnimationFrameCallback' was not declared in this scope generated/JSDOMWindow.cpp:8924: error: template argument 1 is invalid generated/JSDOMWindow.cpp:8924: error: invalid type in declaration before '=' token generated/JSDOMWindow.cpp:8924: error: 'JSRequestAnimationFrameCallback' has not been declared generated/JSDOMWindow.cpp:8926: error: 'class WebCore::DOMWindow' has no member named 'webkitRequestAnimationFrame' generated/JSDOMWindow.cpp: In function 'void* WebCore::jsDOMWindowPrototypeFunctionWebkitCancelAnimationFrame(JSC::ExecState*)': generated/JSDOMWindow.cpp:8944: error: 'class WebCore::DOMWindow' has no member named 'webkitCancelAnimationFrame' generated/JSDOMWindow.cpp: In function 'void* WebCore::jsDOMWindowPrototypeFunctionWebkitCancelRequestAnimationFrame(JSC::ExecState*)': generated/JSDOMWindow.cpp:8962: error: 'class WebCore::DOMWindow' has no member named 'webkitCancelRequestAnimationFrame'
The problem is that the actual DEFINES wasn't passed to the generator previously, but it is now. before the patch: ------------------ perl -I/home/oszi/WebKit/Source/WebCore/bindings/scripts /home/oszi/WebKit/Source/WebCore/bindings/scripts/generate-bindings.pl --defines "LANGUAGE_JAVASCRIPT=1 ENABLE_GESTURE_EVENTS=1 ENABLE_TOUCH_ADJUSTMENT=1" --generator JS --include /home/oszi/WebKit/Source/WebCore/Modules/filesystem --include /home/oszi/WebKit/Source/WebCore/Modules/geolocation --include /home/oszi/WebKit/Source/WebCore/Modules/indexeddb --include /home/oszi/WebKit/Source/WebCore/Modules/webaudio --include /home/oszi/WebKit/Source/WebCore/Modules/webdatabase --include /home/oszi/WebKit/Source/WebCore/Modules/websockets --include /home/oszi/WebKit/Source/WebCore/dom --include /home/oszi/WebKit/Source/WebCore/fileapi --include /home/oszi/WebKit/Source/WebCore/html --include /home/oszi/WebKit/Source/WebCore/xml --include /home/oszi/WebKit/Source/WebCore/svg --include /home/oszi/WebKit/Source/WebCore/storage --include /home/oszi/WebKit/Source/WebCore/css --include /home/oszi/WebKit/Source/WebCore/testing --include /home/oszi/WebKit/Source/WebCore/workers --outputDir generated --supplementalDependencyFile generated/supplemental_dependency.tmp --preprocessor "/usr/local/Trolltech/Qt-4.8.0/bin/moc -E" ../../../../Source/WebCore/page/DOMWindow.idl after the patch: ----------------- perl -I/home/oszi/WebKit/Source/WebCore/bindings/scripts /home/oszi/WebKit/Source/WebCore/bindings/scripts/generate-bindings.pl --defines "LANGUAGE_JAVASCRIPT=1 ENABLE_WEBGL=0 ENABLE_3D_RENDERING=0 ENABLE_ACCELERATED_2D_CANVAS=0 ENABLE_ANIMATION_API=0 ENABLE_BATTERY_STATUS=0 ENABLE_BLOB=0 ENABLE_CHANNEL_MESSAGING=0 ENABLE_CSS_FILTERS=0 ENABLE_CSS_GRID_LAYOUT=0 ENABLE_CSS_SHADERS=0 ENABLE_DATALIST=0 ENABLE_DATA_TRANSFER_ITEMS=0 ENABLE_DETAILS=0 ENABLE_DEVICE_ORIENTATION=0 ENABLE_DIRECTORY_UPLOAD=0 ENABLE_DOWNLOAD_ATTRIBUTE=0 ENABLE_FILE_SYSTEM=0 ENABLE_FILTERS=0 ENABLE_FTPDIR=0 ENABLE_FULLSCREEN_API=0 ENABLE_GAMEPAD=0 ENABLE_GEOLOCATION=0 ENABLE_HIGH_DPI_CANVAS=0 ENABLE_ICONDATABASE=0 ENABLE_INDEXED_DATABASE=0 ENABLE_INPUT_SPEECH=0 ENABLE_INPUT_TYPE_COLOR=0 ENABLE_INPUT_TYPE_DATE=0 ENABLE_INPUT_TYPE_DATETIME=0 ENABLE_INPUT_TYPE_DATETIMELOCAL=0 ENABLE_INPUT_TYPE_MONTH=0 ENABLE_INPUT_TYPE_TIME=0 ENABLE_INPUT_TYPE_WEEK=0 ENABLE_INSPECTOR=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_LEGACY_NOTIFICATIONS=0 ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=0 ENABLE_LINK_PREFETCH=0 ENABLE_LINK_PRERENDER=0 ENABLE_MATHML=0 ENABLE_MEDIA_SOURCE=0 ENABLE_MEDIA_STATISTICS=0 ENABLE_MEDIA_STREAM=0 ENABLE_METER_TAG=0 ENABLE_MHTML=0 ENABLE_MICRODATA=0 ENABLE_MUTATION_OBSERVERS=0 ENABLE_NETSCAPE_PLUGIN_API=0 ENABLE_NETWORK_INFO=0 ENABLE_NOTIFICATIONS=0 ENABLE_ORIENTATION_EVENTS=0 ENABLE_PAGE_VISIBILITY_API=0 ENABLE_PROGRESS_TAG=0 ENABLE_QUOTA=0 ENABLE_REGISTER_PROTOCOL_HANDLER=0 ENABLE_REQUEST_ANIMATION_FRAME=0 ENABLE_SCRIPTED_SPEECH=0 ENABLE_SHADOW_DOM=0 ENABLE_SHARED_WORKERS=0 ENABLE_SQL_DATABASE=0 ENABLE_STYLE_SCOPED=0 ENABLE_SVG=0 ENABLE_SVG_DOM_OBJC_BINDINGS=0 ENABLE_SVG_FONTS=0 ENABLE_TOUCH_EVENTS=0 ENABLE_TOUCH_ICON_LOADING=0 ENABLE_VIBRATION=0 ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0 ENABLE_WEB_AUDIO=0 ENABLE_WEB_SOCKETS=0 ENABLE_WEB_TIMING=0 ENABLE_WORKERS=0 ENABLE_XSLT=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_FAST_MOBILE_SCROLLING=1 ENABLE_GESTURE_EVENTS=1 ENABLE_TOUCH_ADJUSTMENT=1 ENABLE_SVG_FONTS=0 ENABLE_JAVASCRIPT_DEBUGGER=0" --generator JS --include /home/oszi/WebKit/Source/WebCore/Modules/filesystem --include /home/oszi/WebKit/Source/WebCore/Modules/geolocation --include /home/oszi/WebKit/Source/WebCore/Modules/indexeddb --include /home/oszi/WebKit/Source/WebCore/Modules/webaudio --include /home/oszi/WebKit/Source/WebCore/Modules/webdatabase --include /home/oszi/WebKit/Source/WebCore/Modules/websockets --include /home/oszi/WebKit/Source/WebCore/dom --include /home/oszi/WebKit/Source/WebCore/fileapi --include /home/oszi/WebKit/Source/WebCore/html --include /home/oszi/WebKit/Source/WebCore/xml --include /home/oszi/WebKit/Source/WebCore/svg --include /home/oszi/WebKit/Source/WebCore/storage --include /home/oszi/WebKit/Source/WebCore/css --include /home/oszi/WebKit/Source/WebCore/testing --include /home/oszi/WebKit/Source/WebCore/workers --outputDir generated --supplementalDependencyFile generated/supplemental_dependency.tmp --preprocessor "/usr/local/Trolltech/Qt-4.8.0/bin/moc -E" ../../../../Source/WebCore/page/DOMWindow.idl Have you got any idea how to fix it?
Comment on attachment 140197 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140197&action=review > Tools/qmake/mkspecs/features/features.prf:223 > + feature_define = $$find(define, ^ENABLE_.+=.$) > + isEmpty(feature_define): next() > + > + FEATURE_DEFINES_JAVASCRIPT += $$feature_define enabled_feature_define = $$find(define, ^ENABLE_.+=1$) isEmpty(enabled_feature_define): next() FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define
Buildfix landed in http://trac.webkit.org/changeset/116215
Should this be closed again?