Эх сурвалжийг харах

Ship statum-0.1.deps, a typelib, licence and USM test exec

Consumers building with plain valac --pkg statum-0.1 previously had to
resolve the vapi chain by hand because no .deps file was installed; the
library also shipped a GIR without a compiled typelib, declared no
licence, and its test suite never ran under USM.

- vapi/statum-0.1.deps lists glib-2.0, gobject-2.0, gio-2.0,
  invercargill-1, invercargill-json, json-glib-1.0, inversion-0.1 and
  astralis-0.1; every entry was verified to be genuinely referenced by
  the generated vapi (InvercargillJson.JsonElement among them) by
  compiling a consumer against a clean-prefix install.
- src/meson.build installs the .deps into share/vala/vapi and compiles
  statum-0.1.typelib (named after the GIR namespace astralis-style,
  --shared-library is the SONAME libstatum-0.1.so).
- usm-scripts/test.sh runs the meson test suite with LD_LIBRARY_PATH
  scrubbed so the test binary resolves the freshly built library via
  its RUNPATH instead of a stale /opt/usm/lib copy.
- MANIFEST.usm declares LGPL-3.0-or-later with the LICENSE text, adds
  vapi:statum-0.1.deps and typelib:statum-0.1.typelib to provides and
  wires the test exec.

Verified: meson test 1/1 OK, usm manifest test green, usm manifest
validate green, consumer compile from a scratch prefix green.
saddle-ClankerSaddle 2 долоо хоног өмнө
parent
commit
6d8870f396
5 өөрчлөгдсөн 214 нэмэгдсэн , 2 устгасан
  1. 165 0
      LICENSE
  2. 5 2
      MANIFEST.usm
  3. 24 0
      src/meson.build
  4. 12 0
      usm-scripts/test.sh
  5. 8 0
      vapi/statum-0.1.deps

+ 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.

+ 5 - 2
MANIFEST.usm

@@ -2,7 +2,7 @@
   "name": "statum",
   "version": "0.1",
   "summary": "Page rendering and state management for web applications",
-  "licences": [],
+  "licences": [ { "name": "LGPL-3.0-or-later", "category": "libre", "text": "LICENSE" } ],
   "flags": ["ninjaStyleProgress"],
   "provides": {
     "lib:libstatum-0.1.so": "as-expected",
@@ -11,7 +11,9 @@
     "bin:statum-genkeys": "as-expected",
     "inc:statum-0.1.h": "as-expected",
     "vapi:statum-0.1.vapi": "as-expected",
+    "vapi:statum-0.1.deps": "as-expected",
     "gir:statum-0.1.gir": "as-expected",
+    "typelib:statum-0.1.typelib": "as-expected",
     "pc:statum-0.1.pc": "as-expected"
   },
   "depends": {
@@ -54,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"
   }
 }

+ 24 - 0
src/meson.build

@@ -89,6 +89,30 @@ pkg.generate(libstatum,
     version: library_version,
     name: 'statum-@0@'.format(library_version))
 
+# Ship the .deps file alongside the vapi so consumers can build with
+# plain `valac --pkg statum-0.1` without manually resolving the vapi
+# chain (GLib stack, json-glib, and the Invercargill/Inversion/Astralis
+# stack). Every entry must resolve in share/vala/vapi — the private
+# libsodium CCode binding is NOT listed because the generated vapi
+# leaks no Sodium types.
+vapi_install_dir = get_option('datadir') / 'vala' / 'vapi'
+install_data(
+    '../vapi/statum-@0@.deps'.format(library_version),
+    install_dir: vapi_install_dir,
+    rename: 'statum-@0@.deps'.format(library_version),
+)
+
+g_ir_compiler = find_program('g-ir-compiler')
+# The typelib is named <namespace>-<version>.typelib to match the GIR
+# (namespace "statum" version "0.1"), as g-ir-scanner/girepository users
+# expect. The shared-library it names is the library's SONAME
+# (libstatum-0.1.so) — that is what runtime dlopen resolves.
+custom_target('statum typelib', command: [g_ir_compiler, '--shared-library=libstatum-@0@.so'.format(library_version), '--output', '@OUTPUT@', meson.current_build_dir() / 'statum-@0@.gir'.format(library_version)],
+              output: 'statum-@0@.typelib'.format(library_version),
+              depends: libstatum,
+              install: true,
+              install_dir: get_option('libdir') / 'girepository-1.0')
+
 statum_dep = declare_dependency(
     link_with: libstatum,
     include_directories: include_directories('.'),

+ 12 - 0
usm-scripts/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# USM test exec: run the Statum test suite (registered with meson test).
+# $1 is the build directory created by usm.
+#
+# LD_LIBRARY_PATH is scrubbed, not set: on these saddles a saddle-wide
+# /opt/usm/lib entry silently overrides the build-tree RUNPATH of the
+# test binary, making the suite run against a stale installed library
+# instead of the freshly built one (fleet discovery #1).
+set -e
+
+build_dir=$1
+LD_LIBRARY_PATH= ninja -C "$build_dir" test

+ 8 - 0
vapi/statum-0.1.deps

@@ -0,0 +1,8 @@
+glib-2.0
+gobject-2.0
+gio-2.0
+invercargill-1
+invercargill-json
+json-glib-1.0
+inversion-0.1
+astralis-0.1