From ddcc63b758f7e83a80d0928cb6737deb95f42c8d Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 5 Mar 2018 17:50:40 +0300 Subject: Add .manifest extension to repositories, packages and signature files --- load/load.cxx | 16 +-- tests/load/1/basics/packages | 11 -- tests/load/1/basics/packages.manifest | 11 ++ tests/load/1/basics/repositories | 4 - tests/load/1/basics/repositories.manifest | 4 + tests/load/1/math/packages | 116 --------------------- tests/load/1/math/packages.manifest | 116 +++++++++++++++++++++ tests/load/1/math/repositories | 13 --- tests/load/1/math/repositories.manifest | 13 +++ tests/load/1/misc/packages | 54 ---------- tests/load/1/misc/packages.manifest | 54 ++++++++++ tests/load/1/misc/repositories | 13 --- tests/load/1/misc/repositories.manifest | 13 +++ tests/load/1/stable/packages | 61 ----------- tests/load/1/stable/packages.manifest | 61 +++++++++++ tests/load/1/stable/repositories | 46 -------- tests/load/1/stable/repositories.manifest | 46 ++++++++ tests/load/1/stable/signature | 13 --- tests/load/1/stable/signature.manifest | 13 +++ tests/load/1/staging/packages | 30 ------ tests/load/1/staging/packages.manifest | 30 ++++++ tests/load/1/staging/repositories | 4 - tests/load/1/staging/repositories.manifest | 4 + tests/load/1/testing/packages | 22 ---- tests/load/1/testing/packages.manifest | 22 ++++ tests/load/1/testing/repositories | 9 -- tests/load/1/testing/repositories.manifest | 9 ++ tests/load/driver.cxx | 10 +- tests/load/pkg/1/dev.cppget.org/signed/packages | 2 - .../pkg/1/dev.cppget.org/signed/packages.manifest | 2 + .../load/pkg/1/dev.cppget.org/signed/repositories | 35 ------- .../1/dev.cppget.org/signed/repositories.manifest | 35 +++++++ tests/load/pkg/1/dev.cppget.org/signed/signature | 13 --- .../pkg/1/dev.cppget.org/signed/signature.manifest | 13 +++ tests/load/pkg/1/dev.cppget.org/unsigned/packages | 2 - .../1/dev.cppget.org/unsigned/packages.manifest | 2 + .../pkg/1/dev.cppget.org/unsigned/repositories | 3 - .../dev.cppget.org/unsigned/repositories.manifest | 3 + 38 files changed, 464 insertions(+), 464 deletions(-) delete mode 100644 tests/load/1/basics/packages create mode 100644 tests/load/1/basics/packages.manifest delete mode 100644 tests/load/1/basics/repositories create mode 100644 tests/load/1/basics/repositories.manifest delete mode 100644 tests/load/1/math/packages create mode 100644 tests/load/1/math/packages.manifest delete mode 100644 tests/load/1/math/repositories create mode 100644 tests/load/1/math/repositories.manifest delete mode 100644 tests/load/1/misc/packages create mode 100644 tests/load/1/misc/packages.manifest delete mode 100644 tests/load/1/misc/repositories create mode 100644 tests/load/1/misc/repositories.manifest delete mode 100644 tests/load/1/stable/packages create mode 100644 tests/load/1/stable/packages.manifest delete mode 100644 tests/load/1/stable/repositories create mode 100644 tests/load/1/stable/repositories.manifest delete mode 100644 tests/load/1/stable/signature create mode 100644 tests/load/1/stable/signature.manifest delete mode 100644 tests/load/1/staging/packages create mode 100644 tests/load/1/staging/packages.manifest delete mode 100644 tests/load/1/staging/repositories create mode 100644 tests/load/1/staging/repositories.manifest delete mode 100644 tests/load/1/testing/packages create mode 100644 tests/load/1/testing/packages.manifest delete mode 100644 tests/load/1/testing/repositories create mode 100644 tests/load/1/testing/repositories.manifest delete mode 100644 tests/load/pkg/1/dev.cppget.org/signed/packages create mode 100644 tests/load/pkg/1/dev.cppget.org/signed/packages.manifest delete mode 100644 tests/load/pkg/1/dev.cppget.org/signed/repositories create mode 100644 tests/load/pkg/1/dev.cppget.org/signed/repositories.manifest delete mode 100644 tests/load/pkg/1/dev.cppget.org/signed/signature create mode 100644 tests/load/pkg/1/dev.cppget.org/signed/signature.manifest delete mode 100644 tests/load/pkg/1/dev.cppget.org/unsigned/packages create mode 100644 tests/load/pkg/1/dev.cppget.org/unsigned/packages.manifest delete mode 100644 tests/load/pkg/1/dev.cppget.org/unsigned/repositories create mode 100644 tests/load/pkg/1/dev.cppget.org/unsigned/repositories.manifest diff --git a/load/load.cxx b/load/load.cxx index 44cfe0e..85fb3ee 100644 --- a/load/load.cxx +++ b/load/load.cxx @@ -49,8 +49,8 @@ struct failed {}; static const char* help_info ( " info: run 'brep-load --help' for more information"); -static const path packages ("packages"); -static const path repositories ("repositories"); +static const path packages ("packages.manifest"); +static const path repositories ("repositories.manifest"); struct internal_repository { @@ -183,10 +183,10 @@ load_repositories (path p) } if (!file_exists (r.packages_path ())) - bad_line ("'packages' file does not exist"); + bad_line ("packages.manifest file does not exist"); if (!file_exists (r.repositories_path ())) - bad_line ("'repositories' file does not exist"); + bad_line ("repositories.manifest file does not exist"); } else if (strncmp (nv.c_str (), "fingerprint:", vp = 12) == 0) { @@ -302,8 +302,8 @@ repository_info (const options& lo, const string& rl, const cstrings& options) } } -// Load the repository packages from the 'packages' file and persist the -// repository. Should be called once per repository. +// Load the repository packages from the packages.manifest file and persist +// the repository. Should be called once per repository. // static void load_packages (const shared_ptr& rp, database& db) @@ -341,7 +341,7 @@ load_packages (const shared_ptr& rp, database& db) db.find (package_id (pm.name, pm.version))); // sha256sum should always be present if the package manifest comes from - // the 'packages' file. + // the packages.manifest file. // assert (pm.sha256sum); @@ -456,7 +456,7 @@ load_packages (const shared_ptr& rp, database& db) } // Load the repository manifest values, prerequsite repositories, and their -// complements state from the 'repositories' file. Update the repository +// complements state from the repositories.manifest file. Update the repository // persistent state to save changed members. Should be called once per // persisted internal repository. // diff --git a/tests/load/1/basics/packages b/tests/load/1/basics/packages deleted file mode 100644 index d422df5..0000000 --- a/tests/load/1/basics/packages +++ /dev/null @@ -1,11 +0,0 @@ -: 1 -sha256sum: df2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 -: -name: libexpat -version: 5.1 -summary: The Expat Library -license: MIT -url: http://www.example.com/expat/ -email: expat-users@example.com -location: libexpat-5.1.tar.gz -sha256sum: 75ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 diff --git a/tests/load/1/basics/packages.manifest b/tests/load/1/basics/packages.manifest new file mode 100644 index 0000000..d422df5 --- /dev/null +++ b/tests/load/1/basics/packages.manifest @@ -0,0 +1,11 @@ +: 1 +sha256sum: df2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 +: +name: libexpat +version: 5.1 +summary: The Expat Library +license: MIT +url: http://www.example.com/expat/ +email: expat-users@example.com +location: libexpat-5.1.tar.gz +sha256sum: 75ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 diff --git a/tests/load/1/basics/repositories b/tests/load/1/basics/repositories deleted file mode 100644 index 57a1c7a..0000000 --- a/tests/load/1/basics/repositories +++ /dev/null @@ -1,4 +0,0 @@ -: 1 -# Local repository manifest (this repository). -# -url: http://basics.org diff --git a/tests/load/1/basics/repositories.manifest b/tests/load/1/basics/repositories.manifest new file mode 100644 index 0000000..57a1c7a --- /dev/null +++ b/tests/load/1/basics/repositories.manifest @@ -0,0 +1,4 @@ +: 1 +# Local repository manifest (this repository). +# +url: http://basics.org diff --git a/tests/load/1/math/packages b/tests/load/1/math/packages deleted file mode 100644 index b538d9e..0000000 --- a/tests/load/1/math/packages +++ /dev/null @@ -1,116 +0,0 @@ -: 1 -sha256sum: 05f690c39da531ea450e8b1f1a2a1314d891c6c5e4e8be5be9c8c2f2ede5e28a -: -name: libexp -version: 1~1.2+1 -summary: The exponent -license: MIT -tags: c++, exponent -description: The exponent math function. -url: http://www.exp.com -email: users@exp.com -build-email: builds@exp.com -depends: libmisc -depends: libpq >= 9.0.0 -build-exclude: *; Only supported on Linux. -build-include: linux* -location: libexp-1~1.2+1.tar.gz -sha256sum: 0a7414d06ad26d49dad203deaf3841f3df97f1fe27c5bf190c1c20dfeb7f84e0 -: -name: libfoo -version: 1.0 -summary: The Foo Library -license: MIT -url: http://www.example.com/foo/ -email: foo-users@example.com -location: libfoo-1.0.tar.gz -sha256sum: d8ad319b55fdd19ff24cb0fcf9d61101289569f80b8688884389587cfafa1f1e -: -name: libfoo -version: 1.2.4+1 -priority: high; Critical bug fixes, performance improvement. -summary: The Foo Math Library -license: LGPLv2, MIT; If using with GNU TLS. -license: BSD; If using with OpenSSL. -tags: c++, foo, math -description: \ -A modern C++ library with easy to use linear algebra and lot of optimization -tools. - -There are over 100 functions in total with an extensive test suite. The API is -similar to MATLAB. - -Useful for conversion of research code into production environments. -\ -changes: \ -1.2.4+1 - * applied patch for critical bug-219 - * regenerated documentation - -1.2.4 - * test suite extended significantly -\ -url: http://www.example.com/foo/; Project home page. -doc-url: http://www.example.org/projects/libfoo/man.xhtml; Documentation page. -src-url: http://scm.example.com/?p=odb/libodb.git\;a=tree; Source tree url. -package-url: http://www.example.com/foo/pack; Package details. -email: foo-users@example.com; Public mailing list. Read FAQ before posting. -package-email: pack@example.com; Current packager. -depends: libmisc < 1.1 | libmisc > 2.3.0; Crashes with 1.1.0-2.3.0. -depends: libexp >= 1.0 -depends: ? libstudxml | libexpat; The newer the better. -requires: linux | windows | macosx; Symbian support is coming. -requires: c++11 -requires: ? ; libc++ standard library if using Clang on Mac OS X. -requires: ? vc++ >= 12.0; Only if using VC++ on Windows. -location: libfoo-1.2.4+1.tar.gz -sha256sum: c5e593d8efdc34a258f8c0b8cc352dc7193ea4a1d666bcf8d48708c7dd82d0d6 -: -name: libpq -version: 0 -summary: PostgreSQL C API client library -license: PostgreSQL License; Permissive free software license. -tags: postgresql, database, client, library, c, api, interface -description: \ -PostgreSQL is an object-relational SQL database management system with libpq -being its C client library. Applications can use this library to pass queries -to the PostgreSQL backend server and to receive the results of those queries -using the C programming language. For more information see: - -https://www.postgresql.org/ - -This package currently contains a build2 package manager (bpkg) stub meaning -that it can only be "built" as already installed in the underlying system (for -example, using a system package manager). - -Send questions, bug reports, or any other feedback about the library itself to -the PostgreSQL mailing lists. Send build system and packaging-related feedback -to the packaging@build2.org mailing list (see https://lists.build2.org for -posting guidelines, etc). - -The packaging of PostgreSQL for build2 is tracked in a Git repository at: - -https://git.build2.org/cgit/packaging/postgresql/ - -\ -url: https://www.postgresql.org/ -package-url: https://git.build2.org/cgit/packaging/postgresql/ -email: pgsql-general@postgresql.org; Mailing list. -package-email: packaging@build2.org; Mailing list. -requires: build2 >= 0.4.0 -location: libpq-0.tar.gz -sha256sum: 75958d000b641c588cdf48e3574584e070104097702dccffdad77947e37f9bd0 -: -name: libstudxml -version: 1.0.0+1 -summary: Modern C++ XML API -license: MIT -tags: c++, xml, parser, serializer, pull, streaming, modern -url: http://www.codesynthesis.com/projects/libstudxml/ -email: studxml-users@codesynthesis.com; Public mailing list, posts by\ - non-members are allowed but moderated. -package-email: boris@codesynthesis.com; Direct email to the author. -depends: libexpat >= 2.0.0 -depends: libgenx -location: libstudxml-1.0.0+1.tar.gz -sha256sum: cfa4b1f89f8e903d48eff1e1d14628c32aa4d126d09b0b056d2cd80f8dc78580 diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest new file mode 100644 index 0000000..b538d9e --- /dev/null +++ b/tests/load/1/math/packages.manifest @@ -0,0 +1,116 @@ +: 1 +sha256sum: 05f690c39da531ea450e8b1f1a2a1314d891c6c5e4e8be5be9c8c2f2ede5e28a +: +name: libexp +version: 1~1.2+1 +summary: The exponent +license: MIT +tags: c++, exponent +description: The exponent math function. +url: http://www.exp.com +email: users@exp.com +build-email: builds@exp.com +depends: libmisc +depends: libpq >= 9.0.0 +build-exclude: *; Only supported on Linux. +build-include: linux* +location: libexp-1~1.2+1.tar.gz +sha256sum: 0a7414d06ad26d49dad203deaf3841f3df97f1fe27c5bf190c1c20dfeb7f84e0 +: +name: libfoo +version: 1.0 +summary: The Foo Library +license: MIT +url: http://www.example.com/foo/ +email: foo-users@example.com +location: libfoo-1.0.tar.gz +sha256sum: d8ad319b55fdd19ff24cb0fcf9d61101289569f80b8688884389587cfafa1f1e +: +name: libfoo +version: 1.2.4+1 +priority: high; Critical bug fixes, performance improvement. +summary: The Foo Math Library +license: LGPLv2, MIT; If using with GNU TLS. +license: BSD; If using with OpenSSL. +tags: c++, foo, math +description: \ +A modern C++ library with easy to use linear algebra and lot of optimization +tools. + +There are over 100 functions in total with an extensive test suite. The API is +similar to MATLAB. + +Useful for conversion of research code into production environments. +\ +changes: \ +1.2.4+1 + * applied patch for critical bug-219 + * regenerated documentation + +1.2.4 + * test suite extended significantly +\ +url: http://www.example.com/foo/; Project home page. +doc-url: http://www.example.org/projects/libfoo/man.xhtml; Documentation page. +src-url: http://scm.example.com/?p=odb/libodb.git\;a=tree; Source tree url. +package-url: http://www.example.com/foo/pack; Package details. +email: foo-users@example.com; Public mailing list. Read FAQ before posting. +package-email: pack@example.com; Current packager. +depends: libmisc < 1.1 | libmisc > 2.3.0; Crashes with 1.1.0-2.3.0. +depends: libexp >= 1.0 +depends: ? libstudxml | libexpat; The newer the better. +requires: linux | windows | macosx; Symbian support is coming. +requires: c++11 +requires: ? ; libc++ standard library if using Clang on Mac OS X. +requires: ? vc++ >= 12.0; Only if using VC++ on Windows. +location: libfoo-1.2.4+1.tar.gz +sha256sum: c5e593d8efdc34a258f8c0b8cc352dc7193ea4a1d666bcf8d48708c7dd82d0d6 +: +name: libpq +version: 0 +summary: PostgreSQL C API client library +license: PostgreSQL License; Permissive free software license. +tags: postgresql, database, client, library, c, api, interface +description: \ +PostgreSQL is an object-relational SQL database management system with libpq +being its C client library. Applications can use this library to pass queries +to the PostgreSQL backend server and to receive the results of those queries +using the C programming language. For more information see: + +https://www.postgresql.org/ + +This package currently contains a build2 package manager (bpkg) stub meaning +that it can only be "built" as already installed in the underlying system (for +example, using a system package manager). + +Send questions, bug reports, or any other feedback about the library itself to +the PostgreSQL mailing lists. Send build system and packaging-related feedback +to the packaging@build2.org mailing list (see https://lists.build2.org for +posting guidelines, etc). + +The packaging of PostgreSQL for build2 is tracked in a Git repository at: + +https://git.build2.org/cgit/packaging/postgresql/ + +\ +url: https://www.postgresql.org/ +package-url: https://git.build2.org/cgit/packaging/postgresql/ +email: pgsql-general@postgresql.org; Mailing list. +package-email: packaging@build2.org; Mailing list. +requires: build2 >= 0.4.0 +location: libpq-0.tar.gz +sha256sum: 75958d000b641c588cdf48e3574584e070104097702dccffdad77947e37f9bd0 +: +name: libstudxml +version: 1.0.0+1 +summary: Modern C++ XML API +license: MIT +tags: c++, xml, parser, serializer, pull, streaming, modern +url: http://www.codesynthesis.com/projects/libstudxml/ +email: studxml-users@codesynthesis.com; Public mailing list, posts by\ + non-members are allowed but moderated. +package-email: boris@codesynthesis.com; Direct email to the author. +depends: libexpat >= 2.0.0 +depends: libgenx +location: libstudxml-1.0.0+1.tar.gz +sha256sum: cfa4b1f89f8e903d48eff1e1d14628c32aa4d126d09b0b056d2cd80f8dc78580 diff --git a/tests/load/1/math/repositories b/tests/load/1/math/repositories deleted file mode 100644 index 6c63820..0000000 --- a/tests/load/1/math/repositories +++ /dev/null @@ -1,13 +0,0 @@ -: 1 -# Foreign repository manifest. -# -location: ../misc -: -# Local repository manifest (this repository). -# -email: repoman@dev.cppget.org -summary: Math C++ package repository -description: \ -This is the awesome C++ package repository full of remarkable algorithms and -APIs. -\ diff --git a/tests/load/1/math/repositories.manifest b/tests/load/1/math/repositories.manifest new file mode 100644 index 0000000..6c63820 --- /dev/null +++ b/tests/load/1/math/repositories.manifest @@ -0,0 +1,13 @@ +: 1 +# Foreign repository manifest. +# +location: ../misc +: +# Local repository manifest (this repository). +# +email: repoman@dev.cppget.org +summary: Math C++ package repository +description: \ +This is the awesome C++ package repository full of remarkable algorithms and +APIs. +\ diff --git a/tests/load/1/misc/packages b/tests/load/1/misc/packages deleted file mode 100644 index f4f7f59..0000000 --- a/tests/load/1/misc/packages +++ /dev/null @@ -1,54 +0,0 @@ -: 1 -sha256sum: 2f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 -: -name: libbar -version: 2.4.0+3 -priority: security; Very important to install. -summary: The Bar library -description: very very good library. -license: GPLv2 -tags: c++, bar -url: http://www.example.com/bar/ -email: bar-users@example.com -depends: libfoo -depends: libmath >= 2.0.0 -requires: linux | windows | macosx -changes: some changes -location: libbar-2.4.0+3.tar.gz -sha256sum: 70ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 -: -name: libfoo -version: 1.0 -summary: Foo Library -license: MIT -url: http://www.example.com/foo/ -email: foo-users@example.com -location: libfoo-1.0.tar.gz -sha256sum: 754cba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 -: -name: libfoo -version: 0.1 -summary: Foo -license: MIT -url: http://www.example.com/foo/ -email: foo-users@example.com -location: libfoo-0.1.tar.gz -sha256sum: 72ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 -: -name: libfoo -version: 1.2.4+1 -summary: Foo Library -license: MIT -url: http://www.example.com/foo/ -email: foo-users@example.com -location: libfoo-1.2.4+1.tar.gz -sha256sum: 35ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 -: -name: libfoo -version: 1.2.4+2 -summary: Foo Library -license: MIT -url: http://www.example.com/foo/ -email: foo-users@example.com -location: libfoo-1.2.4+2.tar.gz -sha256sum: 74ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 diff --git a/tests/load/1/misc/packages.manifest b/tests/load/1/misc/packages.manifest new file mode 100644 index 0000000..f4f7f59 --- /dev/null +++ b/tests/load/1/misc/packages.manifest @@ -0,0 +1,54 @@ +: 1 +sha256sum: 2f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 +: +name: libbar +version: 2.4.0+3 +priority: security; Very important to install. +summary: The Bar library +description: very very good library. +license: GPLv2 +tags: c++, bar +url: http://www.example.com/bar/ +email: bar-users@example.com +depends: libfoo +depends: libmath >= 2.0.0 +requires: linux | windows | macosx +changes: some changes +location: libbar-2.4.0+3.tar.gz +sha256sum: 70ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 +: +name: libfoo +version: 1.0 +summary: Foo Library +license: MIT +url: http://www.example.com/foo/ +email: foo-users@example.com +location: libfoo-1.0.tar.gz +sha256sum: 754cba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 +: +name: libfoo +version: 0.1 +summary: Foo +license: MIT +url: http://www.example.com/foo/ +email: foo-users@example.com +location: libfoo-0.1.tar.gz +sha256sum: 72ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 +: +name: libfoo +version: 1.2.4+1 +summary: Foo Library +license: MIT +url: http://www.example.com/foo/ +email: foo-users@example.com +location: libfoo-1.2.4+1.tar.gz +sha256sum: 35ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 +: +name: libfoo +version: 1.2.4+2 +summary: Foo Library +license: MIT +url: http://www.example.com/foo/ +email: foo-users@example.com +location: libfoo-1.2.4+2.tar.gz +sha256sum: 74ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 diff --git a/tests/load/1/misc/repositories b/tests/load/1/misc/repositories deleted file mode 100644 index 1a41290..0000000 --- a/tests/load/1/misc/repositories +++ /dev/null @@ -1,13 +0,0 @@ -: 1 -# Foreign repository manifest. -# -location: ../basics -: -# Adjacent repository manifest. -# -location: ../testing -role: complement -: -# Local repository manifest (this repository). -# -url: http://misc.cppget.org/ diff --git a/tests/load/1/misc/repositories.manifest b/tests/load/1/misc/repositories.manifest new file mode 100644 index 0000000..1a41290 --- /dev/null +++ b/tests/load/1/misc/repositories.manifest @@ -0,0 +1,13 @@ +: 1 +# Foreign repository manifest. +# +location: ../basics +: +# Adjacent repository manifest. +# +location: ../testing +role: complement +: +# Local repository manifest (this repository). +# +url: http://misc.cppget.org/ diff --git a/tests/load/1/stable/packages b/tests/load/1/stable/packages deleted file mode 100644 index dd44465..0000000 --- a/tests/load/1/stable/packages +++ /dev/null @@ -1,61 +0,0 @@ -: 1 -sha256sum: 9b6076157ba27e9e93b4f14116d5305a8d6b325879d7799fef1df1b1f5aa8775 -: -name: libfoo -version: 1.0 -summary: The Foo Library -license: MIT -url: http://www.example.com/foo/ -email: foo-users@example.com -location: libfoo-1.0.tar.gz -sha256sum: d8ad319b55fdd19ff24cb0fcf9d61101289569f80b8688884389587cfafa1f1e -: -name: libfoo -version: 1.2.2-alpha.1 -summary: The Foo library -license: MIT -tags: c++, foo -url: http://www.example.com/foo/ -email: foo-users@example.com -depends: libmisc [0.1 2.0-) | libmisc [2.0 5.0] -depends: libgenx (0.2 3.0) -depends: libexpat < 5.2 | libexpat (1 5.1] -location: libfoo-1.2.2-alpha.1.tar.gz -sha256sum: 34fc224087bfd9212de4acfbbf5275513ebc57678b5f029546918a62c57d15cb -: -name: libfoo -version: 1.2.2 -summary: The Foo library -license: MIT -tags: c++, foo -url: http://www.example.com/foo/ -email: foo-users@example.com -depends: libbar <= 2.4.0 -depends: libexp == 1~1.2 -location: libfoo-1.2.2.tar.gz -sha256sum: b47de1b207ef097c9ecdd560007aeadd3775f4fafb4f96fb983e9685c21f3980 -: -name: libfoo -version: 1.2.3+4 -summary: The Foo library -license: MIT -tags: c++, foo -url: http://www.example.com/foo/ -email: foo-users@example.com -depends: libmisc >= 2.0.0 -location: libfoo-1.2.3+4.tar.gz -sha256sum: 204fb25edf2404e9e88e1bef8b2a444281a807d9087093147a2cc80a1ffba79a -: -name: libfoo -version: 1.2.4 -summary: The Foo Library -license: MIT; Permissive free software license. -tags: c++, foo -description: Very good foo library. -changes: some changes 1 -changes: some changes 2 -url: http://www.example.com/foo/ -email: foo-users@example.com -depends: libmisc >= 2.0.0 -location: libfoo-1.2.4.tar.gz -sha256sum: aa1606323bfc59b70de642629dc5d8318cc5348e3646f90ed89406d975db1e1d diff --git a/tests/load/1/stable/packages.manifest b/tests/load/1/stable/packages.manifest new file mode 100644 index 0000000..dd44465 --- /dev/null +++ b/tests/load/1/stable/packages.manifest @@ -0,0 +1,61 @@ +: 1 +sha256sum: 9b6076157ba27e9e93b4f14116d5305a8d6b325879d7799fef1df1b1f5aa8775 +: +name: libfoo +version: 1.0 +summary: The Foo Library +license: MIT +url: http://www.example.com/foo/ +email: foo-users@example.com +location: libfoo-1.0.tar.gz +sha256sum: d8ad319b55fdd19ff24cb0fcf9d61101289569f80b8688884389587cfafa1f1e +: +name: libfoo +version: 1.2.2-alpha.1 +summary: The Foo library +license: MIT +tags: c++, foo +url: http://www.example.com/foo/ +email: foo-users@example.com +depends: libmisc [0.1 2.0-) | libmisc [2.0 5.0] +depends: libgenx (0.2 3.0) +depends: libexpat < 5.2 | libexpat (1 5.1] +location: libfoo-1.2.2-alpha.1.tar.gz +sha256sum: 34fc224087bfd9212de4acfbbf5275513ebc57678b5f029546918a62c57d15cb +: +name: libfoo +version: 1.2.2 +summary: The Foo library +license: MIT +tags: c++, foo +url: http://www.example.com/foo/ +email: foo-users@example.com +depends: libbar <= 2.4.0 +depends: libexp == 1~1.2 +location: libfoo-1.2.2.tar.gz +sha256sum: b47de1b207ef097c9ecdd560007aeadd3775f4fafb4f96fb983e9685c21f3980 +: +name: libfoo +version: 1.2.3+4 +summary: The Foo library +license: MIT +tags: c++, foo +url: http://www.example.com/foo/ +email: foo-users@example.com +depends: libmisc >= 2.0.0 +location: libfoo-1.2.3+4.tar.gz +sha256sum: 204fb25edf2404e9e88e1bef8b2a444281a807d9087093147a2cc80a1ffba79a +: +name: libfoo +version: 1.2.4 +summary: The Foo Library +license: MIT; Permissive free software license. +tags: c++, foo +description: Very good foo library. +changes: some changes 1 +changes: some changes 2 +url: http://www.example.com/foo/ +email: foo-users@example.com +depends: libmisc >= 2.0.0 +location: libfoo-1.2.4.tar.gz +sha256sum: aa1606323bfc59b70de642629dc5d8318cc5348e3646f90ed89406d975db1e1d diff --git a/tests/load/1/stable/repositories b/tests/load/1/stable/repositories deleted file mode 100644 index ffe08ef..0000000 --- a/tests/load/1/stable/repositories +++ /dev/null @@ -1,46 +0,0 @@ -: 1 -# Foreign repository manifest. -# -location: ../misc -: -# Adjacent repository manifest. -# -location: ../math -: -# Local repository manifest (this repository). -# -email: repoman@dev.cppget.org; public mailing list -summary: General C++ package stable repository -description: This is the awesome C++ package repository full of exciting stuff. -certificate: \ ------BEGIN CERTIFICATE----- -MIIFOzCCAyOgAwIBAgIJAIsajMs6HOxHMA0GCSqGSIb3DQEBCwUAMDcxFzAVBgNV -BAoMDkNvZGUgU3ludGhlc2lzMRwwGgYDVQQDDBNuYW1lOmRldi5jcHBnZXQub3Jn -MB4XDTE3MDcwNzA2MzgzNFoXDTIyMDcwNjA2MzgzNFowNzEXMBUGA1UECgwOQ29k -ZSBTeW50aGVzaXMxHDAaBgNVBAMME25hbWU6ZGV2LmNwcGdldC5vcmcwggIiMA0G -CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK8NqNbQckQpv9B3hBRjnTcpkgKq2e -1HOFLQJxgS1TS2QfqUTKePpd10LbDgXOhI2iycKCf7Zv/uf3RE+VyQ/BthNUvQ0O -bWPsEKo+DQOLPjqIaS+u2bmMXzCDjwjufbd9ruPY2PYRTBOsXgTL1+GGIQu0bP5u -i1mEGn95xuYhEJ4x1UUsVWV0l0D37orV/OaOVffPY3xhlQE++aiXLptof1gzM2D8 -lsQPvWLizrtDAHpiwb4oXQQbifDyeXj+qh7OdIqL10rxZZ/0Q0GqrTOyeSlXuo5i -C3MdNSlRmWNGqvPwpushFBQec04exXI3AjQZ/DUlMxtDx2xIqQMtaYOQ5iqm9426 -crgrUoXZG/5ePYTCmnSbpZVak9md44inJWqSESTL0+EfWuLdXop0QV7LZrIaV2pV -BJba0/jiS5mltR/ikiJ7gaP/bbfutJGGfzyk1PrvyehhK/snGUh6Nr0NMHozS+J+ -7QXdSEMjLXbmF5hBsvEfrGub+YSexEEODA34YnBIA453ph4CIo/3nTpDLrm3EkSF -1jV5vGhg3vzB6v+TIP9MXALm4/NUurn8I643KMoNSS9RCDuiqLnE8V1uCmSP8LR8 -OO7vxlmaM/OfqHehAALgsU/KFT1lgpAfHE2x5YBxT6s407DJJpaPkbHMiCNHScWQ -5ezqnH0UMNwsawIDAQABo0owSDAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAww -CgYIKwYBBQUHAwMwHgYDVR0RBBcwFYETaW5mb0BkZXYuY3BwZ2V0Lm9yZzANBgkq -hkiG9w0BAQsFAAOCAgEAlJnw+1TMlY8GGKwF0MBfH0bAW+AhkHd7E33DSFoU12LT -mx99QaiFd4r2dkE3dA4c8OJXK+vzhi2R+kWvzR+ZF4XEGfkM6Z6pZWUK8/5hymiq -pXbPQA21QHJh1RkN0xOxaPwjB4BWj2hk2aUqiuH/R4c2u6U4RfSwimBSbI+QSqF3 -Ho5eAuaezicxWKRQya70FpXGFn+vN6E9HZ8mlp+7eSV3A4eYKaGliqfoVHagYaFz -EM/SFueGhynAHtWzx21f3RhlPWJ1QZcLQayZT8980KJKWO70abKZdcuOTpYBDiYZ -SKcAu4fhCWuhkxlKltwxdRx1FqE/UZpoj2LJnw5pEzVmF9X30VC1f5F6YWicedJr -GCmdQhK3qPZKvNM7i19IBlizo5BKuVB6TsdxWgTTzmOZN6oEwsbVtGTxPek7jGJj -V0vi3zeCCaGJ5K+t6MahAT47CpA/+lJVLCGT6Clw9DvFEJmIr01bmD9uUGZwIgc3 -w88Hh4ap5/u7w07cNwYtncA7cKQCBG9vXi2cXpudBL6uLeM5rqYBSD5hj4zDjzpd -VglIFXohfyMfGh3kDPkQ4dw627S0NuxzmocE0jjdsXfQuLNeg+JRNEHB8QPwTC8X -EY1xZfPv9XzlVQxd7gLDKA8QbbKWpNe73XMoZXUyeyVuf5q1g+c6m1uPB5jJpdw= ------END CERTIFICATE----- -\ \ No newline at end of file diff --git a/tests/load/1/stable/repositories.manifest b/tests/load/1/stable/repositories.manifest new file mode 100644 index 0000000..ffe08ef --- /dev/null +++ b/tests/load/1/stable/repositories.manifest @@ -0,0 +1,46 @@ +: 1 +# Foreign repository manifest. +# +location: ../misc +: +# Adjacent repository manifest. +# +location: ../math +: +# Local repository manifest (this repository). +# +email: repoman@dev.cppget.org; public mailing list +summary: General C++ package stable repository +description: This is the awesome C++ package repository full of exciting stuff. +certificate: \ +-----BEGIN CERTIFICATE----- +MIIFOzCCAyOgAwIBAgIJAIsajMs6HOxHMA0GCSqGSIb3DQEBCwUAMDcxFzAVBgNV +BAoMDkNvZGUgU3ludGhlc2lzMRwwGgYDVQQDDBNuYW1lOmRldi5jcHBnZXQub3Jn +MB4XDTE3MDcwNzA2MzgzNFoXDTIyMDcwNjA2MzgzNFowNzEXMBUGA1UECgwOQ29k +ZSBTeW50aGVzaXMxHDAaBgNVBAMME25hbWU6ZGV2LmNwcGdldC5vcmcwggIiMA0G +CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK8NqNbQckQpv9B3hBRjnTcpkgKq2e +1HOFLQJxgS1TS2QfqUTKePpd10LbDgXOhI2iycKCf7Zv/uf3RE+VyQ/BthNUvQ0O +bWPsEKo+DQOLPjqIaS+u2bmMXzCDjwjufbd9ruPY2PYRTBOsXgTL1+GGIQu0bP5u +i1mEGn95xuYhEJ4x1UUsVWV0l0D37orV/OaOVffPY3xhlQE++aiXLptof1gzM2D8 +lsQPvWLizrtDAHpiwb4oXQQbifDyeXj+qh7OdIqL10rxZZ/0Q0GqrTOyeSlXuo5i +C3MdNSlRmWNGqvPwpushFBQec04exXI3AjQZ/DUlMxtDx2xIqQMtaYOQ5iqm9426 +crgrUoXZG/5ePYTCmnSbpZVak9md44inJWqSESTL0+EfWuLdXop0QV7LZrIaV2pV +BJba0/jiS5mltR/ikiJ7gaP/bbfutJGGfzyk1PrvyehhK/snGUh6Nr0NMHozS+J+ +7QXdSEMjLXbmF5hBsvEfrGub+YSexEEODA34YnBIA453ph4CIo/3nTpDLrm3EkSF +1jV5vGhg3vzB6v+TIP9MXALm4/NUurn8I643KMoNSS9RCDuiqLnE8V1uCmSP8LR8 +OO7vxlmaM/OfqHehAALgsU/KFT1lgpAfHE2x5YBxT6s407DJJpaPkbHMiCNHScWQ +5ezqnH0UMNwsawIDAQABo0owSDAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAww +CgYIKwYBBQUHAwMwHgYDVR0RBBcwFYETaW5mb0BkZXYuY3BwZ2V0Lm9yZzANBgkq +hkiG9w0BAQsFAAOCAgEAlJnw+1TMlY8GGKwF0MBfH0bAW+AhkHd7E33DSFoU12LT +mx99QaiFd4r2dkE3dA4c8OJXK+vzhi2R+kWvzR+ZF4XEGfkM6Z6pZWUK8/5hymiq +pXbPQA21QHJh1RkN0xOxaPwjB4BWj2hk2aUqiuH/R4c2u6U4RfSwimBSbI+QSqF3 +Ho5eAuaezicxWKRQya70FpXGFn+vN6E9HZ8mlp+7eSV3A4eYKaGliqfoVHagYaFz +EM/SFueGhynAHtWzx21f3RhlPWJ1QZcLQayZT8980KJKWO70abKZdcuOTpYBDiYZ +SKcAu4fhCWuhkxlKltwxdRx1FqE/UZpoj2LJnw5pEzVmF9X30VC1f5F6YWicedJr +GCmdQhK3qPZKvNM7i19IBlizo5BKuVB6TsdxWgTTzmOZN6oEwsbVtGTxPek7jGJj +V0vi3zeCCaGJ5K+t6MahAT47CpA/+lJVLCGT6Clw9DvFEJmIr01bmD9uUGZwIgc3 +w88Hh4ap5/u7w07cNwYtncA7cKQCBG9vXi2cXpudBL6uLeM5rqYBSD5hj4zDjzpd +VglIFXohfyMfGh3kDPkQ4dw627S0NuxzmocE0jjdsXfQuLNeg+JRNEHB8QPwTC8X +EY1xZfPv9XzlVQxd7gLDKA8QbbKWpNe73XMoZXUyeyVuf5q1g+c6m1uPB5jJpdw= +-----END CERTIFICATE----- +\ \ No newline at end of file diff --git a/tests/load/1/stable/signature b/tests/load/1/stable/signature deleted file mode 100644 index 5ffaac5..0000000 --- a/tests/load/1/stable/signature +++ /dev/null @@ -1,13 +0,0 @@ -: 1 -sha256sum: 9fbdd1c492eabf0e98deabc54fc8ea7aa2de1627b28682e5030b09f20a5a7bab -signature: \ -dNXN44XB+9u/hfFDgYnFlmoIeR0nzvSIlyGdT49cR7LvyRmMapmd+00pYcffr2JZeoRh7+ngmRjQ -7i+NQGcf1X4abZb5Oi/qyfM7Vqofh7T8GLj2PeJiOL1U3dpmYbgqz3U6u3mwH6w0r83HAN1BA5kB -xxtwpFuGlpkUwyJ5gjUzBjNabdcYcp0UwQWwnru7RpuZbZumImCGwjorPnazlOXU8sfdfV3LnojM -nvMUsnRC19dKMrUfyEUeBJ7sifWfaMTJl0Ct9IOQ4cd6E1lOUnKA5pFm56xPn39/TOdwp/NNxEPx -HvX8/nPHwIvDUwLuKXQB/SB1xt8iGowhUkApNZ44+OTBFa9AGYylS3M9e12RmqyKUSuYH7tqtxla -HiZqA+f4Hxi+2VqAki8da8RPgKc18n1nmvEH1bijgw0yhQo2nLQMHUWKlrmJ2kCxNVoTrmSsTzuB -mzNbdIoL3/vadVaiqrEHsLaEDl2bOtDD2+d16pjXvcooRKHCPTJZ7vus8umqlwemmhze4PADTyXu -MToZ5SNtjCJ/aIJk00t7rcfECawtm9+HKplBbhtpzoDxZ9pAI2mvmNW0ayD32vgyBzC4E/fTcT2O -XVLqP9VG2aSESO9T9B1Q0anQ46N8eNd1RryOmIF8nSw8J60enKsE7ZdLhvhp/KEgU7MSuQ0e46M= -\ diff --git a/tests/load/1/stable/signature.manifest b/tests/load/1/stable/signature.manifest new file mode 100644 index 0000000..5ffaac5 --- /dev/null +++ b/tests/load/1/stable/signature.manifest @@ -0,0 +1,13 @@ +: 1 +sha256sum: 9fbdd1c492eabf0e98deabc54fc8ea7aa2de1627b28682e5030b09f20a5a7bab +signature: \ +dNXN44XB+9u/hfFDgYnFlmoIeR0nzvSIlyGdT49cR7LvyRmMapmd+00pYcffr2JZeoRh7+ngmRjQ +7i+NQGcf1X4abZb5Oi/qyfM7Vqofh7T8GLj2PeJiOL1U3dpmYbgqz3U6u3mwH6w0r83HAN1BA5kB +xxtwpFuGlpkUwyJ5gjUzBjNabdcYcp0UwQWwnru7RpuZbZumImCGwjorPnazlOXU8sfdfV3LnojM +nvMUsnRC19dKMrUfyEUeBJ7sifWfaMTJl0Ct9IOQ4cd6E1lOUnKA5pFm56xPn39/TOdwp/NNxEPx +HvX8/nPHwIvDUwLuKXQB/SB1xt8iGowhUkApNZ44+OTBFa9AGYylS3M9e12RmqyKUSuYH7tqtxla +HiZqA+f4Hxi+2VqAki8da8RPgKc18n1nmvEH1bijgw0yhQo2nLQMHUWKlrmJ2kCxNVoTrmSsTzuB +mzNbdIoL3/vadVaiqrEHsLaEDl2bOtDD2+d16pjXvcooRKHCPTJZ7vus8umqlwemmhze4PADTyXu +MToZ5SNtjCJ/aIJk00t7rcfECawtm9+HKplBbhtpzoDxZ9pAI2mvmNW0ayD32vgyBzC4E/fTcT2O +XVLqP9VG2aSESO9T9B1Q0anQ46N8eNd1RryOmIF8nSw8J60enKsE7ZdLhvhp/KEgU7MSuQ0e46M= +\ diff --git a/tests/load/1/staging/packages b/tests/load/1/staging/packages deleted file mode 100644 index 97c252a..0000000 --- a/tests/load/1/staging/packages +++ /dev/null @@ -1,30 +0,0 @@ -: 1 -sha256sum: 4f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 -: -name: libexpat -version: 5.1 -summary: The Expat Library -license: MIT -url: http://www.example.com/expat/ -email: expat-users@example.com -location: libexpat-5.1.tar.gz -sha256sum: 75c0ba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 -: -name: libgenx -version: 1.0 -summary: The Genx Library -license: MIT -url: http://www.example.com/genx/ -email: genx-users@example.com -location: libgenx-1.0.tar.gz -sha256sum: 75c1ba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 -: -name: libmisc -version: 1.0 -summary: The Misc Library -license: MIT -url: http://www.example.com/misc/ -email: misc-users@example.com -depends: libexpat >= 5.0 -location: libmisc-1.0.tar.gz -sha256sum: 75c2ba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 diff --git a/tests/load/1/staging/packages.manifest b/tests/load/1/staging/packages.manifest new file mode 100644 index 0000000..97c252a --- /dev/null +++ b/tests/load/1/staging/packages.manifest @@ -0,0 +1,30 @@ +: 1 +sha256sum: 4f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 +: +name: libexpat +version: 5.1 +summary: The Expat Library +license: MIT +url: http://www.example.com/expat/ +email: expat-users@example.com +location: libexpat-5.1.tar.gz +sha256sum: 75c0ba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 +: +name: libgenx +version: 1.0 +summary: The Genx Library +license: MIT +url: http://www.example.com/genx/ +email: genx-users@example.com +location: libgenx-1.0.tar.gz +sha256sum: 75c1ba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 +: +name: libmisc +version: 1.0 +summary: The Misc Library +license: MIT +url: http://www.example.com/misc/ +email: misc-users@example.com +depends: libexpat >= 5.0 +location: libmisc-1.0.tar.gz +sha256sum: 75c2ba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93 diff --git a/tests/load/1/staging/repositories b/tests/load/1/staging/repositories deleted file mode 100644 index d72a3f8..0000000 --- a/tests/load/1/staging/repositories +++ /dev/null @@ -1,4 +0,0 @@ -: 1 -# Local repository manifest (this repository). -# -url: ../../.. diff --git a/tests/load/1/staging/repositories.manifest b/tests/load/1/staging/repositories.manifest new file mode 100644 index 0000000..d72a3f8 --- /dev/null +++ b/tests/load/1/staging/repositories.manifest @@ -0,0 +1,4 @@ +: 1 +# Local repository manifest (this repository). +# +url: ../../.. diff --git a/tests/load/1/testing/packages b/tests/load/1/testing/packages deleted file mode 100644 index a903878..0000000 --- a/tests/load/1/testing/packages +++ /dev/null @@ -1,22 +0,0 @@ -: 1 -sha256sum: 5f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 -: -name: libmisc -version: 2.4.0 -summary: The Misc Library -license: MIT -url: http://www.example.com/misc/ -email: misc-users@example.com -depends: libexpat >= 5.0 -location: libmisc-2.4.0.tar.gz -sha256sum: 75ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab94 -: -name: libmisc -version: 2.3.0+1 -summary: The Misc Library -license: MIT -url: http://www.example.com/misc/ -email: misc-users@example.com -depends: libexpat >= 5.0 -location: libmisc-2.3.0+1.tar.gz -sha256sum: 11ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab94 diff --git a/tests/load/1/testing/packages.manifest b/tests/load/1/testing/packages.manifest new file mode 100644 index 0000000..a903878 --- /dev/null +++ b/tests/load/1/testing/packages.manifest @@ -0,0 +1,22 @@ +: 1 +sha256sum: 5f2b297be1eafd70fe55f179a0cf062baf8405e08b3854600801420132a206b1 +: +name: libmisc +version: 2.4.0 +summary: The Misc Library +license: MIT +url: http://www.example.com/misc/ +email: misc-users@example.com +depends: libexpat >= 5.0 +location: libmisc-2.4.0.tar.gz +sha256sum: 75ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab94 +: +name: libmisc +version: 2.3.0+1 +summary: The Misc Library +license: MIT +url: http://www.example.com/misc/ +email: misc-users@example.com +depends: libexpat >= 5.0 +location: libmisc-2.3.0+1.tar.gz +sha256sum: 11ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab94 diff --git a/tests/load/1/testing/repositories b/tests/load/1/testing/repositories deleted file mode 100644 index a218d5c..0000000 --- a/tests/load/1/testing/repositories +++ /dev/null @@ -1,9 +0,0 @@ -: 1 -# Adjacent repository manifest. -# -location: ../staging -role: complement -: -# Local repository manifest (this repository). -# -url: http://test.cppget.org/hello diff --git a/tests/load/1/testing/repositories.manifest b/tests/load/1/testing/repositories.manifest new file mode 100644 index 0000000..a218d5c --- /dev/null +++ b/tests/load/1/testing/repositories.manifest @@ -0,0 +1,9 @@ +: 1 +# Adjacent repository manifest. +# +location: ../staging +role: complement +: +# Local repository manifest (this repository). +# +url: http://test.cppget.org/hello diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index f16c484..61c10b0 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -27,8 +27,8 @@ using namespace odb::core; using namespace butl; using namespace brep; -static const path packages ("packages"); -static const path repositories ("repositories"); +static const path packages ("packages.manifest"); +static const path repositories ("repositories.manifest"); static bool check_location (shared_ptr& p) @@ -114,10 +114,10 @@ main (int argc, char* argv[]) if (cp.relative ()) cp.complete (); - // Update packages file timestamp to enforce loader to update - // persistent state. + // Update the packages.manifest file timestamp to enforce the loader to + // update the persistent state. // - path p (cp.directory () / path ("1/stable/packages")); + path p (cp.directory () / dir_path ("1/stable") / packages); char const* args[] = {"touch", p.string ().c_str (), nullptr}; assert (process (args).wait ()); diff --git a/tests/load/pkg/1/dev.cppget.org/signed/packages b/tests/load/pkg/1/dev.cppget.org/signed/packages deleted file mode 100644 index 584c490..0000000 --- a/tests/load/pkg/1/dev.cppget.org/signed/packages +++ /dev/null @@ -1,2 +0,0 @@ -: 1 -sha256sum: ab258d8d475c9dde36591df5f9c73bced79919ddec33408ef871025cbeab01d5 diff --git a/tests/load/pkg/1/dev.cppget.org/signed/packages.manifest b/tests/load/pkg/1/dev.cppget.org/signed/packages.manifest new file mode 100644 index 0000000..584c490 --- /dev/null +++ b/tests/load/pkg/1/dev.cppget.org/signed/packages.manifest @@ -0,0 +1,2 @@ +: 1 +sha256sum: ab258d8d475c9dde36591df5f9c73bced79919ddec33408ef871025cbeab01d5 diff --git a/tests/load/pkg/1/dev.cppget.org/signed/repositories b/tests/load/pkg/1/dev.cppget.org/signed/repositories deleted file mode 100644 index ecd89f7..0000000 --- a/tests/load/pkg/1/dev.cppget.org/signed/repositories +++ /dev/null @@ -1,35 +0,0 @@ -: 1 -# Local repository manifest (this repository). -# -certificate: \ ------BEGIN CERTIFICATE----- -MIIFOzCCAyOgAwIBAgIJAIsajMs6HOxHMA0GCSqGSIb3DQEBCwUAMDcxFzAVBgNV -BAoMDkNvZGUgU3ludGhlc2lzMRwwGgYDVQQDDBNuYW1lOmRldi5jcHBnZXQub3Jn -MB4XDTE3MDcwNzA2MzgzNFoXDTIyMDcwNjA2MzgzNFowNzEXMBUGA1UECgwOQ29k -ZSBTeW50aGVzaXMxHDAaBgNVBAMME25hbWU6ZGV2LmNwcGdldC5vcmcwggIiMA0G -CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK8NqNbQckQpv9B3hBRjnTcpkgKq2e -1HOFLQJxgS1TS2QfqUTKePpd10LbDgXOhI2iycKCf7Zv/uf3RE+VyQ/BthNUvQ0O -bWPsEKo+DQOLPjqIaS+u2bmMXzCDjwjufbd9ruPY2PYRTBOsXgTL1+GGIQu0bP5u -i1mEGn95xuYhEJ4x1UUsVWV0l0D37orV/OaOVffPY3xhlQE++aiXLptof1gzM2D8 -lsQPvWLizrtDAHpiwb4oXQQbifDyeXj+qh7OdIqL10rxZZ/0Q0GqrTOyeSlXuo5i -C3MdNSlRmWNGqvPwpushFBQec04exXI3AjQZ/DUlMxtDx2xIqQMtaYOQ5iqm9426 -crgrUoXZG/5ePYTCmnSbpZVak9md44inJWqSESTL0+EfWuLdXop0QV7LZrIaV2pV -BJba0/jiS5mltR/ikiJ7gaP/bbfutJGGfzyk1PrvyehhK/snGUh6Nr0NMHozS+J+ -7QXdSEMjLXbmF5hBsvEfrGub+YSexEEODA34YnBIA453ph4CIo/3nTpDLrm3EkSF -1jV5vGhg3vzB6v+TIP9MXALm4/NUurn8I643KMoNSS9RCDuiqLnE8V1uCmSP8LR8 -OO7vxlmaM/OfqHehAALgsU/KFT1lgpAfHE2x5YBxT6s407DJJpaPkbHMiCNHScWQ -5ezqnH0UMNwsawIDAQABo0owSDAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAww -CgYIKwYBBQUHAwMwHgYDVR0RBBcwFYETaW5mb0BkZXYuY3BwZ2V0Lm9yZzANBgkq -hkiG9w0BAQsFAAOCAgEAlJnw+1TMlY8GGKwF0MBfH0bAW+AhkHd7E33DSFoU12LT -mx99QaiFd4r2dkE3dA4c8OJXK+vzhi2R+kWvzR+ZF4XEGfkM6Z6pZWUK8/5hymiq -pXbPQA21QHJh1RkN0xOxaPwjB4BWj2hk2aUqiuH/R4c2u6U4RfSwimBSbI+QSqF3 -Ho5eAuaezicxWKRQya70FpXGFn+vN6E9HZ8mlp+7eSV3A4eYKaGliqfoVHagYaFz -EM/SFueGhynAHtWzx21f3RhlPWJ1QZcLQayZT8980KJKWO70abKZdcuOTpYBDiYZ -SKcAu4fhCWuhkxlKltwxdRx1FqE/UZpoj2LJnw5pEzVmF9X30VC1f5F6YWicedJr -GCmdQhK3qPZKvNM7i19IBlizo5BKuVB6TsdxWgTTzmOZN6oEwsbVtGTxPek7jGJj -V0vi3zeCCaGJ5K+t6MahAT47CpA/+lJVLCGT6Clw9DvFEJmIr01bmD9uUGZwIgc3 -w88Hh4ap5/u7w07cNwYtncA7cKQCBG9vXi2cXpudBL6uLeM5rqYBSD5hj4zDjzpd -VglIFXohfyMfGh3kDPkQ4dw627S0NuxzmocE0jjdsXfQuLNeg+JRNEHB8QPwTC8X -EY1xZfPv9XzlVQxd7gLDKA8QbbKWpNe73XMoZXUyeyVuf5q1g+c6m1uPB5jJpdw= ------END CERTIFICATE----- -\ diff --git a/tests/load/pkg/1/dev.cppget.org/signed/repositories.manifest b/tests/load/pkg/1/dev.cppget.org/signed/repositories.manifest new file mode 100644 index 0000000..ecd89f7 --- /dev/null +++ b/tests/load/pkg/1/dev.cppget.org/signed/repositories.manifest @@ -0,0 +1,35 @@ +: 1 +# Local repository manifest (this repository). +# +certificate: \ +-----BEGIN CERTIFICATE----- +MIIFOzCCAyOgAwIBAgIJAIsajMs6HOxHMA0GCSqGSIb3DQEBCwUAMDcxFzAVBgNV +BAoMDkNvZGUgU3ludGhlc2lzMRwwGgYDVQQDDBNuYW1lOmRldi5jcHBnZXQub3Jn +MB4XDTE3MDcwNzA2MzgzNFoXDTIyMDcwNjA2MzgzNFowNzEXMBUGA1UECgwOQ29k +ZSBTeW50aGVzaXMxHDAaBgNVBAMME25hbWU6ZGV2LmNwcGdldC5vcmcwggIiMA0G +CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK8NqNbQckQpv9B3hBRjnTcpkgKq2e +1HOFLQJxgS1TS2QfqUTKePpd10LbDgXOhI2iycKCf7Zv/uf3RE+VyQ/BthNUvQ0O +bWPsEKo+DQOLPjqIaS+u2bmMXzCDjwjufbd9ruPY2PYRTBOsXgTL1+GGIQu0bP5u +i1mEGn95xuYhEJ4x1UUsVWV0l0D37orV/OaOVffPY3xhlQE++aiXLptof1gzM2D8 +lsQPvWLizrtDAHpiwb4oXQQbifDyeXj+qh7OdIqL10rxZZ/0Q0GqrTOyeSlXuo5i +C3MdNSlRmWNGqvPwpushFBQec04exXI3AjQZ/DUlMxtDx2xIqQMtaYOQ5iqm9426 +crgrUoXZG/5ePYTCmnSbpZVak9md44inJWqSESTL0+EfWuLdXop0QV7LZrIaV2pV +BJba0/jiS5mltR/ikiJ7gaP/bbfutJGGfzyk1PrvyehhK/snGUh6Nr0NMHozS+J+ +7QXdSEMjLXbmF5hBsvEfrGub+YSexEEODA34YnBIA453ph4CIo/3nTpDLrm3EkSF +1jV5vGhg3vzB6v+TIP9MXALm4/NUurn8I643KMoNSS9RCDuiqLnE8V1uCmSP8LR8 +OO7vxlmaM/OfqHehAALgsU/KFT1lgpAfHE2x5YBxT6s407DJJpaPkbHMiCNHScWQ +5ezqnH0UMNwsawIDAQABo0owSDAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAww +CgYIKwYBBQUHAwMwHgYDVR0RBBcwFYETaW5mb0BkZXYuY3BwZ2V0Lm9yZzANBgkq +hkiG9w0BAQsFAAOCAgEAlJnw+1TMlY8GGKwF0MBfH0bAW+AhkHd7E33DSFoU12LT +mx99QaiFd4r2dkE3dA4c8OJXK+vzhi2R+kWvzR+ZF4XEGfkM6Z6pZWUK8/5hymiq +pXbPQA21QHJh1RkN0xOxaPwjB4BWj2hk2aUqiuH/R4c2u6U4RfSwimBSbI+QSqF3 +Ho5eAuaezicxWKRQya70FpXGFn+vN6E9HZ8mlp+7eSV3A4eYKaGliqfoVHagYaFz +EM/SFueGhynAHtWzx21f3RhlPWJ1QZcLQayZT8980KJKWO70abKZdcuOTpYBDiYZ +SKcAu4fhCWuhkxlKltwxdRx1FqE/UZpoj2LJnw5pEzVmF9X30VC1f5F6YWicedJr +GCmdQhK3qPZKvNM7i19IBlizo5BKuVB6TsdxWgTTzmOZN6oEwsbVtGTxPek7jGJj +V0vi3zeCCaGJ5K+t6MahAT47CpA/+lJVLCGT6Clw9DvFEJmIr01bmD9uUGZwIgc3 +w88Hh4ap5/u7w07cNwYtncA7cKQCBG9vXi2cXpudBL6uLeM5rqYBSD5hj4zDjzpd +VglIFXohfyMfGh3kDPkQ4dw627S0NuxzmocE0jjdsXfQuLNeg+JRNEHB8QPwTC8X +EY1xZfPv9XzlVQxd7gLDKA8QbbKWpNe73XMoZXUyeyVuf5q1g+c6m1uPB5jJpdw= +-----END CERTIFICATE----- +\ diff --git a/tests/load/pkg/1/dev.cppget.org/signed/signature b/tests/load/pkg/1/dev.cppget.org/signed/signature deleted file mode 100644 index 46cea28..0000000 --- a/tests/load/pkg/1/dev.cppget.org/signed/signature +++ /dev/null @@ -1,13 +0,0 @@ -: 1 -sha256sum: 99ad81bc39c66e4eeeae438c46b22e2ab7bba3b3406c01df8bb301abbe8149d8 -signature: \ -tzjAIL6BA9D4L1eflZeM04a0sJjCGi8exyS0EAGlRZXRcXROX83Q+xIMbX5uPpAhMxbOHRfcywRi -xM9UYjxVsy9sIrd9hwc4UBzm/BoFvvpQdjalSE4CN11MAbaFhiwWK0YkprTV8kTo2jYWfjTtT32Y -o9sRhP6+WE4H32905ln3hudBEdn5fzWzIDmTs/ip2Gac7KMgMFAdqffjVWyCvR50IhpZiHUnnxVB -NQ21NuckCS6ST94Sl/SXtFjMGJNjZGrKHYMRGfAysF++wl0FtWwxcbyNVMl1ED8ymu4cS8ydEvhO -TsB2ENhQv5tAf5GSOeEE3GW3F6Xae8/ohE0K+mWasLWlgszAuLp8376H0L2x5lkgItXbYuzYfFKz -6A5lUTfk8XV2ss+5DBop0AIm26m7rVO66s7w5Gpt3K8F7WLcQCQr4Ja/+AxE6YKtHbyqQ+PseNp1 -FSEdCZlZxdGnvA5/NWzpLZbsx0bCgKJ8RnMHrdOKsou/fbFHS9gv9AoFNVB1/l60aT1E28H0YsuN -nx+rArDQZvxZKRL/O/p0YfmKkiQO3ikutBn5COhnbjMputb/TMed01lu9cbXGy1dskWxRmsDCVTI -al15nByn6b3MI3Bd8cbvXwojaRMlombhDb+ybccMtAMmDqmX+7IFx0mkh1XLDKCgPtvpRN2xqDc= -\ diff --git a/tests/load/pkg/1/dev.cppget.org/signed/signature.manifest b/tests/load/pkg/1/dev.cppget.org/signed/signature.manifest new file mode 100644 index 0000000..46cea28 --- /dev/null +++ b/tests/load/pkg/1/dev.cppget.org/signed/signature.manifest @@ -0,0 +1,13 @@ +: 1 +sha256sum: 99ad81bc39c66e4eeeae438c46b22e2ab7bba3b3406c01df8bb301abbe8149d8 +signature: \ +tzjAIL6BA9D4L1eflZeM04a0sJjCGi8exyS0EAGlRZXRcXROX83Q+xIMbX5uPpAhMxbOHRfcywRi +xM9UYjxVsy9sIrd9hwc4UBzm/BoFvvpQdjalSE4CN11MAbaFhiwWK0YkprTV8kTo2jYWfjTtT32Y +o9sRhP6+WE4H32905ln3hudBEdn5fzWzIDmTs/ip2Gac7KMgMFAdqffjVWyCvR50IhpZiHUnnxVB +NQ21NuckCS6ST94Sl/SXtFjMGJNjZGrKHYMRGfAysF++wl0FtWwxcbyNVMl1ED8ymu4cS8ydEvhO +TsB2ENhQv5tAf5GSOeEE3GW3F6Xae8/ohE0K+mWasLWlgszAuLp8376H0L2x5lkgItXbYuzYfFKz +6A5lUTfk8XV2ss+5DBop0AIm26m7rVO66s7w5Gpt3K8F7WLcQCQr4Ja/+AxE6YKtHbyqQ+PseNp1 +FSEdCZlZxdGnvA5/NWzpLZbsx0bCgKJ8RnMHrdOKsou/fbFHS9gv9AoFNVB1/l60aT1E28H0YsuN +nx+rArDQZvxZKRL/O/p0YfmKkiQO3ikutBn5COhnbjMputb/TMed01lu9cbXGy1dskWxRmsDCVTI +al15nByn6b3MI3Bd8cbvXwojaRMlombhDb+ybccMtAMmDqmX+7IFx0mkh1XLDKCgPtvpRN2xqDc= +\ diff --git a/tests/load/pkg/1/dev.cppget.org/unsigned/packages b/tests/load/pkg/1/dev.cppget.org/unsigned/packages deleted file mode 100644 index 0de6976..0000000 --- a/tests/load/pkg/1/dev.cppget.org/unsigned/packages +++ /dev/null @@ -1,2 +0,0 @@ -: 1 -sha256sum: 50071b1450c7b0013075e12f0fb2b17f12acb4d152f8c86e097b5174b343535f diff --git a/tests/load/pkg/1/dev.cppget.org/unsigned/packages.manifest b/tests/load/pkg/1/dev.cppget.org/unsigned/packages.manifest new file mode 100644 index 0000000..0de6976 --- /dev/null +++ b/tests/load/pkg/1/dev.cppget.org/unsigned/packages.manifest @@ -0,0 +1,2 @@ +: 1 +sha256sum: 50071b1450c7b0013075e12f0fb2b17f12acb4d152f8c86e097b5174b343535f diff --git a/tests/load/pkg/1/dev.cppget.org/unsigned/repositories b/tests/load/pkg/1/dev.cppget.org/unsigned/repositories deleted file mode 100644 index 9a15f2b..0000000 --- a/tests/load/pkg/1/dev.cppget.org/unsigned/repositories +++ /dev/null @@ -1,3 +0,0 @@ -: 1 -# Local repository manifest (this repository). -# diff --git a/tests/load/pkg/1/dev.cppget.org/unsigned/repositories.manifest b/tests/load/pkg/1/dev.cppget.org/unsigned/repositories.manifest new file mode 100644 index 0000000..9a15f2b --- /dev/null +++ b/tests/load/pkg/1/dev.cppget.org/unsigned/repositories.manifest @@ -0,0 +1,3 @@ +: 1 +# Local repository manifest (this repository). +# -- cgit v1.1