Changeset 163114 in webkit


Ignore:
Timestamp:
Jan 30, 2014 2:34:15 PM (10 years ago)
Author:
Martin Robinson
Message:

[GTK] [CMake] Add a "make dist" target
​https://bugs.webkit.org/show_bug.cgi?id=116378

Reviewed by Gustavo Noronha Silva.

.:

  • Source/PlatformGTK.cmake: A CMake support for executing the make-dist

script and then turning the tarfile into a LZMA compressed file.

Source/WebCore:

  • CMakeLists.txt: Don't build WebKitVersion.h for WebKitGTK+. We don't use it

and we don't want to distribute the dependency.

Tools:

Added a script that reads a manifest file an produces a tarball. Also add
the manifest.

  • gtk/make-dist.py: Added.
  • gtk/manifest.txt: Added.
Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r163085 r163114  
     12014-01-30  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add a "make dist" target
     4        https://bugs.webkit.org/show_bug.cgi?id=116378
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/PlatformGTK.cmake: A CMake support for executing the make-dist
     9        script and then turning the tarfile into a LZMA compressed file.
     10
    1112014-01-30  Zan Dobersek  <zdobersek@igalia.com>
    212

  • trunk/Source/PlatformGTK.cmake

    r161921 r163114  
    5353    COMMAND "${TOOLS_DIR}/Scripts/run-gtk-tests"
    5454)
     55
     56if (ENABLE_WEBKIT AND ENABLE_WEBKIT2)
     57    add_custom_command(
     58        OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     59        DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
     60        DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
     61        DEPENDS WebKit
     62        DEPENDS WebKit2
     63        COMMAND ${TOOLS_DIR}/gtk/make-dist.py
     64                --source-dir=${CMAKE_SOURCE_DIR}
     65                --build-dir=${CMAKE_BINARY_DIR}
     66                --tarball-root=/webkitgtk-${PROJECT_VERSION}
     67                -o ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     68                ${TOOLS_DIR}/gtk/manifest.txt
     69    )
     70
     71    add_custom_command(
     72        OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
     73        DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     74        COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
     75    )
     76
     77    add_custom_target(dist
     78        DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
     79    )
     80endif ()

  • trunk/Source/WebCore/CMakeLists.txt

    r162937 r163114  
    32333233list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
    32343234
    3235 add_custom_command(
    3236     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
    3237     MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
    3238     DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
    3239     COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
    3240     VERBATIM)
    3241 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
     3235if (NOT PORT STREQUAL "GTK")
     3236    add_custom_command(
     3237        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
     3238        MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
     3239        DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
     3240        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
     3241        VERBATIM)
     3242    list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
     3243endif ()
    32423244
    32433245WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})

  • trunk/Source/WebCore/ChangeLog

    r163113 r163114  
     12014-01-30  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add a "make dist" target
     4        https://bugs.webkit.org/show_bug.cgi?id=116378
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * CMakeLists.txt: Don't build WebKitVersion.h for WebKitGTK+. We don't use it
     9        and we don't want to distribute the dependency.
     10
    1112014-01-30  Brady Eidson  <beidson@apple.com>
    212

  • trunk/Tools/ChangeLog

    r163110 r163114  
     12014-01-30  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add a "make dist" target
     4        https://bugs.webkit.org/show_bug.cgi?id=116378
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        Added a script that reads a manifest file an produces a tarball. Also add
     9        the manifest.
     10
     11        * gtk/make-dist.py: Added.
     12        * gtk/manifest.txt: Added.
     13
    1142014-01-30  David Farler  <dfarler@apple.com>
    215
Note: See TracChangeset for help on using the changeset viewer.