From bd07df1899be47dbe7895101d36f15db44f0f9f3 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <mike@vorburger.ch>
Date: Tue, 16 Apr 2024 02:03:51 +0200
Subject: [PATCH] =?UTF-8?q?fix=20(build):=20Fix=20CI=20buid=20after=20the?=
 =?UTF-8?q?=20Big=20=F0=9F=8E=82=20Birthday=20Move?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json      | 1 +
 docs/blog/posts/2024-04.md | 2 +-
 docs/use/rosetta/index.md  | 4 ++--
 tools/distro/build.bash    | 5 +++--
 tools/protoc/protoc.bash   | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4dc85e60a..1c7f7a5d3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -156,6 +156,7 @@
     "node_modules": false,
     "rdf": false,
     "site": false,
+    "test": false,
     "tools": false,
     "web": false,
     "BUILT": false
diff --git a/docs/blog/posts/2024-04.md b/docs/blog/posts/2024-04.md
index 604e8eae1..3f6e93acb 100644
--- a/docs/blog/posts/2024-04.md
+++ b/docs/blog/posts/2024-04.md
@@ -14,7 +14,7 @@ I've been reading up more about Linked Data & RDF etc. and started to evolve Eno
 
 The new [internal implementation doc](../../dev/implementation.md) keeps my help my sanity about what's where in the Enola code.
 
-The new `--load` CLI option can now read Turtle 🐢 `.ttl` files, so you can do e.g. `./enola --load common/rdf/src/test/resources/picasso.ttl http://example.enola.dev/Picasso` and get TODO.
+The new `--load` CLI option can now read Turtle 🐢 `.ttl` files, so you can do e.g. `./enola get --load file:test/picasso.ttl http://example.enola.dev/Picasso` and get TODO.
 
 <!-- TODO Link to /use/ doc with example about how to do this - or perhaps simply point to models/build.bash -->
 
diff --git a/docs/use/rosetta/index.md b/docs/use/rosetta/index.md
index ff14fe2bc..a67f7120b 100644
--- a/docs/use/rosetta/index.md
+++ b/docs/use/rosetta/index.md
@@ -68,14 +68,14 @@ The `model.binpb` now contains _[binary protocol buffer wire format](https://pro
 ## Turtle 🐢 to JSON-LD 🔗
 
 ```bash cd .././.././..
-$ ./enola rosetta --in file:common/rdf/src/test/resources/picasso.ttl --out file:picasso.jsonld
+$ ./enola rosetta --in file:test/picasso.ttl --out file:picasso.jsonld
 ...
 ```
 
 ## Turtle 🐢 to Things ⛓️
 
 ```bash cd .././.././..
-$ ./enola rosetta --in file:common/rdf/src/test/resources/picasso.ttl --out file:picasso.thing.yaml
+$ ./enola rosetta --in file:test/picasso.ttl --out file:picasso.thing.yaml
 ...
 ```
 
diff --git a/tools/distro/build.bash b/tools/distro/build.bash
index 06756ddfb..787ee3c09 100755
--- a/tools/distro/build.bash
+++ b/tools/distro/build.bash
@@ -21,10 +21,11 @@ mkdir -p site/download/latest/
 set -euox pipefail
 
 # Build the end-user distributed executable fat über JAR
-# NB: "bazelisk build //..." does *NOT* build "//cli:enola_deploy.jar", for some reason
-bazelisk build //cli:enola_deploy.jar
+# NB: "bazelisk build //..." does *NOT* build *_deploy.jar, for some reason
+bazelisk build //java/dev/enola/cli:enola_deploy.jar
 cp tools/distro/execjar-header.bash site/download/latest/enola
 cat bazel-bin/cli/enola_deploy.jar >>site/download/latest/enola
+chmod +x site/download/latest/enola
 
 # Build the Container Image
 # NB: This must work both on Docker (which turns it into docker buildx build) and Podman!
diff --git a/tools/protoc/protoc.bash b/tools/protoc/protoc.bash
index 94b049598..6db8d609a 100755
--- a/tools/protoc/protoc.bash
+++ b/tools/protoc/protoc.bash
@@ -41,8 +41,8 @@ protoc \
   --jsonschema_opt=file_extension=schema.json \
   --jsonschema_opt=disallow_additional_properties \
   --jsonschema_out=docs/models/enola/schemas/ \
-  common/thing/thing.proto \
-  core/lib/src/main/java/dev/enola/core/meta/enola_meta.proto
+  java/dev/enola/thing/thing.proto \
+  java/dev/enola/core/meta/enola_meta.proto
 
 # TODO Add core/lib/src/main/java/dev/enola/core/enola_core.proto
 # when https://github.com/chrusty/protoc-gen-jsonschema/issues/180 is fixed