Bläddra i källkod

Version 0.2: minor bump so the Scope.release fix reaches update clients

inversion-0.1.1 (the Scope.release / reference-cycle fix) never registered
as an update for 0.1 clients — usm's version comparison fails across
different-arity versions (0.1 vs 0.1.1), the same bug that hid spry-0.2.1.
Minor bump to 0.2 propagates. API unchanged at 0.1: api_version ('0.1' —
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 veckor sedan
förälder
incheckning
45c0bee944
3 ändrade filer med 37 tillägg och 30 borttagningar
  1. 23 21
      MANIFEST.usm
  2. 1 1
      meson.build
  3. 13 8
      src/meson.build

+ 23 - 21
MANIFEST.usm

@@ -1,24 +1,26 @@
 {
-  "name": "inversion",
-  "version": "0.1",
-  "summary": "Inversion of Control and dependency injection for the Web-Stack",
-  "licences": [],
-  "flags": ["ninjaStyleProgress"],
-  "provides": {
-    "lib:libinversion-0.1.so": "as-expected",
-    "inc:inversion-0.1.h": "as-expected",
-    "vapi:inversion-0.1.vapi": "as-expected",
-    "gir:inversion-0.1.gir": "as-expected",
-    "typelib:inversion-0.1.typelib": "as-expected",
-    "pc:inversion-0.1.pc": "as-expected"
+  "name" : "inversion",
+  "version" : "0.2",
+  "summary" : "Inversion of Control and dependency injection for the Web-Stack",
+  "licences" : [],
+  "flags" : [
+    "ninjaStyleProgress"
+  ],
+  "provides" : {
+    "lib:libinversion-0.1.so" : "as-expected",
+    "inc:inversion-0.1.h" : "as-expected",
+    "vapi:inversion-0.1.vapi" : "as-expected",
+    "gir:inversion-0.1.gir" : "as-expected",
+    "typelib:inversion-0.1.typelib" : "as-expected",
+    "pc:inversion-0.1.pc" : "as-expected"
   },
-  "depends": {
-    "runtime": [
+  "depends" : {
+    "runtime" : [
       "lib:libglib-2.0.so.0",
       "lib:libgobject-2.0.so.0",
       "lib:libinvercargill-1.so"
     ],
-    "build": [
+    "build" : [
       "bin:valac",
       "bin:meson",
       "bin:ninja",
@@ -28,13 +30,13 @@
       "pc:gobject-2.0.pc",
       "pc:invercargill-1.pc"
     ],
-    "manage": [
+    "manage" : [
       "bin:bash"
     ]
   },
-  "execs": {
-    "build": "usm-scripts/build.sh",
-    "install": "usm-scripts/install.sh",
-    "postInstall": "usm-scripts/post-install.sh"
+  "execs" : {
+    "build" : "usm-scripts/build.sh",
+    "install" : "usm-scripts/install.sh",
+    "postInstall" : "usm-scripts/post-install.sh"
   }
-}
+}

+ 1 - 1
meson.build

@@ -1,5 +1,5 @@
 project('inversion', ['c', 'vala'],
-  version: '0.1',
+  version: '0.2',
 )
 
 # Dependencies

+ 13 - 8
src/meson.build

@@ -11,12 +11,17 @@ sources = files(
     'Module.vala'
 )
 
-library_version = meson.project_version()
-libinversion = shared_library('inversion-@0@'.format(library_version),
+# The API version rides every artifact name (libinversion-0.1.so,
+# inversion-0.1.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.1'
+release_version = meson.project_version()
+libinversion = shared_library('inversion-@0@'.format(api_version),
     sources,
     dependencies: [glib_dep, gobject_dep, invercargill_dep],
     install: true,
-    vala_gir: 'inversion-@0@.gir'.format(library_version),
+    vala_gir: 'inversion-@0@.gir'.format(api_version),
     install_dir: [true, true, true, true]
 )
 
@@ -29,12 +34,12 @@ inversion_dep = declare_dependency(
 
 pkg = import('pkgconfig')
 pkg.generate(libinversion,
-    version : library_version,
-    name : 'inversion-@0@'.format(library_version))
-    
+    version : release_version,
+    name : 'inversion-@0@'.format(api_version))
+
 g_ir_compiler = find_program('g-ir-compiler')
-custom_target('inversion typelib', command: [g_ir_compiler, '--shared-library=libinversion-@0@.so'.format(library_version), '--output', '@OUTPUT@', meson.current_build_dir() / 'inversion-@0@.gir'.format(library_version)],
-              output: 'inversion-@0@.typelib'.format(library_version),
+custom_target('inversion typelib', command: [g_ir_compiler, '--shared-library=libinversion-@0@.so'.format(api_version), '--output', '@OUTPUT@', meson.current_build_dir() / 'inversion-@0@.gir'.format(api_version)],
+              output: 'inversion-@0@.typelib'.format(api_version),
               depends: libinversion,
               install: true,
               install_dir: get_option('libdir') / 'girepository-1.0')