Sfoglia il codice sorgente

Version 0.3

0.2.1 did not register as an update for 0.2 clients (version comparison
fails across different-arity versions); minor bump to 0.3 so the update
propagates. API unchanged at 0.2: api_version ('0.2' — library/vapi/gir/
pc artifact names, downstream consumers depend on them) split from
release_version (project version, reaching only the pkg-config Version:
field, which usm checks against the manifest version).
clanker 4 settimane fa
parent
commit
47c2efa790
3 ha cambiato i file con 11 aggiunte e 7 eliminazioni
  1. 1 1
      MANIFEST.usm
  2. 1 1
      meson.build
  3. 9 5
      src/meson.build

+ 1 - 1
MANIFEST.usm

@@ -1,6 +1,6 @@
 {
   "name" : "spry",
-  "version" : "0.2.1",
+  "version" : "0.3",
   "summary" : "Reusable authentication and user-management services for Statum, plus the spry CLI",
   "licences" : [],
   "flags" : [

+ 1 - 1
meson.build

@@ -1,5 +1,5 @@
 project('spry', ['c', 'vala'],
-  version: '0.2',
+  version: '0.3',
 )
 
 vapi_dir = join_paths(meson.current_source_dir(), 'vapi')

+ 9 - 5
src/meson.build

@@ -21,19 +21,23 @@ sources = files(
     'Actions/DeleteUserAction.vala',
 )
 
-library_version = meson.project_version()
-libspry = shared_library('spry-@0@'.format(library_version),
+# The API version rides every artifact name (libspry-0.2.so, spry-0.2.vapi,
+# ...); the project version is the release version and only reaches the
+# pkg-config Version: field (usm checks it against the manifest version).
+api_version = '0.2'
+release_version = meson.project_version()
+libspry = shared_library('spry-@0@'.format(api_version),
     sources,
     dependencies: [glib_dep, gobject_dep, gio_dep, invercargill_dep, invercargill_json_dep, json_glib_dep, inversion_dep, astralis_dep, libxml_dep, sodium_deps, invercargill_sql_dep, sqlite_dep, invercargill_sql_inversion_dep, statum_dep],
     install: true,
-    vala_gir: 'spry-@0@.gir'.format(library_version),
+    vala_gir: 'spry-@0@.gir'.format(api_version),
     install_dir: [true, true, true, true]
 )
 
 pkg = import('pkgconfig')
 pkg.generate(libspry,
-    version : library_version,
-    name : 'spry-@0@'.format(library_version),
+    version : release_version,
+    name : 'spry-@0@'.format(api_version),
     requires : [statum_dep])
 
 spry_dep = declare_dependency(