From 7b60932239f4454ff1c5634fb6487048d4044c4e Mon Sep 17 00:00:00 2001 From: John Freeman Date: Mon, 19 Feb 2024 21:46:54 -0600 Subject: [PATCH] Redesign cupcake.json --- 10-special/cupcake.json | 49 ++++++++++++++++++----------------------- cupcake | 2 +- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/10-special/cupcake.json b/10-special/cupcake.json index 323ae26..3ffb0c0 100644 --- a/10-special/cupcake.json +++ b/10-special/cupcake.json @@ -1,32 +1,25 @@ { - "groups": { - "main": { - "imports": [ - { - "name": "zero", - "file": "zero", - "targets": ["zero::libzero"] - } - ], - "libraries": [ - { "name": "ten", "links": ["${PROJECT_NAME}.imports.main"] } - ], - "executables": [ - { "name": "ten", "links": ["ten.libten"] } - ] + "imports": [ + { + "name": "zero", + "file": "zero", + "targets": ["zero::libzero"] }, - "test": { - "imports": [ - { - "name": "doctest", - "file": "doctest", - "targets": ["doctest::doctest"] - } - ], - "tests": [ - { "name": "ten", "links": ["ten.imports.test", "ten.libten"] }, - { "name": "boolean", "links": ["ten.imports.test", "ten.libten"] } - ] + { + "name": "doctest", + "file": "doctest", + "targets": ["doctest::doctest"], + "groups": ["test"] } - } + ], + "libraries": [ + { "name": "ten", "links": ["${PROJECT_NAME}.imports.main"] } + ], + "executables": [ + { "name": "ten", "links": ["ten.libten"] } + ], + "tests": [ + { "name": "ten", "links": ["ten.imports.test", "ten.libten"] }, + { "name": "boolean", "links": ["ten.imports.test", "ten.libten"] } + ] } diff --git a/cupcake b/cupcake index d56912c..d86da6b 160000 --- a/cupcake +++ b/cupcake @@ -1 +1 @@ -Subproject commit d56912c92688efc5fb425d7ce6c90a8c6c7109c0 +Subproject commit d86da6b3fd2dc1b3122f1d02923ddfdb25f7a4e5