visus
/
dds
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Migrate fully to new json5-based packaging

default_compile_flags
vector-of-bool 4 years ago
parent
7bca609dd9
commit
e43bb7915b
13 changed files with 98 additions and 75 deletions
Unified View Show Diff Stats
  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 View File



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


vagrant-freebsd-ci: vagrant-freebsd-ci:

+ 59
- 2
catalog.json View File

} }
}, },
"ms-wil": { "ms-wil": {
"2019.11.10": {
"2020.03.16": {
"depends": {}, "depends": {},
"description": "The Windows Implementation Library", "description": "The Windows Implementation Library",
"git": { "git": {
"auto-lib": null, "auto-lib": null,
"ref": "dds/2019.11.10",
"ref": "dds/2020.03.16",
"url": "https://github.com/vector-of-bool/wil.git" "url": "https://github.com/vector-of-bool/wil.git"
} }
} }
"ref": "0.2.1", "ref": "0.2.1",
"url": "https://github.com/vector-of-bool/neo-concepts.git" "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": { "neo-fun": {
"ref": "0.1.0", "ref": "0.1.0",
"url": "https://github.com/vector-of-bool/neo-fun.git" "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": { "neo-sqlite3": {
"ref": "0.2.2", "ref": "0.2.2",
"url": "https://github.com/vector-of-bool/neo-sqlite3.git" "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": { "nlohmann-json": {
"ref": "0.2.0", "ref": "0.2.0",
"url": "https://github.com/vector-of-bool/pubgrub.git" "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": { "range-v3": {
"ref": "0.2.1", "ref": "0.2.1",
"url": "https://github.com/vector-of-bool/semver.git" "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": { "spdlog": {
"ref": "0.1.0", "ref": "0.1.0",
"url": "https://github.com/vector-of-bool/semester.git" "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 View File

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 View File

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

+ 0
- 17
package.dds View File

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 View File

"namespace": "dds", "namespace": "dds",
"depends": { "depends": {
"spdlog": "1.4.2", "spdlog": "1.4.2",
"ms-wil": "2019.11.10",
"ms-wil": "2020.3.16",
"range-v3": "0.10.0", "range-v3": "0.10.0",
"nlohmann-json": "3.7.1", "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-json5": "0.1.5",
"vob-semester": "0.1.0",
"vob-semester": "0.1.1",
"ctre": "2.7.0", "ctre": "2.7.0",
}, },
"test_driver": "Catch-Main" "test_driver": "Catch-Main"

+ 1
- 1
src/dds/build/plan/template.cpp View File



using namespace dds; using namespace dds;


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


namespace { namespace {



+ 0
- 4
tests/deps/use-spdlog/gcc.tc.dds View File

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 View File

Compiler-ID: MSVC
Flags: -D SPDLOG_COMPILED_LIB

+ 0
- 9
tools/freebsd-gcc-9.dds View File

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 View File

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 View File

), ),
Package('ms-wil', [ Package('ms-wil', [
Version( Version(
'2019.11.10',
'2020.03.16',
description='The Windows Implementation Library', description='The Windows Implementation Library',
remote=Git('https://github.com/vector-of-bool/wil.git', remote=Git('https://github.com/vector-of-bool/wil.git',
'dds/2019.11.10'))
'dds/2020.03.16'))
]), ]),
many_versions( many_versions(
'neo-sqlite3', 'neo-sqlite3',
'0.2.0', '0.2.0',
'0.2.1', '0.2.1',
'0.2.2', '0.2.2',
'0.2.3',
), ),
description='A modern and low-level C++ SQLite API', description='A modern and low-level C++ SQLite API',
git_url='https://github.com/vector-of-bool/neo-sqlite3.git', git_url='https://github.com/vector-of-bool/neo-sqlite3.git',
'0.1.0', '0.1.0',
description='Some library fundamentals that you might find useful', description='Some library fundamentals that you might find useful',
remote=Git('https://github.com/vector-of-bool/neo-fun.git', 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( many_versions(
'neo-concepts', 'neo-concepts',
'0.1.0', '0.1.0',
'0.2.0', '0.2.0',
'0.2.1', '0.2.1',
'0.2.2',
), ),
description= description=
'Minimal C++ concepts library. Contains many definitions from C++20.', 'Minimal C++ concepts library. Contains many definitions from C++20.',
'A C++ library that implements Semantic Versioning parsing, emitting, ' 'A C++ library that implements Semantic Versioning parsing, emitting, '
'types, ordering, and operations. See https://semver.org/', 'types, ordering, and operations. See https://semver.org/',
remote=Git('https://github.com/vector-of-bool/semver.git', 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( many_versions(
'pubgrub', 'pubgrub',
( (
'0.1.2', '0.1.2',
'0.2.0', '0.2.0',
'0.2.1',
), ),
description= description=
'A C++ implementation of the Pubgrub version solving algorithm', 'A C++ implementation of the Pubgrub version solving algorithm',
'neo-fun': '^0.1.0', 'neo-fun': '^0.1.0',
'neo-concepts': '^0.2.1', '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', [ Package('ctre', [
Version( Version(

+ 0
- 4
tools/msvc.dds View File

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

Write Preview
Loading…
Cancel
Save