From 004bcbc5a84dc18f336381deb50f778f3c18917f Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 25 May 2022 21:02:57 +0200 Subject: [PATCH] Move syndicate-protocols inside the syndicate package, so that the package-builder can see it --- Makefile | 2 +- syndicate/private/install.rkt | 2 +- {protocols => syndicate/private/protocols}/Makefile | 0 {protocols => syndicate/private/protocols}/schema-bundle.bin | 0 .../private/protocols}/schemas/dataspace.prs | 0 .../private/protocols}/schemas/dataspacePatterns.prs | 0 .../private/protocols}/schemas/gatekeeper.prs | 0 {protocols => syndicate/private/protocols}/schemas/protocol.prs | 0 .../private/protocols}/schemas/racketEvent.prs | 0 .../private/protocols}/schemas/secureChatProtocol.prs | 0 {protocols => syndicate/private/protocols}/schemas/service.prs | 0 .../private/protocols}/schemas/simpleChatProtocol.prs | 0 {protocols => syndicate/private/protocols}/schemas/stream.prs | 0 {protocols => syndicate/private/protocols}/schemas/sturdy.prs | 0 {protocols => syndicate/private/protocols}/schemas/tcp.prs | 0 {protocols => syndicate/private/protocols}/schemas/timer.prs | 0 {protocols => syndicate/private/protocols}/schemas/trace.prs | 0 .../private/protocols}/schemas/transportAddress.prs | 0 {protocols => syndicate/private/protocols}/schemas/worker.prs | 0 19 files changed, 2 insertions(+), 2 deletions(-) rename {protocols => syndicate/private/protocols}/Makefile (100%) rename {protocols => syndicate/private/protocols}/schema-bundle.bin (100%) rename {protocols => syndicate/private/protocols}/schemas/dataspace.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/dataspacePatterns.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/gatekeeper.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/protocol.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/racketEvent.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/secureChatProtocol.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/service.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/simpleChatProtocol.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/stream.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/sturdy.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/tcp.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/timer.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/trace.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/transportAddress.prs (100%) rename {protocols => syndicate/private/protocols}/schemas/worker.prs (100%) diff --git a/Makefile b/Makefile index 307c725..2025c98 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ testonly: raco test -p $(PACKAGES) pull-protocols: - git subtree pull -P protocols \ + git subtree pull -P syndicate/private/protocols \ -m 'Merge latest changes from the syndicate-protocols repository' \ git@git.syndicate-lang.org:syndicate-lang/syndicate-protocols \ main diff --git a/syndicate/private/install.rkt b/syndicate/private/install.rkt index f864ff4..31b6232 100644 --- a/syndicate/private/install.rkt +++ b/syndicate/private/install.rkt @@ -16,7 +16,7 @@ (define output-directory (build-path syndicate-path "schemas")) (delete-directory/files output-directory #:must-exist? #f) (parameterize ((schema-compiler-plugin-mode 'meta)) - (batch-compile #:inputs (list (build-path syndicate-path "../protocols/schemas/**.prs")) + (batch-compile #:inputs (list (build-path syndicate-path "private/protocols/schemas/**.prs")) #:additional-modules (hash '(EntityRef) 'syndicate/entity-ref) #:output-directory output-directory #:plugins (list schema-compiler-plugin)))) diff --git a/protocols/Makefile b/syndicate/private/protocols/Makefile similarity index 100% rename from protocols/Makefile rename to syndicate/private/protocols/Makefile diff --git a/protocols/schema-bundle.bin b/syndicate/private/protocols/schema-bundle.bin similarity index 100% rename from protocols/schema-bundle.bin rename to syndicate/private/protocols/schema-bundle.bin diff --git a/protocols/schemas/dataspace.prs b/syndicate/private/protocols/schemas/dataspace.prs similarity index 100% rename from protocols/schemas/dataspace.prs rename to syndicate/private/protocols/schemas/dataspace.prs diff --git a/protocols/schemas/dataspacePatterns.prs b/syndicate/private/protocols/schemas/dataspacePatterns.prs similarity index 100% rename from protocols/schemas/dataspacePatterns.prs rename to syndicate/private/protocols/schemas/dataspacePatterns.prs diff --git a/protocols/schemas/gatekeeper.prs b/syndicate/private/protocols/schemas/gatekeeper.prs similarity index 100% rename from protocols/schemas/gatekeeper.prs rename to syndicate/private/protocols/schemas/gatekeeper.prs diff --git a/protocols/schemas/protocol.prs b/syndicate/private/protocols/schemas/protocol.prs similarity index 100% rename from protocols/schemas/protocol.prs rename to syndicate/private/protocols/schemas/protocol.prs diff --git a/protocols/schemas/racketEvent.prs b/syndicate/private/protocols/schemas/racketEvent.prs similarity index 100% rename from protocols/schemas/racketEvent.prs rename to syndicate/private/protocols/schemas/racketEvent.prs diff --git a/protocols/schemas/secureChatProtocol.prs b/syndicate/private/protocols/schemas/secureChatProtocol.prs similarity index 100% rename from protocols/schemas/secureChatProtocol.prs rename to syndicate/private/protocols/schemas/secureChatProtocol.prs diff --git a/protocols/schemas/service.prs b/syndicate/private/protocols/schemas/service.prs similarity index 100% rename from protocols/schemas/service.prs rename to syndicate/private/protocols/schemas/service.prs diff --git a/protocols/schemas/simpleChatProtocol.prs b/syndicate/private/protocols/schemas/simpleChatProtocol.prs similarity index 100% rename from protocols/schemas/simpleChatProtocol.prs rename to syndicate/private/protocols/schemas/simpleChatProtocol.prs diff --git a/protocols/schemas/stream.prs b/syndicate/private/protocols/schemas/stream.prs similarity index 100% rename from protocols/schemas/stream.prs rename to syndicate/private/protocols/schemas/stream.prs diff --git a/protocols/schemas/sturdy.prs b/syndicate/private/protocols/schemas/sturdy.prs similarity index 100% rename from protocols/schemas/sturdy.prs rename to syndicate/private/protocols/schemas/sturdy.prs diff --git a/protocols/schemas/tcp.prs b/syndicate/private/protocols/schemas/tcp.prs similarity index 100% rename from protocols/schemas/tcp.prs rename to syndicate/private/protocols/schemas/tcp.prs diff --git a/protocols/schemas/timer.prs b/syndicate/private/protocols/schemas/timer.prs similarity index 100% rename from protocols/schemas/timer.prs rename to syndicate/private/protocols/schemas/timer.prs diff --git a/protocols/schemas/trace.prs b/syndicate/private/protocols/schemas/trace.prs similarity index 100% rename from protocols/schemas/trace.prs rename to syndicate/private/protocols/schemas/trace.prs diff --git a/protocols/schemas/transportAddress.prs b/syndicate/private/protocols/schemas/transportAddress.prs similarity index 100% rename from protocols/schemas/transportAddress.prs rename to syndicate/private/protocols/schemas/transportAddress.prs diff --git a/protocols/schemas/worker.prs b/syndicate/private/protocols/schemas/worker.prs similarity index 100% rename from protocols/schemas/worker.prs rename to syndicate/private/protocols/schemas/worker.prs