visus
/
dds
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Migrate fully to new json5-based packaging

default_compile_flags
vector-of-bool 4 år sedan
förälder
7bca609dd9
incheckning
e43bb7915b
13 ändrade filer med 98 tillägg och 75 borttagningar
Delad Vy Visa Diff Statistik
  1. +1
    -1
      Makefile
  2. +59
    -2
      catalog.json
  3. +0
    -13
      library.dds
  4. +3
    -3
      library.jsonc
  5. +0
    -17
      package.dds
  6. +6
    -6
      package.jsonc
  7. +1
    -1
      src/dds/build/plan/template.cpp
  8. +0
    -4
      tests/deps/use-spdlog/gcc.tc.dds
  9. +0
    -2
      tests/deps/use-spdlog/msvc.tc.dds
  10. +0
    -9
      tools/freebsd-gcc-9.dds
  11. +0
    -9
      tools/gcc-9.dds
  12. +28
    -4
      tools/gen-catalog-json.py
  13. +0
    -4
      tools/msvc.dds

+ 1
- 1
Makefile Visa fil

@@ -36,7 +36,7 @@ linux-ci: nix-ci

nix-ci:
python3 -u tools/ci.py \
-B download \
-B build \
-T tools/gcc-9.jsonc

vagrant-freebsd-ci:

+ 59
- 2
catalog.json Visa fil

@@ -230,12 +230,12 @@
}
},
"ms-wil": {
"2019.11.10": {
"2020.03.16": {
"depends": {},
"description": "The Windows Implementation Library",
"git": {
"auto-lib": null,
"ref": "dds/2019.11.10",
"ref": "dds/2020.03.16",
"url": "https://github.com/vector-of-bool/wil.git"
}
}
@@ -267,6 +267,15 @@
"ref": "0.2.1",
"url": "https://github.com/vector-of-bool/neo-concepts.git"
}
},
"0.2.2": {
"depends": {},
"description": "Minimal C++ concepts library. Contains many definitions from C++20.",
"git": {
"auto-lib": null,
"ref": "0.2.2",
"url": "https://github.com/vector-of-bool/neo-concepts.git"
}
}
},
"neo-fun": {
@@ -278,6 +287,15 @@
"ref": "0.1.0",
"url": "https://github.com/vector-of-bool/neo-fun.git"
}
},
"0.1.1": {
"depends": {},
"description": "Some library fundamentals that you might find useful",
"git": {
"auto-lib": null,
"ref": "0.1.1",
"url": "https://github.com/vector-of-bool/neo-fun.git"
}
}
},
"neo-sqlite3": {
@@ -316,6 +334,15 @@
"ref": "0.2.2",
"url": "https://github.com/vector-of-bool/neo-sqlite3.git"
}
},
"0.2.3": {
"depends": {},
"description": "A modern and low-level C++ SQLite API",
"git": {
"auto-lib": null,
"ref": "0.2.3",
"url": "https://github.com/vector-of-bool/neo-sqlite3.git"
}
}
},
"nlohmann-json": {
@@ -473,6 +500,15 @@
"ref": "0.2.0",
"url": "https://github.com/vector-of-bool/pubgrub.git"
}
},
"0.2.1": {
"depends": {},
"description": "A C++ implementation of the Pubgrub version solving algorithm",
"git": {
"auto-lib": null,
"ref": "0.2.1",
"url": "https://github.com/vector-of-bool/pubgrub.git"
}
}
},
"range-v3": {
@@ -522,6 +558,15 @@
"ref": "0.2.1",
"url": "https://github.com/vector-of-bool/semver.git"
}
},
"0.2.2": {
"depends": {},
"description": "A C++ library that implements Semantic Versioning parsing, emitting, types, ordering, and operations. See https://semver.org/",
"git": {
"auto-lib": null,
"ref": "0.2.2",
"url": "https://github.com/vector-of-bool/semver.git"
}
}
},
"spdlog": {
@@ -720,6 +765,18 @@
"ref": "0.1.0",
"url": "https://github.com/vector-of-bool/semester.git"
}
},
"0.1.1": {
"depends": {
"neo-concepts": "^0.2.2",
"neo-fun": "^0.1.1"
},
"description": "A C++ library to process recursive dynamic data",
"git": {
"auto-lib": null,
"ref": "0.1.1",
"url": "https://github.com/vector-of-bool/semester.git"
}
}
}
},

+ 0
- 13
library.dds Visa fil

@@ -1,13 +0,0 @@
Name: dds

Uses: spdlog/spdlog
Uses: Microsoft/wil
Uses: range-v3/range-v3
Uses: nlohmann/json
Uses: neo/sqlite3
Uses: neo/fun
Uses: semver/semver
Uses: vob/semester
Uses: pubgrub/pubgrub
Uses: vob/json5
Uses: hanickadot/ctre

+ 3
- 3
library.jsonc Visa fil

@@ -3,13 +3,13 @@
"name": "dds",
"uses": [
"spdlog/spdlog",
"Microsoft/wil",
"microsoft/wil",
"range-v3/range-v3",
"nlohmann/json",
"neo/sqlite3",
"neo/fun",
"semver/semver",
"pubgrub/pubgrub",
"vob/semver",
"vob/pubgrub",
"vob/json5",
"vob/semester",
"hanickadot/ctre",

+ 0
- 17
package.dds Visa fil

@@ -1,17 +0,0 @@
Name: dds
Version: 0.1.0-alpha.3
# SPDX-License-Identifier: MPL-2.0

Depends: spdlog 1.4.2
Depends: ms-wil 2019.11.10
Depends: range-v3 0.10.0
Depends: nlohmann-json 3.7.1
Depends: neo-sqlite3 0.2.2
Depends: neo-fun 0.1.0
Depends: semver 0.2.1
Depends: pubgrub 0.2.0
Depends: vob-json5 0.1.5
Depends: vob-semester 0.1.0
Depends: ctre 2.7.0

Test-Driver: Catch-Main

+ 6
- 6
package.jsonc Visa fil

@@ -5,15 +5,15 @@
"namespace": "dds",
"depends": {
"spdlog": "1.4.2",
"ms-wil": "2019.11.10",
"ms-wil": "2020.3.16",
"range-v3": "0.10.0",
"nlohmann-json": "3.7.1",
"neo-sqlite3": "0.2.2",
"neo-fun": "0.1.0",
"semver": "0.2.1",
"pubgrub": "0.2.0",
"neo-sqlite3": "0.2.3",
"neo-fun": "0.1.1",
"semver": "0.2.2",
"pubgrub": "0.2.1",
"vob-json5": "0.1.5",
"vob-semester": "0.1.0",
"vob-semester": "0.1.1",
"ctre": "2.7.0",
},
"test_driver": "Catch-Main"

+ 1
- 1
src/dds/build/plan/template.cpp Visa fil

@@ -13,7 +13,7 @@

using namespace dds;

using json_data = semester::basic_data<semester::json_traits<std::allocator<void>>>;
using json_data = semester::json_data;

namespace {


+ 0
- 4
tests/deps/use-spdlog/gcc.tc.dds Visa fil

@@ -1,4 +0,0 @@
Compiler-ID: GNU
C++-Version: C++17
C++-Compiler: g++-9
Flags: -D SPDLOG_COMPILED_LIB

+ 0
- 2
tests/deps/use-spdlog/msvc.tc.dds Visa fil

@@ -1,2 +0,0 @@
Compiler-ID: MSVC
Flags: -D SPDLOG_COMPILED_LIB

+ 0
- 9
tools/freebsd-gcc-9.dds Visa fil

@@ -1,9 +0,0 @@
Compiler-ID: GNU
C-Compiler: gcc9
C++-Compiler: g++9
# Range-v3 0.10.0 contains an accidental conversion warning
Flags: -D SPDLOG_COMPILED_LIB -Werror=return-type -Wno-conversion
C++-Flags: -std=c++2a -fconcepts
Link-Flags: -static-libgcc -static-libstdc++
Optimize: True
Compiler-Launcher: ccache

+ 0
- 9
tools/gcc-9.dds Visa fil

@@ -1,9 +0,0 @@
Compiler-ID: GNU
C-Compiler: gcc-9
C++-Compiler: g++-9
# Range-v3 0.10.0 contains an accidental conversion warning
Flags: -D SPDLOG_COMPILED_LIB -Werror=return-type -Wno-sign-compare -Wno-conversion
C++-Flags: -fconcepts -std=c++2a
Link-Flags: -static-libgcc -static-libstdc++
Optimize: True
Compiler-Launcher: ccache

+ 28
- 4
tools/gen-catalog-json.py Visa fil

@@ -97,10 +97,10 @@ packages = [
),
Package('ms-wil', [
Version(
'2019.11.10',
'2020.03.16',
description='The Windows Implementation Library',
remote=Git('https://github.com/vector-of-bool/wil.git',
'dds/2019.11.10'))
'dds/2020.03.16'))
]),
many_versions(
'neo-sqlite3',
@@ -109,6 +109,7 @@ packages = [
'0.2.0',
'0.2.1',
'0.2.2',
'0.2.3',
),
description='A modern and low-level C++ SQLite API',
git_url='https://github.com/vector-of-bool/neo-sqlite3.git',
@@ -118,7 +119,12 @@ packages = [
'0.1.0',
description='Some library fundamentals that you might find useful',
remote=Git('https://github.com/vector-of-bool/neo-fun.git',
'0.1.0'))
'0.1.0')),
Version(
'0.1.1',
description='Some library fundamentals that you might find useful',
remote=Git('https://github.com/vector-of-bool/neo-fun.git',
'0.1.1'))
]),
many_versions(
'neo-concepts',
@@ -126,6 +132,7 @@ packages = [
'0.1.0',
'0.2.0',
'0.2.1',
'0.2.2',
),
description=
'Minimal C++ concepts library. Contains many definitions from C++20.',
@@ -138,13 +145,21 @@ packages = [
'A C++ library that implements Semantic Versioning parsing, emitting, '
'types, ordering, and operations. See https://semver.org/',
remote=Git('https://github.com/vector-of-bool/semver.git',
'0.2.1'))
'0.2.1')),
Version(
'0.2.2',
description=
'A C++ library that implements Semantic Versioning parsing, emitting, '
'types, ordering, and operations. See https://semver.org/',
remote=Git('https://github.com/vector-of-bool/semver.git',
'0.2.2')),
]),
many_versions(
'pubgrub',
(
'0.1.2',
'0.2.0',
'0.2.1',
),
description=
'A C++ implementation of the Pubgrub version solving algorithm',
@@ -166,6 +181,15 @@ packages = [
'neo-fun': '^0.1.0',
'neo-concepts': '^0.2.1',
}),
Version(
'0.1.1',
description='A C++ library to process recursive dynamic data',
remote=Git('https://github.com/vector-of-bool/semester.git',
'0.1.1'),
depends={
'neo-fun': '^0.1.1',
'neo-concepts': '^0.2.2',
}),
]),
Package('ctre', [
Version(

+ 0
- 4
tools/msvc.dds Visa fil

@@ -1,4 +0,0 @@
Compiler-ID: MSVC
Flags: /experimental:preprocessor /D SPDLOG_COMPILED_LIB /wd5105 /std:c++latest
Link-Flags: rpcrt4.lib
Optimize: True

Write Förhandsgranska
Laddar…
Avbryt
Spara