Просмотр исходного кода

Ship spry-0.2.deps, licence and USM test exec; document typelib gap

Consumers building with plain valac --pkg spry-0.2 previously had to
resolve the vapi chain by hand because no .deps file was installed,
and the package declared no licence and had no USM test exec.

- vapi/spry-0.2.deps lists glib-2.0, gobject-2.0, gio-2.0,
  invercargill-1, invercargill-json, json-glib-1.0, inversion-0.1,
  statum-0.1 and invercargill-sql; every entry was verified to be
  genuinely referenced by the generated vapi (the migration classes
  derive from InvercargillSql.Migrations.Migration) by compiling a
  consumer against a clean-prefix install.
- usm-scripts/test.sh runs the meson test suite (Spry has no test cases
  today, verified to exit 0 with no tests defined; registered tests
  will run automatically) with LD_LIBRARY_PATH scrubbed so test
  binaries resolve freshly built libraries.
- src/meson.build documents why Spry ships no typelib: valac's GIR
  writer emits cross-namespace parent classes without the intermediate
  namespace segment (invercargill_sql.Migration instead of the defining
  invercargill_sql.MigrationsMigration), which g-ir-compiler cannot
  resolve; the GIR is still shipped.
- MANIFEST.usm declares LGPL-3.0-or-later with the LICENSE text, adds
  vapi:spry-0.2.deps to provides and wires the test exec.

Verified: usm manifest test green, usm manifest validate green,
consumer compile from a scratch prefix green.
saddle-ClankerSaddle 2 недель назад
Родитель
Сommit
f5f5178522
6 измененных файлов с 216 добавлено и 3 удалено
  1. 2 1
      .gitignore
  2. 165 0
      LICENSE
  3. 4 2
      MANIFEST.usm
  4. 21 0
      src/meson.build
  5. 15 0
      usm-scripts/test.sh
  6. 9 0
      vapi/spry-0.2.deps

+ 2 - 1
.gitignore

@@ -1,3 +1,4 @@
+builddir/
 data/
 spry_auth.db
-*.sqlite
+*.sqlite

+ 165 - 0
LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

+ 4 - 2
MANIFEST.usm

@@ -2,13 +2,14 @@
   "name": "spry",
   "version": "0.2",
   "summary": "Reusable authentication and user-management services for Statum, plus the spry CLI",
-  "licences": [],
+  "licences": [ { "name": "LGPL-3.0-or-later", "category": "libre", "text": "LICENSE" } ],
   "flags": ["ninjaStyleProgress"],
   "provides": {
     "lib:libspry-0.2.so": "as-expected",
     "bin:spry": "as-expected",
     "inc:spry-0.2.h": "as-expected",
     "vapi:spry-0.2.vapi": "as-expected",
+    "vapi:spry-0.2.deps": "as-expected",
     "gir:spry-0.2.gir": "as-expected",
     "pc:spry-0.2.pc": "as-expected"
   },
@@ -55,6 +56,7 @@
   "execs": {
     "build": "usm-scripts/build.sh",
     "install": "usm-scripts/install.sh",
-    "postInstall": "usm-scripts/post-install.sh"
+    "postInstall": "usm-scripts/post-install.sh",
+    "test": "usm-scripts/test.sh"
   }
 }

+ 21 - 0
src/meson.build

@@ -35,6 +35,27 @@ pkg.generate(libspry,
     name : 'spry-@0@'.format(library_version),
     requires : [statum_dep])
 
+g_ir_compiler = find_program('g-ir-compiler')
+# NOTE: Spry intentionally ships no typelib. Its migration classes derive
+# from InvercargillSql.Migrations.Migration, and valac's GIR writer emits
+# that parent as "invercargill_sql.Migration" (dropping the intermediate
+# Migrations namespace segment) while the defining GIR names it
+# "invercargill_sql.MigrationsMigration" — g-ir-compiler cannot resolve
+# the type and the typelib build fails. The GIR itself is still shipped
+# (parents are resolvable through it for consumers that walk the chain).
+# Revisit when valac fixes cross-namespace parent naming in generated GIR.
+
+# Ship the .deps file alongside the vapi so consumers can build with
+# plain `valac --pkg spry-0.2` without manually resolving the vapi
+# chain (GLib stack and the Invercargill/Inversion/Statum stack).
+# Every entry resolves in share/vala/vapi.
+vapi_install_dir = get_option('datadir') / 'vala' / 'vapi'
+install_data(
+    '../vapi/spry-@0@.deps'.format(library_version),
+    install_dir: vapi_install_dir,
+    rename: 'spry-@0@.deps'.format(library_version),
+)
+
 spry_dep = declare_dependency(
     link_with: libspry,
     include_directories: include_directories('.'),

+ 15 - 0
usm-scripts/test.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# USM test exec: run the meson test suite for Spry.
+# $1 is the build directory created by usm. Spry has no test cases
+# registered today, so this runs (and passes) with "No tests defined" —
+# verified empirically: `ninja -C build test` exits 0. When tests are
+# added and registered with meson's test() they run here automatically.
+#
+# LD_LIBRARY_PATH is scrubbed, not set: on these saddles a saddle-wide
+# /opt/usm/lib entry silently overrides the build-tree RUNPATH of test
+# binaries, making suites run against stale installed libraries instead
+# of the freshly built ones (fleet discovery #1).
+set -e
+
+build_dir=$1
+LD_LIBRARY_PATH= ninja -C "$build_dir" test

+ 9 - 0
vapi/spry-0.2.deps

@@ -0,0 +1,9 @@
+glib-2.0
+gobject-2.0
+gio-2.0
+invercargill-1
+invercargill-json
+json-glib-1.0
+inversion-0.1
+statum-0.1
+invercargill-sql