Changeset 166499 in webkit

Timestamp:

Mar 31, 2014 7:38:39 AM (10 years ago)

Author:

Martin Robinson

Message:

[GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
​https://bugs.webkit.org/show_bug.cgi?id=130936

Reviewed by Carlos Garcia Campos.

.:

• Source/cmake/OptionsGTK.cmake: No longer emulate the Autotools macro names.

Source/WebKit/gtk:

• webkit/webkitversion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.

Source/WebKit2:

• UIProcess/API/gtk/WebKitVersion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/webkit/webkitversion.h.in (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in (modified) (3 diffs)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2014-03-31  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
+        https://bugs.webkit.org/show_bug.cgi?id=130936
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsGTK.cmake: No longer emulate the Autotools macro names.
+
 2014-03-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2014-03-31  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
+        https://bugs.webkit.org/show_bug.cgi?id=130936
+
+        Reviewed by Carlos Garcia Campos.
+
+        * webkit/webkitversion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.
+
 2014-03-28  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebKit/gtk/webkit/webkitversion.h.in

@@ -26 +26 @@
 G_BEGIN_DECLS
 
-#define WEBKIT_MAJOR_VERSION (@WEBKIT_MAJOR_VERSION@)
-#define WEBKIT_MINOR_VERSION (@WEBKIT_MINOR_VERSION@)
-#define WEBKIT_MICRO_VERSION (@WEBKIT_MICRO_VERSION@)
+#define WEBKIT_MAJOR_VERSION (@PROJECT_VERSION_PATCH@)
+#define WEBKIT_MINOR_VERSION (@PROJECT_VERSION_MINOR@)
+#define WEBKIT_MICRO_VERSION (@PROJECT_VERSION_PATCH@)
 #define WEBKIT_USER_AGENT_MAJOR_VERSION (@WEBKIT_USER_AGENT_MAJOR_VERSION@)
 #define WEBKIT_USER_AGENT_MINOR_VERSION (@WEBKIT_USER_AGENT_MINOR_VERSION@)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-31  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
+        https://bugs.webkit.org/show_bug.cgi?id=130936
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/API/gtk/WebKitVersion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.
+
 2014-03-31  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in

@@ -36 +36 @@
  * against at application run time.
  */
-#define WEBKIT_MAJOR_VERSION (@WEBKIT_MAJOR_VERSION@)
+#define WEBKIT_MAJOR_VERSION (@PROJECT_VERSION_MAJOR@)
 
 /**
@@ -45 +45 @@
  * against at application run time.
  */
-#define WEBKIT_MINOR_VERSION (@WEBKIT_MINOR_VERSION@)
+#define WEBKIT_MINOR_VERSION (@PROJECT_VERSION_MINOR@)
 
 /**
@@ -54 +54 @@
  * against at application run time.
  */
-#define WEBKIT_MICRO_VERSION (@WEBKIT_MICRO_VERSION@)
+#define WEBKIT_MICRO_VERSION (@PROJECT_VERSION_PATCH@)
 
 /**

trunk/Source/cmake/OptionsGTK.cmake

@@ -15 +15 @@
 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 32 0 7)
 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 16 2 16)
-
-# This is a little confusing: WEBKIT_MICRO_VERSION and friends are used as
-# macros in files like WebKitVersion.h.in to expose the project version to
-# the API. Meanwhile WEBKIT_VERSION_MICRO (note the transposed words) is used
-# by the CMake files to hold the *library* version number, which we calculated
-# from the libtool triple above. We should consider ditching these below
-# and using PROJECT_VERSION_* directly.
-set(WEBKIT_MICRO_VERSION ${PROJECT_VERSION_PATCH})
-set(WEBKIT_MINOR_VERSION ${PROJECT_VERSION_MINOR})
-set(WEBKIT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
 
 set(USE_GTK2 OFF CACHE BOOL "Whether or not to use GTK+ 2. WebKit2 only supports GTK+ 3.")