Changeset 160985 in webkit


Ignore:
Timestamp:
Dec 22, 2013 10:08:44 PM (10 years ago)
Author:
Martin Robinson
Message:

[GTK][CMake] Integrate GResource for inspector files (and others?)
​https://bugs.webkit.org/show_bug.cgi?id=125569

Reviewed by Gustavo Noronha Silva.

Source/WebInspectorUI:

  • GNUmakefile.am: Use the new generation script instead of generating with

shell scripting in the makefile.

Source/WebKit2:

  • GNUmakefile.am: Use the newly added static WebKit2InspectorGResourceBundle.xml

instead of generating the same file each time.

  • PlatformGTK.cmake: Add support for building the GResource bundles into WebKit2.
  • UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml: Added.

Tools:

  • gtk/generate-inspector-gresource-manifest.py: Added.
Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r160897 r160985  
     12013-12-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK][CMake] Integrate GResource for inspector files (and others?)
     4        https://bugs.webkit.org/show_bug.cgi?id=125569
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: Use the new generation script instead of generating with
     9        shell scripting in the makefile.
     10
    1112013-12-19  Joseph Pecoraro  <pecoraro@apple.com>
    212

  • trunk/Source/WebInspectorUI/GNUmakefile.am

    r156027 r160985  
    66        $(WebInspectorUI)/UserInterface/Images/*.svg \
    77        $(WebInspectorUI)/UserInterface/External/CodeMirror/* \
    8         $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js
     8        $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
     9        $(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
    910        $(AM_V_GEN)
    1011        $(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
    11         $(AM_V_at)echo '<?xml version="1.0" encoding="UTF-8"?>' > ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
    12         $(AM_V_at)echo '<gresources>' >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
    13         $(AM_V_at)echo '  <gresource prefix="/org/webkitgtk/inspector">' >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
    14         $(AM_V_at)\
    15                 basepath=`echo $(WebInspectorUI)/ | sed 's,^./,,g'`; \
    16                 for file in $^; do \
    17                         if [ "$$file" = "GNUmakefile" ]; then continue; fi; \
    18                         file=`echo $$file | sed "s,$$basepath,,g"`; \
    19                         echo "    <file>$$file</file>" >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml; \
    20                 done
    21         $(AM_V_at)echo '  </gresource>' >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
    22         $(AM_V_at)echo '</gresources>' >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
     12        $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py $@
    2313
    2414${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.c: DerivedSources/WebInspectorUI/GResourceBundle.xml

  • trunk/Source/WebKit2/ChangeLog

    r160977 r160985  
     12013-12-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK][CMake] Integrate GResource for inspector files (and others?)
     4        https://bugs.webkit.org/show_bug.cgi?id=125569
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: Use the newly added static WebKit2InspectorGResourceBundle.xml
     9        instead of generating the same file each time.
     10        * PlatformGTK.cmake: Add support for building the GResource bundles into WebKit2.
     11        * UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml: Added.
     12
    1132013-12-22  Csaba Osztrogonác  <ossy@webkit.org>
    214

  • trunk/Source/WebKit2/GNUmakefile.am

    r160635 r160985  
    2020endif
    2121
    22 ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml: GNUmakefile \
    23         $(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html
    24         $(AM_V_GEN)
    25         $(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
    26         $(AM_V_at)echo '<?xml version="1.0" encoding="UTF-8"?>' > ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml
    27         $(AM_V_at)echo '<gresources>' >> ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml
    28         $(AM_V_at)echo '  <gresource prefix="/org/webkitgtk/inspector/UserInterface">' >> ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml
    29         $(AM_V_at)echo "    <file>inspectorPageIndex.html</file>" >> ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml
    30         $(AM_V_at)echo '  </gresource>' >> ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml
    31         $(AM_V_at)echo '</gresources>' >> ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml
    32 
    33 ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c: DerivedSources/WebInspectorUI/WebKit2GResourceBundle.xml
     22${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c: \
     23                $(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html \
     24                $(WebKit2)/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml
    3425        $(AM_V_GEN)
    3526        $(AM_V_at)glib-compile-resources --generate --sourcedir=$(WebKit2)/UIProcess/InspectorServer/front-end \
    36                 --target=${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml
    37 
    38 BUILT_SOURCES += \
    39         DerivedSources/WebInspectorUI/WebKit2GResourceBundle.xml
     27                --target=${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c $(WebKit2)/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml
    4028
    4129webkit2gtk_built_sources += \

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r160816 r160985  
    1616
    1717list(APPEND WebKit2_SOURCES
     18    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
     19    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
     20
    1821    ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.cpp
    1922    ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.cpp
    … …  
    353356    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h
    354357    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
    355 
     358)
     359
     360file(GLOB InspectorFiles
     361    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
     362    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.css
     363    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*
     364    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
     365    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.png
     366    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.svg
     367    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.js
    356368)
    357369
    … …  
    446458    VERBATIM)
    447459
     460add_custom_command(
     461    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     462    DEPENDS ${InspectorFiles}
     463            ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
     464    COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     465    VERBATIM
     466)
     467
     468add_custom_command(
     469    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
     470    DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     471            ${InspectorFiles}
     472    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     473    VERBATIM
     474)
     475
     476add_custom_command(
     477    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
     478    DEPENDS ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml
     479            ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html
     480    COMMAND glib-compile-resources --generate --sourcedir=${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml
     481    VERBATIM
     482)
     483
    448484# This symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
    449485add_custom_target(fake-installed-headers

  • trunk/Tools/ChangeLog

    r160976 r160985  
     12013-12-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK][CMake] Integrate GResource for inspector files (and others?)
     4        https://bugs.webkit.org/show_bug.cgi?id=125569
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * gtk/generate-inspector-gresource-manifest.py: Added.
     9
    1102013-12-22  Csaba Osztrogonác  <ossy@webkit.org>
    211
Note: See TracChangeset for help on using the changeset viewer.