From c7e71a0793543148cb5b51be067ee35dcc965415 Mon Sep 17 00:00:00 2001 From: Kabir Oberai Date: Tue, 20 May 2025 02:55:13 +0530 Subject: [PATCH] Use docc command directly --- Netlify/build.sh | 18 ++++++++++++++++-- .../xtool.docc}/Control.md | 0 .../xtool.docc}/First-app-code/build-1a.sh | 0 .../xtool.docc}/First-app-code/build-1b.sh | 0 .../xtool.docc}/First-app-code/build-2.sh | 0 .../xtool.docc}/First-app-code/build-3.sh | 0 .../xtool.docc}/First-app-code/edit-2.swift | 0 .../xtool.docc}/First-app-code/edit-4.swift | 0 .../xtool.docc}/First-app-code/rerun-5a.sh | 0 .../xtool.docc}/First-app-code/rerun-5b.sh | 0 .../xtool.docc}/First-app-code/rerun-6.sh | 0 .../xtool.docc}/First-app-code/template-1a.sh | 0 .../xtool.docc}/First-app-code/template-1b.sh | 0 .../xtool.docc}/First-app-code/template-2a.sh | 0 .../xtool.docc}/First-app-code/template-2b.sh | 0 .../xtool.docc}/First-app-code/template-3a.sh | 0 .../xtool.docc}/First-app-code/template-3b.sh | 0 .../xtool.docc}/First-app-code/template-4a.sh | 0 .../xtool.docc}/First-app-code/template-4b.sh | 0 .../xtool.docc}/First-app.tutorial | 0 .../xtool.docc}/Installation-Linux.md | 0 .../xtool.docc}/Installation-macOS.md | 0 .../xtool.docc}/Resources/Autocomplete.png | Bin .../xtool.docc}/Resources/Cover.png | Bin .../xtool.docc}/Resources/Developer.PNG | Bin .../Resources/HelloWorld-Purple.png | Bin .../xtool.docc}/Resources/HelloWorld.png | Bin .../xtool.docc}/Resources/Home.png | Bin .../xtool.docc}/Resources/Hover.png | Bin .../xtool.docc}/Resources/Hover2.png | Bin .../xtool.docc}/Resources/SwiftExtension.png | Bin .../xtool.docc}/Resources/Trust.png | Bin .../xtool.docc}/Resources/UntrustedDev.png | Bin .../xtool.docc}/Resources/Verified.png | Bin .../xtool.docc}/ToC.tutorial | 0 .../xtool.docc}/footer.html | 0 .../xtool.docc/xtool.md | 4 ++-- Sources/XToolDocs/main.swift | 0 38 files changed, 18 insertions(+), 4 deletions(-) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Control.md (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/build-1a.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/build-1b.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/build-2.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/build-3.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/edit-2.swift (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/edit-4.swift (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/rerun-5a.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/rerun-5b.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/rerun-6.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-1a.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-1b.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-2a.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-2b.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-3a.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-3b.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-4a.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app-code/template-4b.sh (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/First-app.tutorial (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Installation-Linux.md (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Installation-macOS.md (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Autocomplete.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Cover.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Developer.PNG (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/HelloWorld-Purple.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/HelloWorld.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Home.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Hover.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Hover2.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/SwiftExtension.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Trust.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/UntrustedDev.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/Resources/Verified.png (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/ToC.tutorial (100%) rename {Sources/XToolDocs/Documentation.docc => Netlify/xtool.docc}/footer.html (100%) rename Sources/XToolDocs/Documentation.docc/Documentation.md => Netlify/xtool.docc/xtool.md (93%) delete mode 100644 Sources/XToolDocs/main.swift diff --git a/Netlify/build.sh b/Netlify/build.sh index 50a9d34d..0e16787e 100755 --- a/Netlify/build.sh +++ b/Netlify/build.sh @@ -6,7 +6,21 @@ cd "$(dirname "$0")" rm -rf docs -swift package --allow-writing-to-package-directory \ - generate-documentation --target XToolDocs --disable-indexing \ +if type -p xcrun &>/dev/null; then + docc="$(xcrun -f docc)" +else + docc="docc" +fi + +if [[ $# == 0 ]]; then + command="convert" +elif [[ $# == 1 && ( "$1" == "preview" || "$1" == "convert" ) ]]; then + command="$1" +else + echo "Usage: $0 [convert|preview]" + exit 1 +fi + +"$docc" "$command" xtool.docc \ --experimental-enable-custom-templates \ --output-path docs diff --git a/Sources/XToolDocs/Documentation.docc/Control.md b/Netlify/xtool.docc/Control.md similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Control.md rename to Netlify/xtool.docc/Control.md diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/build-1a.sh b/Netlify/xtool.docc/First-app-code/build-1a.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/build-1a.sh rename to Netlify/xtool.docc/First-app-code/build-1a.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/build-1b.sh b/Netlify/xtool.docc/First-app-code/build-1b.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/build-1b.sh rename to Netlify/xtool.docc/First-app-code/build-1b.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/build-2.sh b/Netlify/xtool.docc/First-app-code/build-2.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/build-2.sh rename to Netlify/xtool.docc/First-app-code/build-2.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/build-3.sh b/Netlify/xtool.docc/First-app-code/build-3.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/build-3.sh rename to Netlify/xtool.docc/First-app-code/build-3.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/edit-2.swift b/Netlify/xtool.docc/First-app-code/edit-2.swift similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/edit-2.swift rename to Netlify/xtool.docc/First-app-code/edit-2.swift diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/edit-4.swift b/Netlify/xtool.docc/First-app-code/edit-4.swift similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/edit-4.swift rename to Netlify/xtool.docc/First-app-code/edit-4.swift diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/rerun-5a.sh b/Netlify/xtool.docc/First-app-code/rerun-5a.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/rerun-5a.sh rename to Netlify/xtool.docc/First-app-code/rerun-5a.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/rerun-5b.sh b/Netlify/xtool.docc/First-app-code/rerun-5b.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/rerun-5b.sh rename to Netlify/xtool.docc/First-app-code/rerun-5b.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/rerun-6.sh b/Netlify/xtool.docc/First-app-code/rerun-6.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/rerun-6.sh rename to Netlify/xtool.docc/First-app-code/rerun-6.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-1a.sh b/Netlify/xtool.docc/First-app-code/template-1a.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-1a.sh rename to Netlify/xtool.docc/First-app-code/template-1a.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-1b.sh b/Netlify/xtool.docc/First-app-code/template-1b.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-1b.sh rename to Netlify/xtool.docc/First-app-code/template-1b.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-2a.sh b/Netlify/xtool.docc/First-app-code/template-2a.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-2a.sh rename to Netlify/xtool.docc/First-app-code/template-2a.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-2b.sh b/Netlify/xtool.docc/First-app-code/template-2b.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-2b.sh rename to Netlify/xtool.docc/First-app-code/template-2b.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-3a.sh b/Netlify/xtool.docc/First-app-code/template-3a.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-3a.sh rename to Netlify/xtool.docc/First-app-code/template-3a.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-3b.sh b/Netlify/xtool.docc/First-app-code/template-3b.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-3b.sh rename to Netlify/xtool.docc/First-app-code/template-3b.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-4a.sh b/Netlify/xtool.docc/First-app-code/template-4a.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-4a.sh rename to Netlify/xtool.docc/First-app-code/template-4a.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app-code/template-4b.sh b/Netlify/xtool.docc/First-app-code/template-4b.sh similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app-code/template-4b.sh rename to Netlify/xtool.docc/First-app-code/template-4b.sh diff --git a/Sources/XToolDocs/Documentation.docc/First-app.tutorial b/Netlify/xtool.docc/First-app.tutorial similarity index 100% rename from Sources/XToolDocs/Documentation.docc/First-app.tutorial rename to Netlify/xtool.docc/First-app.tutorial diff --git a/Sources/XToolDocs/Documentation.docc/Installation-Linux.md b/Netlify/xtool.docc/Installation-Linux.md similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Installation-Linux.md rename to Netlify/xtool.docc/Installation-Linux.md diff --git a/Sources/XToolDocs/Documentation.docc/Installation-macOS.md b/Netlify/xtool.docc/Installation-macOS.md similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Installation-macOS.md rename to Netlify/xtool.docc/Installation-macOS.md diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Autocomplete.png b/Netlify/xtool.docc/Resources/Autocomplete.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Autocomplete.png rename to Netlify/xtool.docc/Resources/Autocomplete.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Cover.png b/Netlify/xtool.docc/Resources/Cover.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Cover.png rename to Netlify/xtool.docc/Resources/Cover.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Developer.PNG b/Netlify/xtool.docc/Resources/Developer.PNG similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Developer.PNG rename to Netlify/xtool.docc/Resources/Developer.PNG diff --git a/Sources/XToolDocs/Documentation.docc/Resources/HelloWorld-Purple.png b/Netlify/xtool.docc/Resources/HelloWorld-Purple.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/HelloWorld-Purple.png rename to Netlify/xtool.docc/Resources/HelloWorld-Purple.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/HelloWorld.png b/Netlify/xtool.docc/Resources/HelloWorld.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/HelloWorld.png rename to Netlify/xtool.docc/Resources/HelloWorld.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Home.png b/Netlify/xtool.docc/Resources/Home.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Home.png rename to Netlify/xtool.docc/Resources/Home.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Hover.png b/Netlify/xtool.docc/Resources/Hover.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Hover.png rename to Netlify/xtool.docc/Resources/Hover.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Hover2.png b/Netlify/xtool.docc/Resources/Hover2.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Hover2.png rename to Netlify/xtool.docc/Resources/Hover2.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/SwiftExtension.png b/Netlify/xtool.docc/Resources/SwiftExtension.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/SwiftExtension.png rename to Netlify/xtool.docc/Resources/SwiftExtension.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Trust.png b/Netlify/xtool.docc/Resources/Trust.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Trust.png rename to Netlify/xtool.docc/Resources/Trust.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/UntrustedDev.png b/Netlify/xtool.docc/Resources/UntrustedDev.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/UntrustedDev.png rename to Netlify/xtool.docc/Resources/UntrustedDev.png diff --git a/Sources/XToolDocs/Documentation.docc/Resources/Verified.png b/Netlify/xtool.docc/Resources/Verified.png similarity index 100% rename from Sources/XToolDocs/Documentation.docc/Resources/Verified.png rename to Netlify/xtool.docc/Resources/Verified.png diff --git a/Sources/XToolDocs/Documentation.docc/ToC.tutorial b/Netlify/xtool.docc/ToC.tutorial similarity index 100% rename from Sources/XToolDocs/Documentation.docc/ToC.tutorial rename to Netlify/xtool.docc/ToC.tutorial diff --git a/Sources/XToolDocs/Documentation.docc/footer.html b/Netlify/xtool.docc/footer.html similarity index 100% rename from Sources/XToolDocs/Documentation.docc/footer.html rename to Netlify/xtool.docc/footer.html diff --git a/Sources/XToolDocs/Documentation.docc/Documentation.md b/Netlify/xtool.docc/xtool.md similarity index 93% rename from Sources/XToolDocs/Documentation.docc/Documentation.md rename to Netlify/xtool.docc/xtool.md index dd3c15f8..2c58d8ac 100644 --- a/Sources/XToolDocs/Documentation.docc/Documentation.md +++ b/Netlify/xtool.docc/xtool.md @@ -1,7 +1,7 @@ -# ``XToolDocs`` +# xtool @Metadata { - @DisplayName("xtool") + @TechnologyRoot } Cross-platform Xcode replacement. diff --git a/Sources/XToolDocs/main.swift b/Sources/XToolDocs/main.swift deleted file mode 100644 index e69de29b..00000000