GNOME.org
 

[gnome-builder] build: reset version macros for 43

commit 38f9d13c3bb3d0d56070e9bba8c52bb6670ee1a2
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 11 15:57:40 2022 -0700

    build: reset version macros for 43
    
    We are switching GTK versions, so it's a great time to remove all of our
    previous versioning information for the new release series. We are still
    ABI bound per-release, much like other GNOME modules, but this just cleans
    things since any external plugins would have to be rewritten anyway with
    the GTK 4 change.

 meson.build                          |   2 +-
 src/libide/core/ide-version-macros.h | 197 ++++-------------------------------
 src/libide/core/ide-version.h.in     |  10 +-
 3 files changed, 27 insertions(+), 182 deletions(-)
---
diff --git a/meson.build b/meson.build
index a35940ad7..5e60881ec 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@ project('gnome-builder', 'c',
 version_split = meson.project_version().split('.')
 MAJOR_VERSION = version_split[0]
 
-libide_api_version = '@0@.0'.format(MAJOR_VERSION)
+libide_api_version = '@0@'.format(MAJOR_VERSION)
 
 pkgdocdir_abs = join_paths(get_option('prefix'), get_option('datadir'), 'doc', 'gnome-builder')
 pkglibdir_abs = join_paths(get_option('prefix'), get_option('libdir'), 'gnome-builder')
diff --git a/src/libide/core/ide-version-macros.h b/src/libide/core/ide-version-macros.h
index 431d66be2..f1832fc98 100644
--- a/src/libide/core/ide-version-macros.h
+++ b/src/libide/core/ide-version-macros.h
@@ -25,44 +25,27 @@
 #include "ide-version.h"
 
 #ifndef _IDE_EXTERN
-#define _IDE_EXTERN extern
+# define _IDE_EXTERN extern
 #endif
 
+#define IDE_VERSION_CUR_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION, 0))
+
 #ifdef IDE_DISABLE_DEPRECATION_WARNINGS
-#define IDE_DEPRECATED _IDE_EXTERN
-#define IDE_DEPRECATED_FOR(f) _IDE_EXTERN
-#define IDE_UNAVAILABLE(maj,min) _IDE_EXTERN
+# define IDE_DEPRECATED _IDE_EXTERN
+# define IDE_DEPRECATED_FOR(f) _IDE_EXTERN
+# define IDE_UNAVAILABLE(maj,min) _IDE_EXTERN
 #else
-#define IDE_DEPRECATED G_DEPRECATED _IDE_EXTERN
-#define IDE_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _IDE_EXTERN
-#define IDE_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _IDE_EXTERN
+# define IDE_DEPRECATED G_DEPRECATED _IDE_EXTERN
+# define IDE_DEPRECATED_FOR(f) G_DEPRECATED_FOR (f) _IDE_EXTERN
+# define IDE_UNAVAILABLE(maj,min) G_UNAVAILABLE (maj, min) _IDE_EXTERN
 #endif
 
-#define IDE_VERSION_3_28 (G_ENCODE_VERSION (3, 28))
-#define IDE_VERSION_3_30 (G_ENCODE_VERSION (3, 30))
-#define IDE_VERSION_3_32 (G_ENCODE_VERSION (3, 32))
-#define IDE_VERSION_3_34 (G_ENCODE_VERSION (3, 34))
-#define IDE_VERSION_3_36 (G_ENCODE_VERSION (3, 36))
-#define IDE_VERSION_3_38 (G_ENCODE_VERSION (3, 38))
-#define IDE_VERSION_3_40 (G_ENCODE_VERSION (3, 40))
-#define IDE_VERSION_41 (G_ENCODE_VERSION (41, 0))
-#define IDE_VERSION_42 (G_ENCODE_VERSION (42, 0))
 #define IDE_VERSION_43 (G_ENCODE_VERSION (43, 0))
 
-#if (IDE_MINOR_VERSION == 99)
-# define IDE_VERSION_CUR_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION + 1, 0))
-#elif (IDE_MINOR_VERSION % 2)
-# define IDE_VERSION_CUR_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION, IDE_MINOR_VERSION + 1))
-#else
-# define IDE_VERSION_CUR_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION, IDE_MINOR_VERSION))
-#endif
-
-#if (IDE_MINOR_VERSION == 99)
-# define IDE_VERSION_PREV_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION + 1, 0))
-#elif (IDE_MINOR_VERSION % 2)
-# define IDE_VERSION_PREV_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION, IDE_MINOR_VERSION - 1))
+#if IDE_MAJOR_VERSION == IDE_VERSION_43
+# define IDE_VERSION_PREV_STABLE (IDE_VERSION_43)
 #else
-# define IDE_VERSION_PREV_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION, IDE_MINOR_VERSION - 2))
+# define IDE_VERSION_PREV_STABLE (G_ENCODE_VERSION (IDE_MAJOR_VERSION - 1, 0))
 #endif
 
 /**
@@ -72,15 +55,13 @@
  * the ide.h header.
  *
  * The definition should be one of the predefined IDE version
- * macros: %IDE_VERSION_3_28, ...
+ * macros: %IDE_VERSION_43, ...
  *
  * This macro defines the lower bound for the Builder API to use.
  *
  * If a function has been deprecated in a newer version of Builder,
  * it is possible to use this symbol to avoid the compiler warnings
  * without disabling warning for every deprecated function.
- *
- * Since: 3.32
  */
 #ifndef IDE_VERSION_MIN_REQUIRED
 # define IDE_VERSION_MIN_REQUIRED (IDE_VERSION_CUR_STABLE)
@@ -93,15 +74,13 @@
  * the ide.h header.
 
  * The definition should be one of the predefined Builder version
- * macros: %IDE_VERSION_1_0, %IDE_VERSION_1_2,...
+ * macros: %IDE_VERSION_43, %IDE_VERSION_44,...
  *
  * This macro defines the upper bound for the IDE API to use.
  *
  * If a function has been introduced in a newer version of Builder,
  * it is possible to use this symbol to get compiler warnings when
  * trying to use that function.
- *
- * Since: 3.32
  */
 #ifndef IDE_VERSION_MAX_ALLOWED
 # if IDE_VERSION_MIN_REQUIRED > IDE_VERSION_PREV_STABLE
@@ -111,151 +90,17 @@
 # endif
 #endif
 
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_MIN_REQUIRED
-#error "IDE_VERSION_MAX_ALLOWED must be >= IDE_VERSION_MIN_REQUIRED"
-#endif
-#if IDE_VERSION_MIN_REQUIRED < IDE_VERSION_3_28
-#error "IDE_VERSION_MIN_REQUIRED must be >= IDE_VERSION_3_28"
-#endif
-
-#define IDE_AVAILABLE_IN_ALL                   _IDE_EXTERN
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_3_28
-# define IDE_DEPRECATED_IN_3_28                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_3_28_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_3_28                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_3_28_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_3_28
-# define IDE_AVAILABLE_IN_3_28                 IDE_UNAVAILABLE(3, 28)
-#else
-# define IDE_AVAILABLE_IN_3_28                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_3_30
-# define IDE_DEPRECATED_IN_3_30                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_3_30_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_3_30                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_3_30_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_3_30
-# define IDE_AVAILABLE_IN_3_30                 IDE_UNAVAILABLE(3, 30)
-#else
-# define IDE_AVAILABLE_IN_3_30                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_3_32
-# define IDE_DEPRECATED_IN_3_32                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_3_32_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_3_32                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_3_32_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_3_32
-# define IDE_AVAILABLE_IN_3_32                 IDE_UNAVAILABLE(3, 32)
-#else
-# define IDE_AVAILABLE_IN_3_32                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_3_34
-# define IDE_DEPRECATED_IN_3_34                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_3_34_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_3_34                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_3_34_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_3_34
-# define IDE_AVAILABLE_IN_3_34                 IDE_UNAVAILABLE(3, 34)
-#else
-# define IDE_AVAILABLE_IN_3_34                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_3_36
-# define IDE_DEPRECATED_IN_3_36                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_3_36_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_3_36                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_3_36_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_3_36
-# define IDE_AVAILABLE_IN_3_36                 IDE_UNAVAILABLE(3, 36)
-#else
-# define IDE_AVAILABLE_IN_3_36                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_3_38
-# define IDE_DEPRECATED_IN_3_38                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_3_38_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_3_38                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_3_38_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_3_38
-# define IDE_AVAILABLE_IN_3_38                 IDE_UNAVAILABLE(3, 38)
-#else
-# define IDE_AVAILABLE_IN_3_38                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_3_40
-# define IDE_DEPRECATED_IN_3_40                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_3_40_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_3_40                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_3_40_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_3_40
-# define IDE_AVAILABLE_IN_3_40                 IDE_UNAVAILABLE(3, 40)
-#else
-# define IDE_AVAILABLE_IN_3_40                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_41
-# define IDE_DEPRECATED_IN_41                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_41_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_41                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_41_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_41
-# define IDE_AVAILABLE_IN_41                 IDE_UNAVAILABLE(41, 0)
-#else
-# define IDE_AVAILABLE_IN_41                 _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_42
-# define IDE_DEPRECATED_IN_42                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_42_FOR(f)         IDE_DEPRECATED_FOR(f)
-#else
-# define IDE_DEPRECATED_IN_42                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_42_FOR(f)         _IDE_EXTERN
-#endif
-
-#if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_42
-# define IDE_AVAILABLE_IN_42                 IDE_UNAVAILABLE(42, 0)
-#else
-# define IDE_AVAILABLE_IN_42                 _IDE_EXTERN
-#endif
+#define IDE_AVAILABLE_IN_ALL _IDE_EXTERN
 
 #if IDE_VERSION_MIN_REQUIRED >= IDE_VERSION_43
-# define IDE_DEPRECATED_IN_43                IDE_DEPRECATED
-# define IDE_DEPRECATED_IN_43_FOR(f)         IDE_DEPRECATED_FOR(f)
+# define IDE_DEPRECATED_IN_43 IDE_DEPRECATED
+# define IDE_DEPRECATED_IN_43_FOR(f) IDE_DEPRECATED_FOR(f)
 #else
-# define IDE_DEPRECATED_IN_43                _IDE_EXTERN
-# define IDE_DEPRECATED_IN_43_FOR(f)         _IDE_EXTERN
+# define IDE_DEPRECATED_IN_43 _IDE_EXTERN
+# define IDE_DEPRECATED_IN_43_FOR(f) _IDE_EXTERN
 #endif
-
 #if IDE_VERSION_MAX_ALLOWED < IDE_VERSION_43
-# define IDE_AVAILABLE_IN_43                 IDE_UNAVAILABLE(43, 0)
+# define IDE_AVAILABLE_IN_43 IDE_UNAVAILABLE(43, 0)
 #else
-# define IDE_AVAILABLE_IN_43                 _IDE_EXTERN
+# define IDE_AVAILABLE_IN_43 _IDE_EXTERN
 #endif
diff --git a/src/libide/core/ide-version.h.in b/src/libide/core/ide-version.h.in
index 238307921..ea29450dd 100644
--- a/src/libide/core/ide-version.h.in
+++ b/src/libide/core/ide-version.h.in
@@ -50,23 +50,23 @@
 /**
  * IDE_MAJOR_VERSION:
  *
- * libide major version component (e.g. 1 if %IDE_VERSION is 1.2.3)
+ * libide major version component (e.g. 43 if %IDE_VERSION is 43.1)
  */
-#define IDE_MAJOR_VERSION (@MAJOR_VERSION@)
+#define IDE_MAJOR_VERSION @MAJOR_VERSION@
 
 /**
  * IDE_MINOR_VERSION:
  *
- * libide minor version component (e.g. 2 if %IDE_VERSION is 1.2.3)
+ * libide minor version component (e.g. 1 if %IDE_VERSION is 43.1)
  */
-#define IDE_MINOR_VERSION (@MINOR_VERSION@)
+#define IDE_MINOR_VERSION @MINOR_VERSION@
 
 /**
  * IDE_VERSION
  *
  * libide version.
  */
-#define IDE_VERSION (@VERSION@)
+#define IDE_VERSION @VERSION@
 
 /**
  * IDE_VERSION_S:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]