Title: [224103] releases/WebKitGTK/webkit-2.18
- Revision
- 224103
- Author
- [email protected]
- Date
- 2017-10-27 02:27:28 -0700 (Fri, 27 Oct 2017)
Log Message
Merge r224047 - [WPE] Use proper shared object versioning for libWPEWebKit.so
https://bugs.webkit.org/show_bug.cgi?id=178878
Reviewed by Michael Catanzaro.
Move the CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE() to a new CMake include file,
and use it both for the GTK+ and WPE ports. Also add a SET_PROJECT_VERSION() macro to
unify setting the PROJECT_VERSION* family of variables.
* Source/cmake/OptionsGTK.cmake: Use the common macros imported from VersioningUtils.cmake.
* Source/cmake/OptionsWPE.cmake: Properly assign a shared object version to libWPEWebKit.so,
using the common macros from VersioningUtils.cmake.
* Source/cmake/VersioningUtils.cmake: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/ChangeLog (224102 => 224103)
--- releases/WebKitGTK/webkit-2.18/ChangeLog 2017-10-27 09:20:23 UTC (rev 224102)
+++ releases/WebKitGTK/webkit-2.18/ChangeLog 2017-10-27 09:27:28 UTC (rev 224103)
@@ -1,3 +1,19 @@
+2017-10-26 Adrian Perez de Castro <[email protected]>
+
+ [WPE] Use proper shared object versioning for libWPEWebKit.so
+ https://bugs.webkit.org/show_bug.cgi?id=178878
+
+ Reviewed by Michael Catanzaro.
+
+ Move the CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE() to a new CMake include file,
+ and use it both for the GTK+ and WPE ports. Also add a SET_PROJECT_VERSION() macro to
+ unify setting the PROJECT_VERSION* family of variables.
+
+ * Source/cmake/OptionsGTK.cmake: Use the common macros imported from VersioningUtils.cmake.
+ * Source/cmake/OptionsWPE.cmake: Properly assign a shared object version to libWPEWebKit.so,
+ using the common macros from VersioningUtils.cmake.
+ * Source/cmake/VersioningUtils.cmake: Added.
+
2017-10-18 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.1 release.
Modified: releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake (224102 => 224103)
--- releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake 2017-10-27 09:20:23 UTC (rev 224102)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsGTK.cmake 2017-10-27 09:27:28 UTC (rev 224103)
@@ -1,19 +1,9 @@
include(GNUInstallDirs)
+include(VersioningUtils)
-set(PROJECT_VERSION_MAJOR 2)
-set(PROJECT_VERSION_MINOR 18)
-set(PROJECT_VERSION_MICRO 1)
-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
+SET_PROJECT_VERSION(2 18 1)
set(WEBKITGTK_API_VERSION 4.0)
-# Libtool library version, not to be confused with API version.
-# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-macro(CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE library_name current revision age)
- math(EXPR ${library_name}_VERSION_MAJOR "${current} - ${age}")
- set(${library_name}_VERSION_MINOR ${age})
- set(${library_name}_VERSION_MICRO ${revision})
- set(${library_name}_VERSION ${${library_name}_VERSION_MAJOR}.${age}.${revision})
-endmacro()
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 61 4 24)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 24 10 6)
Modified: releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWPE.cmake (224102 => 224103)
--- releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWPE.cmake 2017-10-27 09:20:23 UTC (rev 224102)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/OptionsWPE.cmake 2017-10-27 09:27:28 UTC (rev 224103)
@@ -1,11 +1,11 @@
include(GNUInstallDirs)
+include(VersioningUtils)
-set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 0)
-set(PROJECT_VERSION_PATCH 20170728)
-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+SET_PROJECT_VERSION(0 19 0)
set(WPE_API_VERSION 0.1)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 1 0 0)
+
WEBKIT_OPTION_BEGIN()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
Added: releases/WebKitGTK/webkit-2.18/Source/cmake/VersioningUtils.cmake (0 => 224103)
--- releases/WebKitGTK/webkit-2.18/Source/cmake/VersioningUtils.cmake (rev 0)
+++ releases/WebKitGTK/webkit-2.18/Source/cmake/VersioningUtils.cmake 2017-10-27 09:27:28 UTC (rev 224103)
@@ -0,0 +1,15 @@
+macro(SET_PROJECT_VERSION major minor micro)
+ set(PROJECT_VERSION_MAJOR "${major}")
+ set(PROJECT_VERSION_MINOR "${minor}")
+ set(PROJECT_VERSION_MICRO "${micro}")
+ set(PROJECT_VERSION "${major}.${minor}.${micro}")
+endmacro()
+
+# Libtool library version, not to be confused with API version.
+# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
+macro(CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE library_name current revision age)
+ math(EXPR ${library_name}_VERSION_MAJOR "${current} - ${age}")
+ set(${library_name}_VERSION_MINOR ${age})
+ set(${library_name}_VERSION_MICRO ${revision})
+ set(${library_name}_VERSION ${${library_name}_VERSION_MAJOR}.${age}.${revision})
+endmacro()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
