Changeset 224410 in webkit


Ignore:
Timestamp:
Nov 3, 2017 11:42:55 AM (6 years ago)
Author:
Michael Catanzaro
Message:

[WPE][GTK] Avoid duplicating code for dist and distcheck targets
https://bugs.webkit.org/show_bug.cgi?id=179154

Reviewed by Carlos Garcia Campos.

.:

This commit just reduces some CMake code duplication between GTK and WPE.

  • Source/PlatformGTK.cmake:
  • Source/PlatformWPE.cmake:
  • Source/cmake/WebKitDist.cmake: Added.

Tools:

Move the script out of Tools/gtk because it is already used by WPE. Also, drop the .py
prefix because it is executable.

  • Scripts/make-dist: Renamed from Tools/gtk/make-dist.py.
Location:
trunk
Files:
1 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r224372 r224410  
     12017-11-03  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE][GTK] Avoid duplicating code for dist and distcheck targets
     4        https://bugs.webkit.org/show_bug.cgi?id=179154
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        This commit just reduces some CMake code duplication between GTK and WPE.
     9
     10        * Source/PlatformGTK.cmake:
     11        * Source/PlatformWPE.cmake:
     12        * Source/cmake/WebKitDist.cmake: Added.
     13
    1142017-11-02  Tim Horton  <timothy_horton@apple.com>
    215
  • trunk/Source/PlatformGTK.cmake

    r222194 r224410  
     1include(WebKitDist)
     2
    13add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
    24
     
    5355
    5456if (DEVELOPER_MODE)
    55     configure_file(
    56         ${TOOLS_DIR}/gtk/manifest.txt.in
    57         ${CMAKE_BINARY_DIR}/manifest.txt
    58     )
    59 
    60     add_custom_command(
    61         OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    62         DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
    63         DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt
    64         DEPENDS WebKit
    65         DEPENDS gtkdoc
    66         COMMAND ${TOOLS_DIR}/gtk/make-dist.py
    67                 --source-dir=${CMAKE_SOURCE_DIR}
    68                 --build-dir=${CMAKE_BINARY_DIR}
    69                 --version=${PROJECT_VERSION}
    70                 ${CMAKE_BINARY_DIR}/manifest.txt
    71     )
    72 
    73     add_custom_command(
    74         OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
    75         DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    76         COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    77     )
    78 
    79     add_custom_target(dist
    80         DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
    81     )
    82 
    83     add_custom_target(distcheck
    84         DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
    85         DEPENDS ${CMAKE_BINARY_DIR}/manifest.txt
    86         DEPENDS WebKit
    87         DEPENDS gtkdoc
    88         COMMAND ${TOOLS_DIR}/gtk/make-dist.py
    89                 --check
    90                 --source-dir=${CMAKE_SOURCE_DIR}
    91                 --build-dir=${CMAKE_BINARY_DIR}
    92                 --version=${PROJECT_VERSION}
    93                 ${CMAKE_BINARY_DIR}/manifest.txt
    94         COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
    95     )
     57    add_custom_target(Documentation DEPENDS gtkdoc)
     58    WEBKIT_DECLARE_DIST_TARGETS(GTK webkitgtk ${TOOLS_DIR}/gtk/manifest.txt.in)
    9659endif ()
  • trunk/Source/PlatformWPE.cmake

    r221734 r224410  
     1include(WebKitDist)
     2
    13if (DEVELOPER_MODE)
    2     find_package(Xz REQUIRED)
    3 
    4     configure_file(
    5         ${TOOLS_DIR}/wpe/manifest.txt.in
    6         ${CMAKE_BINARY_DIR}/manifest.txt
    7     )
    8 
    9     add_custom_target(distcheck
    10         COMMENT "Checking release tarball: wpewebkit-${PROJECT_VERSION}.tar"
    11         DEPENDS "${CMAKE_BINARY_DIR}/manifest.txt"
    12                 "${TOOLS_DIR}/gtk/make-dist.py"
    13         COMMAND "${TOOLS_DIR}/gtk/make-dist.py"
    14                 "--check" "--port=WPE"
    15                 "--tarball-name=wpewebkit"
    16                 "--source-dir=${CMAKE_SOURCE_DIR}"
    17                 "--build-dir=${CMAKE_BINARY_DIR}"
    18                 "--version=${PROJECT_VERSION}"
    19                 "${CMAKE_BINARY_DIR}/manifest.txt"
    20         COMMAND "${XZ_EXECUTABLE}" "-evfQ"
    21                 "${CMAKE_BINARY_DIR}/wpewebkit-${PROJECT_VERSION}.tar"
    22         USES_TERMINAL
    23     )
    24 
    25     add_custom_command(
    26         COMMENT "Creating release tarball: wpewebkit-${PROJECT_VERSION}.tar.xz"
    27         OUTPUT "${CMAKE_BINARY_DIR}/wpewebkit-${PROJECT_VERSION}.tar.xz"
    28         MAIN_DEPENDENCY "${CMAKE_BINARY_DIR}/manifest.txt"
    29         DEPENDS "${TOOLS_DIR}/gtk/make-dist.py"
    30         COMMAND "${TOOLS_DIR}/gtk/make-dist.py"
    31                 "--tarball-name=wpewebkit"
    32                 "--source-dir=${CMAKE_SOURCE_DIR}"
    33                 "--build-dir=${CMAKE_BINARY_DIR}"
    34                 "--version=${PROJECT_VERSION}"
    35                 "${CMAKE_BINARY_DIR}/manifest.txt"
    36         COMMAND "${XZ_EXECUTABLE}" "-evfQ"
    37                 "${CMAKE_BINARY_DIR}/wpewebkit-${PROJECT_VERSION}.tar"
    38         USES_TERMINAL
    39     )
    40 
    41     add_custom_target(dist
    42         DEPENDS "${CMAKE_BINARY_DIR}/wpewebkit-${PROJECT_VERSION}.tar.xz"
    43     )
     4    # FIXME: This should depend on a gtkdoc target
     5    add_custom_target(Documentation)
     6    WEBKIT_DECLARE_DIST_TARGETS(WPE wpewebkit ${TOOLS_DIR}/wpe/manifest.txt.in)
    447endif ()
  • trunk/Tools/ChangeLog

    r224401 r224410  
     12017-11-03  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE][GTK] Avoid duplicating code for dist and distcheck targets
     4        https://bugs.webkit.org/show_bug.cgi?id=179154
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Move the script out of Tools/gtk because it is already used by WPE. Also, drop the .py
     9        prefix because it is executable.
     10
     11        * Scripts/make-dist: Renamed from Tools/gtk/make-dist.py.
     12
    1132017-11-03  Jonathan Bedard  <jbedard@apple.com>
    214
Note: See TracChangeset for help on using the changeset viewer.