From 0bcaa19f92dc7b78ed1a26cd0b22aa780fd1ecf7 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Wed, 17 Jul 2019 17:47:19 +0200 Subject: [PATCH] Removed duplicate sources, reindexed simp. comps. --- index/ad/adayaml.toml | 8 ++++-- index/ad/adayaml_server.toml | 19 ------------- index/gn/gnatcoll.toml | 4 +++ index/gn/gnatcoll_slim.toml | 4 +++ index/gn/gnatcoll_strings.toml | 4 +++ index/si/simple_components.toml | 49 +++++++++++++++++++++++++++++++++ index/xs/xstrings.toml | 7 +++-- 7 files changed, 72 insertions(+), 23 deletions(-) delete mode 100644 index/ad/adayaml_server.toml create mode 100644 index/si/simple_components.toml diff --git a/index/ad/adayaml.toml b/index/ad/adayaml.toml index b66fd0ce..ce385a6e 100644 --- a/index/ad/adayaml.toml +++ b/index/ad/adayaml.toml @@ -5,7 +5,6 @@ authors = ["Felix Krause"] maintainers = ["alejandro@mosteo.com"] website = "https://ada.yaml.io/" -project-files = ["yaml.gpr", "yaml-utils.gpr"] [general.depends-on] aunit = "^2017" @@ -15,7 +14,12 @@ project-files = ["yaml.gpr", "yaml-utils.gpr"] ['0.3'] origin = "git+https://github.com/yaml/AdaYaml.git@2017a7c2523499c03b8d7fe06546a5a8bae6476d" -project-files = ["yaml-annotation_processor.gpr"] +project-files = ["yaml.gpr", "yaml-utils.gpr", "yaml-annotation_processor.gpr", "yaml-server.gpr"] +executables = ["yaml-server"] + + ['0.3'.depends-on] + simple_components = "^4.27" ['0.2'] origin = "git+https://github.com/yaml/AdaYaml.git@0264b03fd92eeedfe3e2713ed1da3f0d255c1727" +project-files = ["yaml.gpr", "yaml-utils.gpr"] diff --git a/index/ad/adayaml_server.toml b/index/ad/adayaml_server.toml deleted file mode 100644 index 2b65e55d..00000000 --- a/index/ad/adayaml_server.toml +++ /dev/null @@ -1,19 +0,0 @@ -[general] -description = "Experimental YAML 1.3 implementation in Ada (server component)" -licenses = ["MIT"] -authors = ["Felix Krause"] -maintainers = ["alejandro@mosteo.com"] -website = "https://ada.yaml.io/" - -project-files = ["yaml-server.gpr"] -executables = ["yaml-server"] - - [general.depends-on] - aunit = "^2017" - gnatcoll_connections = "^4.27" - - [general.gpr-externals] - Mode = ["debug", "release"] - -['0.3'] -origin = "git+https://github.com/yaml/AdaYaml.git@2017a7c2523499c03b8d7fe06546a5a8bae6476d" diff --git a/index/gn/gnatcoll.toml b/index/gn/gnatcoll.toml index d7033429..4a6181b6 100644 --- a/index/gn/gnatcoll.toml +++ b/index/gn/gnatcoll.toml @@ -4,6 +4,10 @@ licenses = ["GPL 3.0"] authors = ["AdaCore"] maintainers = ["alejandro@mosteo.com"] +# This crate has a hidden conflict with any other gnatcoll. +# Declaring conflicts was removed during index transition +# and it's still not reinstated. + [general.gpr-externals] GNATCOLL_ATOMICS = ["intrinsic", "mutex"] GNATCOLL_OS = ["windows", "unix", "osx"] diff --git a/index/gn/gnatcoll_slim.toml b/index/gn/gnatcoll_slim.toml index 8fa52601..dc454742 100644 --- a/index/gn/gnatcoll_slim.toml +++ b/index/gn/gnatcoll_slim.toml @@ -4,6 +4,10 @@ licenses = ["GPL 3.0"] authors = ["AdaCore"] maintainers = ["alejandro@mosteo.com"] +# This crate has a hidden conflict with any other gnatcoll. +# Declaring conflicts was removed during index transition +# and it's still not reinstated. + project-files = ["gnatcoll.gpr"] [general.gpr-externals] diff --git a/index/gn/gnatcoll_strings.toml b/index/gn/gnatcoll_strings.toml index 9fcdf165..6318a9b9 100644 --- a/index/gn/gnatcoll_strings.toml +++ b/index/gn/gnatcoll_strings.toml @@ -4,6 +4,10 @@ licenses = ["GPL 3.0"] authors = ["AdaCore"] maintainers = ["alejandro@mosteo.com"] +# This crate has a hidden conflict with any other gnatcoll. +# Declaring conflicts was removed during index transition +# and it's still not reinstated. + project-files = ["gnatcoll.gpr"] [general.gpr-externals] diff --git a/index/si/simple_components.toml b/index/si/simple_components.toml new file mode 100644 index 00000000..6523e372 --- /dev/null +++ b/index/si/simple_components.toml @@ -0,0 +1,49 @@ +[general] +description = "Simple Components - A collection of support packages" +maintainers = [ "alejandro@mosteo.com" ] +authors = [ "Dmitry A. Kazakov" ] +website = "http://www.dmitry-kazakov.de/ada/components.htm" +licenses = ["GMGPL 2.0"] + +[general.gpr-externals] +Legacy = ["Ada95", "Ada2005", "Ada2012"] +Development = ["Debug", "Release"] +Atomic_Access = ["Pragma-atomic", "GCC-built-ins", "GCC-long-offsets"] +Tasking = ["Multiple", "Single"] +Traced_Objects = ["Off", "On"] + +[general.gpr-set-externals.'case(os)'] +linux = { odbc = "unixODBC" } +windows = { odbc = "ODBC32" } + +[general.gpr-set-externals.'case(word-size)'] +bits-32 = { arch = "i686" } +bits-64 = { arch = "x86_64" } + +[general.depends-on] +libgnutls = "^3.5.8" +unixODBC = "^2.3" + + +['4.27'] +origin = "git+https://github.com/alire-project/dak_simple_components.git@7cafd2da4a92cfe2b1a45374de6d35fc904b2788" + +project-files = [ + "components.gpr", + "components-connections_server.gpr", + "components-connections_server-elv_max_cube.gpr", + "components-connections_server-http_server.gpr", + "components-connections_server-http_server-sqlite_browser.gpr", + "components-connections_server-modbus.gpr", + "components-connections_server-mqtt.gpr", + "components-connections_server-secure.gpr", + "components-connections_server-smtp.gpr", + "components-gnutls.gpr", + "components-ntp.gpr", + "components-odbc.gpr", + "components-sqlite.gpr", + "strings_edit.gpr", + "tables.gpr", +] + +notes = "Tasking=Single seems to be broken at persistent-single_file-text_io.adb" diff --git a/index/xs/xstrings.toml b/index/xs/xstrings.toml index 16fe9d9b..f783edc3 100644 --- a/index/xs/xstrings.toml +++ b/index/xs/xstrings.toml @@ -4,9 +4,12 @@ licenses = ["GPL 3.0"] authors = ["AdaCore", "alejandro@mosteo.com"] maintainers = ["alejandro@mosteo.com"] +# Alternative dependencies feature was removed during index transition. +# A consequence is that this crate is incompatible with any gnatcoll which is +# not gnatcoll_strings, which in turn is incompatible with any other gnatcoll. + ['1.0.0'] origin = "git+https://github.com/alire-project/xstrings@827d9108fbc873299016e924815fe2dd8af8071d" ['1.0.0'.depends-on] - gnatcoll_strings = "^20180425" - gnatcoll_slim = "^20180425" + gnatcoll_strings = "*"