소스 검색

Ship invercargill-sql.deps, declare the licence, run tests via usm

The vapi shipped without a .deps file, so consumers had to know
invercargill-sql's closure themselves. The .deps (glib-2.0,
gobject-2.0, invercargill-1) is now shipped and installed to
share/vala/vapi; the generated vapi leaks no Sqlite or Gio namespaces
(all sqlite-touching classes are internal), so that is the complete
closure. A consumer compiling against a scratch prefix with only the
.deps chain was verified to build and run (parse a connection string,
open and close a connection).

The five meson test suites existed but no usm test exec ran them:
usm-scripts/test.sh plus the manifest test exec now do, via ninja.
test.sh scrubs LD_LIBRARY_PATH because a system-wide value (this
saddle exports /opt/usm/lib) overrides the build tree's RUNPATH and
links tests against a stale installed copy of the library.

The manifest declared no licence at all: LGPLv3 with the LICENSE text
(fetched verbatim from gnu.org) now matches the rest of the family.
goal-38 task agent 2 주 전
부모
커밋
b07ee9aac0
5개의 변경된 파일과 205개의 추가작업 그리고 3개의 파일을 삭제
  1. 165 0
      LICENSE
  2. 13 3
      MANIFEST.usm
  3. 12 0
      meson.build
  4. 12 0
      usm-scripts/test.sh
  5. 3 0
      vapi/invercargill-sql.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.

+ 13 - 3
MANIFEST.usm

@@ -2,12 +2,21 @@
   "name": "invercargill-sql",
   "version": "0.1",
   "summary": "SQL ORM built on Invercargill data structures and concepts",
-  "licences": [],
-  "flags": ["ninjaStyleProgress"],
+  "licences": [
+    {
+      "name": "LGPLv3",
+      "category": "libre",
+      "text": "LICENSE"
+    }
+  ],
+  "flags": [
+    "ninjaStyleProgress"
+  ],
   "provides": {
     "lib:libinvercargill-sql.so": "as-expected",
     "inc:invercargill-sql.h": "as-expected",
     "vapi:invercargill-sql.vapi": "as-expected",
+    "vapi:invercargill-sql.deps": "as-expected",
     "gir:invercargill_sql-1.0.gir": "as-expected",
     "typelib:invercargill-sql-1.0.typelib": "as-expected",
     "pc:invercargill-sql.pc": "as-expected"
@@ -39,6 +48,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"
   }
 }

+ 12 - 0
meson.build

@@ -9,3 +9,15 @@ sqlite_dep = dependency('sqlite3')
 # Subdirectories
 subdir('src')
 subdir('examples')
+
+# --- Install surface for consumers -------------------------------------
+# A consumer compiles with `valac --pkg invercargill-sql`; valac reads
+# invercargill-sql.deps from share/vala/vapi and resolves every entry
+# there. The generated vapi leaks no Sqlite or Gio namespaces (all
+# sqlite-touching classes are internal), so glib/gobject plus
+# invercargill-1 is the complete closure.
+install_data(
+    'vapi/invercargill-sql.deps',
+    install_dir: get_option('datadir') / 'vala' / 'vapi',
+)
+

+ 12 - 0
usm-scripts/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+# Runs the test suite inside an already-built tree. ninja's test target
+# exits 0 even when no tests are defined, so this stays uniform across
+# the family. $1 is the build directory (set by usm).
+#
+# LD_LIBRARY_PATH is scrubbed: a system-wide path here (e.g. /opt/usm/lib)
+# takes precedence over the build tree's RUNPATH and silently links the
+# tests against a stale installed copy of the library instead of the one
+# just built — failures then reflect the old lib, not this source.
+LD_LIBRARY_PATH= ninja -C "$1" test

+ 3 - 0
vapi/invercargill-sql.deps

@@ -0,0 +1,3 @@
+glib-2.0
+gobject-2.0
+invercargill-1