[CMake] GTK and EFL are using PROJECT_VERSION_PATCH to define the micro version
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Aug 2014 13:34:56 +0000 (13:34 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Aug 2014 13:34:56 +0000 (13:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=135501

Reviewed by Gyuyoung Kim.

Use PROJECT_VERSION_MICRO instead.

.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitHelpers.cmake:

Source/WebKit2:
* UIProcess/API/efl/EWebKit2.h.in:
* UIProcess/API/gtk/WebKitVersion.h.in:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171915 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/efl/EWebKit2.h.in
Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/WebKitHelpers.cmake

index 3f9e858..db55af7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-08-01  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [CMake] GTK and EFL are using PROJECT_VERSION_PATCH to define the micro version
+        https://bugs.webkit.org/show_bug.cgi?id=135501
+
+        Reviewed by Gyuyoung Kim.
+
+        Use PROJECT_VERSION_MICRO instead.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/WebKitHelpers.cmake:
+
 2014-07-31  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Bump ewebkit version to 1.11
index 425d4fe..7c1d7f4 100644 (file)
@@ -1,5 +1,17 @@
 2014-08-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 
+        [CMake] GTK and EFL are using PROJECT_VERSION_PATCH to define the micro version
+        https://bugs.webkit.org/show_bug.cgi?id=135501
+
+        Reviewed by Gyuyoung Kim.
+
+        Use PROJECT_VERSION_MICRO instead.
+
+        * UIProcess/API/efl/EWebKit2.h.in:
+        * UIProcess/API/gtk/WebKitVersion.h.in:
+
+2014-08-01  Carlos Garcia Campos  <cgarcia@igalia.com>
+
         Unreviewed. Add missing sections to documentation.
 
         * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add
index db96d41..b67f79d 100644 (file)
@@ -30,7 +30,7 @@
 
 #define EWK_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
 #define EWK_VERSION_MINOR @PROJECT_VERSION_MINOR@
-#define EWK_VERSION_MICRO @PROJECT_VERSION_PATCH@
+#define EWK_VERSION_MICRO @PROJECT_VERSION_MICRO@
 
 #include "ewk_auth_request.h"
 #include "ewk_back_forward_list.h"
index 5e4cef8..1364bf6 100644 (file)
@@ -53,7 +53,7 @@ G_BEGIN_DECLS
  * application compile time, rather than from the library linked
  * against at application run time.
  */
-#define WEBKIT_MICRO_VERSION (@PROJECT_VERSION_PATCH@)
+#define WEBKIT_MICRO_VERSION (@PROJECT_VERSION_MICRO@)
 
 /**
  * WEBKIT_CHECK_VERSION:
index 325e377..bbdb30e 100644 (file)
@@ -1,7 +1,7 @@
 set(PROJECT_VERSION_MAJOR 1)
 set(PROJECT_VERSION_MINOR 11)
-set(PROJECT_VERSION_PATCH 0)
-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+set(PROJECT_VERSION_MICRO 0)
+set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
 
 add_definitions(-DBUILDING_EFL__=1)
 
index e45d94f..277372b 100644 (file)
@@ -2,8 +2,8 @@ include(GNUInstallDirs)
 
 set(PROJECT_VERSION_MAJOR 2)
 set(PROJECT_VERSION_MINOR 5)
-set(PROJECT_VERSION_PATCH 1)
-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+set(PROJECT_VERSION_MICRO 1)
+set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
 set(WEBKITGTK_API_VERSION 4.0)
 
 # Libtool library version, not to be confused with API version.
index 78390ec..9564d23 100644 (file)
@@ -98,7 +98,7 @@ endmacro()
 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_PATCH ${revision})
+    set(${library_name}_VERSION_MICRO ${revision})
     set(${library_name}_VERSION ${${library_name}_VERSION_MAJOR}.${age}.${revision})
 endmacro()
 
@@ -109,8 +109,8 @@ endif ()
 if (NOT DEFINED ${library_name}_VERSION_MINOR)
     set(${library_name}_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 endif ()
-if (NOT DEFINED ${library_name}_VERSION_PATCH)
-    set(${library_name}_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+if (NOT DEFINED ${library_name}_VERSION_MICRO)
+    set(${library_name}_VERSION_MICRO ${PROJECT_VERSION_MICRO})
 endif ()
 if (NOT DEFINED ${library_name}_VERSION)
     set(${library_name}_VERSION ${PROJECT_VERSION})