From 637613e8c8ca02cac9fc9a9c4292fd3f55239ead Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Thu, 1 Jul 2021 09:43:55 +0200
Subject: [PATCH] Move protocols out of source tree, like syndicate-rkt does

---
 {syndicate-ssh => protocols}/schemas/auth.prs    | 0
 {syndicate-ssh => protocols}/schemas/channel.prs | 0
 syndicate-ssh/.gitignore                         | 1 +
 syndicate-ssh/new-server.rkt                     | 4 ++--
 syndicate-ssh/private/install.rkt                | 4 ++--
 syndicate-ssh/schemas/.gitignore                 | 1 -
 syndicate-ssh/ssh-session.rkt                    | 4 ++--
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename {syndicate-ssh => protocols}/schemas/auth.prs (100%)
 rename {syndicate-ssh => protocols}/schemas/channel.prs (100%)
 create mode 100644 syndicate-ssh/.gitignore
 delete mode 100644 syndicate-ssh/schemas/.gitignore

diff --git a/syndicate-ssh/schemas/auth.prs b/protocols/schemas/auth.prs
similarity index 100%
rename from syndicate-ssh/schemas/auth.prs
rename to protocols/schemas/auth.prs
diff --git a/syndicate-ssh/schemas/channel.prs b/protocols/schemas/channel.prs
similarity index 100%
rename from syndicate-ssh/schemas/channel.prs
rename to protocols/schemas/channel.prs
diff --git a/syndicate-ssh/.gitignore b/syndicate-ssh/.gitignore
new file mode 100644
index 0000000..c75f615
--- /dev/null
+++ b/syndicate-ssh/.gitignore
@@ -0,0 +1 @@
+schemas/
diff --git a/syndicate-ssh/new-server.rkt b/syndicate-ssh/new-server.rkt
index 3f34962..4f3c403 100644
--- a/syndicate-ssh/new-server.rkt
+++ b/syndicate-ssh/new-server.rkt
@@ -22,8 +22,8 @@
 (require "ssh-message-types.rkt")
 (require "ssh-exceptions.rkt")
 (require "ssh-keys.rkt")
-(require "schemas/gen/channel.rkt")
-(require "schemas/gen/auth.rkt")
+(require "schemas/channel.rkt")
+(require "schemas/auth.rkt")
 
 (module+ main
   (standard-actor-system (ds)
diff --git a/syndicate-ssh/private/install.rkt b/syndicate-ssh/private/install.rkt
index 0be781d..21d5f3d 100644
--- a/syndicate-ssh/private/install.rkt
+++ b/syndicate-ssh/private/install.rkt
@@ -13,9 +13,9 @@
                   schema-compiler-plugin-mode))
 
 (define (pre-installer _collects-path package-path)
-  (define output-directory (build-path package-path "schemas/gen"))
+  (define output-directory (build-path package-path "schemas"))
   (delete-directory/files output-directory #:must-exist? #f)
-  (batch-compile #:inputs (list (build-path package-path "schemas/**.prs"))
+  (batch-compile #:inputs (list (build-path package-path "../protocols/schemas/**.prs"))
                  #:additional-modules (hash '(EntityRef) 'syndicate/entity-ref)
                  #:output-directory output-directory
                  #:plugins (list schema-compiler-plugin)))
diff --git a/syndicate-ssh/schemas/.gitignore b/syndicate-ssh/schemas/.gitignore
deleted file mode 100644
index e8e450b..0000000
--- a/syndicate-ssh/schemas/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gen/
diff --git a/syndicate-ssh/ssh-session.rkt b/syndicate-ssh/ssh-session.rkt
index 068bc37..e35d5f5 100644
--- a/syndicate-ssh/ssh-session.rkt
+++ b/syndicate-ssh/ssh-session.rkt
@@ -15,8 +15,8 @@
 (require "ssh-exceptions.rkt")
 (require "ssh-transport.rkt")
 (require "ssh-channel.rkt")
-(require "schemas/gen/channel.rkt")
-(require "schemas/gen/auth.rkt")
+(require "schemas/channel.rkt")
+(require "schemas/auth.rkt")
 
 (provide rekey-interval
 	 rekey-volume