From 398b8efd28b3ff8f14ead0bd272eb29ea546483e Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 15 Feb 2020 01:11:29 +0300 Subject: Release version 1.6.3+1 Drop copyright notice from source code Add 'merge fragments' test --- libpkgconf/build/bootstrap.build | 1 - libpkgconf/build/export.build | 1 - libpkgconf/build/root.build | 1 - libpkgconf/buildfile | 1 - libpkgconf/libpkgconf/buildfile | 1 - libpkgconf/libpkgconf/config.h.in | 1 - libpkgconf/manifest | 2 +- libpkgconf/tests/api/buildfile | 1 - libpkgconf/tests/api/driver.c | 8 +- libpkgconf/tests/api/testscript | 136 ++++++++++++++++++++------------- libpkgconf/tests/basic/buildfile | 1 - libpkgconf/tests/basic/driver.c | 1 - libpkgconf/tests/basic/testscript | 1 - libpkgconf/tests/build/bootstrap.build | 1 - libpkgconf/tests/build/root.build | 1 - libpkgconf/tests/buildfile | 1 - 16 files changed, 88 insertions(+), 71 deletions(-) diff --git a/libpkgconf/build/bootstrap.build b/libpkgconf/build/bootstrap.build index 83258e5..6599b62 100644 --- a/libpkgconf/build/bootstrap.build +++ b/libpkgconf/build/bootstrap.build @@ -1,5 +1,4 @@ # file : build/bootstrap.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file project = libpkgconf diff --git a/libpkgconf/build/export.build b/libpkgconf/build/export.build index dc19f45..64e1e7c 100644 --- a/libpkgconf/build/export.build +++ b/libpkgconf/build/export.build @@ -1,5 +1,4 @@ # file : build/export.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file $out_root/ diff --git a/libpkgconf/build/root.build b/libpkgconf/build/root.build index ec33c38..d18c1c7 100644 --- a/libpkgconf/build/root.build +++ b/libpkgconf/build/root.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file using in diff --git a/libpkgconf/buildfile b/libpkgconf/buildfile index e34a1a4..9baff13 100644 --- a/libpkgconf/buildfile +++ b/libpkgconf/buildfile @@ -1,5 +1,4 @@ # file : buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file ./: {*/ -build/} doc{AUTHORS COPYING INSTALL README} manifest diff --git a/libpkgconf/libpkgconf/buildfile b/libpkgconf/libpkgconf/buildfile index a9b6e9c..ec0c2be 100644 --- a/libpkgconf/libpkgconf/buildfile +++ b/libpkgconf/libpkgconf/buildfile @@ -1,5 +1,4 @@ # file : libpkgconf/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file lib{pkgconf}: {h c}{* -config} {h}{config} diff --git a/libpkgconf/libpkgconf/config.h.in b/libpkgconf/libpkgconf/config.h.in index 3005e5a..d0ff14e 100644 --- a/libpkgconf/libpkgconf/config.h.in +++ b/libpkgconf/libpkgconf/config.h.in @@ -1,5 +1,4 @@ /* file : libpkgconf/config.h.in -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : ISC; see accompanying COPYING file */ #ifndef LIBPKGCONF_CONFIG_H diff --git a/libpkgconf/manifest b/libpkgconf/manifest index 4ef165e..267bea1 100644 --- a/libpkgconf/manifest +++ b/libpkgconf/manifest @@ -1,6 +1,6 @@ : 1 name: libpkgconf -version: 1.6.3 +version: 1.6.3+1 project: pkgconf summary: C library for retriving pkg-config compiler and linker flags license: ISC, MIT ; ISC for the most of original files. diff --git a/libpkgconf/tests/api/buildfile b/libpkgconf/tests/api/buildfile index 3b343e7..4eda6f6 100644 --- a/libpkgconf/tests/api/buildfile +++ b/libpkgconf/tests/api/buildfile @@ -1,5 +1,4 @@ # file : tests/api/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file import libs = libpkgconf%lib{pkgconf} diff --git a/libpkgconf/tests/api/driver.c b/libpkgconf/tests/api/driver.c index b5e42f3..57f989d 100644 --- a/libpkgconf/tests/api/driver.c +++ b/libpkgconf/tests/api/driver.c @@ -1,5 +1,4 @@ /* file : tests/api/driver.c - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : ISC; see accompanying COPYING file */ @@ -40,7 +39,7 @@ frags_print_and_free (pkgconf_list_t* list) PKGCONF_FOREACH_LIST_ENTRY(list->head, node) { pkgconf_fragment_t* frag = node->data; - printf("%c %s\n", frag->type, frag->data); + printf("%c %s\n", frag->type != '\0' ? frag->type : ' ', frag->data); } pkgconf_fragment_free (list); @@ -155,12 +154,17 @@ main (int argc, const char* argv[]) } case dump_libs: { + pkgconf_client_set_flags (c, + PKGCONF_PKG_PKGF_SEARCH_PRIVATE | + PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS); + pkgconf_list_t list = PKGCONF_LIST_INITIALIZER; e = pkgconf_pkg_libs (c, p, &list, max_depth); if (e == PKGCONF_PKG_ERRF_OK) frags_print_and_free (&list); + pkgconf_client_set_flags (c, 0); /* Restore. */ break; } case dump_vars: diff --git a/libpkgconf/tests/api/testscript b/libpkgconf/tests/api/testscript index 88d8d3e..dfada71 100644 --- a/libpkgconf/tests/api/testscript +++ b/libpkgconf/tests/api/testscript @@ -1,116 +1,142 @@ # file : tests/api/testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file : double-quoted : { +cat <=libfoo.pc - prefix="C:\\Program Files\\Foo" - exec_prefix=${prefix} - var="A\"B" 'C\'D' - Name: libfoo - Description: Foo library - Version: 1.0 - Libs: "-LC:\\Program Files\\Foo" "-lC:\\Program Files\\Foo\\foo" - Cflags: "-IC:\\Program Files\\Foo" - EOI + prefix="C:\\Program Files\\Foo" + exec_prefix=${prefix} + var="A\"B" 'C\'D' + Name: libfoo + Description: Foo library + Version: 1.0 + Libs: "-LC:\\Program Files\\Foo" "-lC:\\Program Files\\Foo\\foo" + Cflags: "-IC:\\Program Files\\Foo" + EOI f = $~/libfoo.pc : cflags : $* --cflags $f >>EOO - I C:\Program Files\Foo - EOO + I C:\Program Files\Foo + EOO : libs : $* --libs $f >>EOO - L C:\Program Files\Foo - l C:\Program Files\Foo\foo - EOO + L C:\Program Files\Foo + l C:\Program Files\Foo\foo + EOO : vars : $* --vars $f >>EOO - var A"B 'C\'D' - exec_prefix C:\\Program Files\\Foo - prefix C:\\Program Files\\Foo - EOO + var A"B 'C\'D' + exec_prefix C:\\Program Files\\Foo + prefix C:\\Program Files\\Foo + EOO } : single-quoted { +cat <=libfoo.pc - prefix='C:\Program Files\Foo' - exec_prefix=${prefix} - var='A\'B' "C\"D" - Name: libfoo - Description: Foo library - Version: 1.0 - Libs: '-LC:\Program Files\Foo' '-lC:\Program Files\Foo\foo' - Cflags: '-IC:\Program Files\Foo' - EOI + prefix='C:\Program Files\Foo' + exec_prefix=${prefix} + var='A\'B' "C\"D" + Name: libfoo + Description: Foo library + Version: 1.0 + Libs: '-LC:\Program Files\Foo' '-lC:\Program Files\Foo\foo' + Cflags: '-IC:\Program Files\Foo' + EOI f = $~/libfoo.pc : cflags : $* --cflags $f >>EOO - I C:\Program Files\Foo - EOO + I C:\Program Files\Foo + EOO : libs : $* --libs $f >>EOO - L C:\Program Files\Foo - l C:\Program Files\Foo\foo - EOO + L C:\Program Files\Foo + l C:\Program Files\Foo\foo + EOO : vars : $* --vars $f >>EOO - var A'B "C\"D" - exec_prefix C:\Program Files\Foo - prefix C:\Program Files\Foo - EOO + var A'B "C\"D" + exec_prefix C:\Program Files\Foo + prefix C:\Program Files\Foo + EOO } : unquoted : { +cat <=libfoo.pc - prefix=C:\\Program\ \ \ Files\\Foo - exec_prefix=${prefix} - var=X A\'B' "C\"D" - Name: libfoo - Description: Foo library - Version: 1.0 - Libs: -LC:\\Program\ \ \ Files\\Foo -lC:\\Program\ \ \ Files\\Foo\\foo - Cflags: -IC:\\Program\ \ \ Files\\Foo - EOI + prefix=C:\\Program\ \ \ Files\\Foo + exec_prefix=${prefix} + var=X A\'B' "C\"D" + Name: libfoo + Description: Foo library + Version: 1.0 + Libs: -LC:\\Program\ \ \ Files\\Foo -lC:\\Program\ \ \ Files\\Foo\\foo + Cflags: -IC:\\Program\ \ \ Files\\Foo + EOI f = $~/libfoo.pc : cflags : $* --cflags $f >>EOO - I C:\Program Files\Foo - EOO + I C:\Program Files\Foo + EOO : libs : $* --libs $f >>EOO - L C:\Program Files\Foo - l C:\Program Files\Foo\foo - EOO + L C:\Program Files\Foo + l C:\Program Files\Foo\foo + EOO : vars : $* --vars $f >>EOO - var X A\'B' "C\"D" - exec_prefix C:\\Program\ \ \ Files\\Foo - prefix C:\\Program\ \ \ Files\\Foo - EOO + var X A\'B' "C\"D" + exec_prefix C:\\Program\ \ \ Files\\Foo + prefix C:\\Program\ \ \ Files\\Foo + EOO +} + +: merged +: +: Note that we want the merged options to be eventually separated. +: +{ + +cat <=libfoo.pc + Name: libfoo + Description: Foo library + Version: 1.0 + Libs: -L/Users/build/install/lib -lcurl + Libs.private: -lssl -lcrypto -lz -framework CoreFoundation -framework Security + EOI + + f = $~/libfoo.pc + + : libs + : + $* --libs $f >>EOO + L /Users/build/install/lib + l curl + l ssl + l crypto + l z + -framework CoreFoundation -framework Security + EOO } diff --git a/libpkgconf/tests/basic/buildfile b/libpkgconf/tests/basic/buildfile index 5446ccd..6a98c1d 100644 --- a/libpkgconf/tests/basic/buildfile +++ b/libpkgconf/tests/basic/buildfile @@ -1,5 +1,4 @@ # file : tests/basic/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file import libs = libpkgconf%lib{pkgconf} diff --git a/libpkgconf/tests/basic/driver.c b/libpkgconf/tests/basic/driver.c index b14e0cc..c443d1a 100644 --- a/libpkgconf/tests/basic/driver.c +++ b/libpkgconf/tests/basic/driver.c @@ -1,5 +1,4 @@ /* file : tests/basic/driver.c - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : ISC; see accompanying COPYING file */ diff --git a/libpkgconf/tests/basic/testscript b/libpkgconf/tests/basic/testscript index 081647c..78f1672 100644 --- a/libpkgconf/tests/basic/testscript +++ b/libpkgconf/tests/basic/testscript @@ -1,5 +1,4 @@ # file : tests/basic/testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file test.options = --with-path $~ diff --git a/libpkgconf/tests/build/bootstrap.build b/libpkgconf/tests/build/bootstrap.build index a14e33e..0ffb1ec 100644 --- a/libpkgconf/tests/build/bootstrap.build +++ b/libpkgconf/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file project = # Unnamed subproject. diff --git a/libpkgconf/tests/build/root.build b/libpkgconf/tests/build/root.build index d0e619d..f7cadb7 100644 --- a/libpkgconf/tests/build/root.build +++ b/libpkgconf/tests/build/root.build @@ -1,5 +1,4 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file c.std = 99 diff --git a/libpkgconf/tests/buildfile b/libpkgconf/tests/buildfile index d48342d..6a53839 100644 --- a/libpkgconf/tests/buildfile +++ b/libpkgconf/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : ISC; see accompanying COPYING file ./: {*/ -build/} -- cgit v1.1