packaging: generalize pkg/deb commands for reuse

Prepare for "cargo generate-rpm" by generalizing the profiles and steps
performed when building debian packages.

Author: davvid

Cargo.toml

@@ -128,7 +128,7 @@ codegen-units = 1
 # This is the main way to strip binaries in the deb package created by
 # 'cargo deb'. For other release binaries, we (currently) call 'strip'
 # explicitly in the release process.
-[profile.deb]
+[profile.pkg]
 inherits = "release"
 debug = false
 
@@ -140,19 +140,19 @@ assets = [
   ["LICENSE", "usr/share/doc/garden/", "644"],
   ["doc/src/changelog.md", "usr/share/doc/garden/CHANGELOG.md", "644"],
   ["README.md", "usr/share/doc/garden/", "644"],
-  ["pkg/deb/userguide/*", "usr/share/doc/garden/userguide/", "644"],
-  ["pkg/deb/userguide/css/*", "usr/share/doc/garden/userguide/css/", "644"],
-  ["pkg/deb/userguide/examples/*", "usr/share/doc/garden/userguide/examples/", "644"],
-  ["pkg/deb/userguide/examples/command-interpreters/*", "usr/share/doc/garden/userguide/examples/command-interpreters/", "644"],
-  ["pkg/deb/userguide/examples/git-cola/*", "usr/share/doc/garden/userguide/examples/git-cola/", "644"],
-  ["pkg/deb/userguide/examples/node/*", "usr/share/doc/garden/userguide/examples/node/", "644"],
-  ["pkg/deb/userguide/examples/photo-restoration/*", "usr/share/doc/garden/userguide/examples/photo-restoration/", "644"],
-  ["pkg/deb/userguide/examples/python/*", "usr/share/doc/garden/userguide/examples/python/", "644"],
-  ["pkg/deb/userguide/FontAwesome/css/*", "usr/share/doc/garden/userguide/FontAwesome/css/", "644"],
-  ["pkg/deb/userguide/FontAwesome/fonts/*", "usr/share/doc/garden/userguide/FontAwesome/fonts/", "644"],
-  ["pkg/deb/completion/garden.bash", "usr/share/bash-completion/completions/garden", "644"],
-  ["pkg/deb/completion/garden.fish", "usr/share/fish/vendor_completions.d/garden.fish", "644"],
-  ["pkg/deb/completion/_garden", "usr/share/zsh/vendor-completions/", "644"],
+  ["pkg/userguide/*", "usr/share/doc/garden/userguide/", "644"],
+  ["pkg/userguide/css/*", "usr/share/doc/garden/userguide/css/", "644"],
+  ["pkg/userguide/examples/*", "usr/share/doc/garden/userguide/examples/", "644"],
+  ["pkg/userguide/examples/command-interpreters/*", "usr/share/doc/garden/userguide/examples/command-interpreters/", "644"],
+  ["pkg/userguide/examples/git-cola/*", "usr/share/doc/garden/userguide/examples/git-cola/", "644"],
+  ["pkg/userguide/examples/node/*", "usr/share/doc/garden/userguide/examples/node/", "644"],
+  ["pkg/userguide/examples/photo-restoration/*", "usr/share/doc/garden/userguide/examples/photo-restoration/", "644"],
+  ["pkg/userguide/examples/python/*", "usr/share/doc/garden/userguide/examples/python/", "644"],
+  ["pkg/userguide/FontAwesome/css/*", "usr/share/doc/garden/userguide/FontAwesome/css/", "644"],
+  ["pkg/userguide/FontAwesome/fonts/*", "usr/share/doc/garden/userguide/FontAwesome/fonts/", "644"],
+  ["pkg/completion/garden.bash", "usr/share/bash-completion/completions/garden", "644"],
+  ["pkg/completion/garden.fish", "usr/share/fish/vendor_completions.d/garden.fish", "644"],
+  ["pkg/completion/_garden", "usr/share/zsh/vendor-completions/", "644"],
 ]
 extended-description = """\
 Garden helps you define development workflows that operate over collections of

garden.yaml

@@ -14,8 +14,7 @@ variables:
   docdir: ${prefix}/share/doc/garden
   target-core: x86_64-unknown-linux-musl
   target-gui: x86_64-unknown-linux-gnu
-  pkg: ${GARDEN_CONFIG_DIR}/pkg
-  debdir: ${pkg}/deb
+  pkgdir: ${GARDEN_CONFIG_DIR}/pkg
   fetch: ""
   disable-fetch: $ test -n "${fetch}" || printf '%s' --disable-fetch
   graph: ""
@@ -73,23 +72,23 @@ commands:
     mkdir -p "${DESTDIR}${docdir}"
     rsync -r --exclude=.git doc/book/ "${DESTDIR}${docdir}/"
   pkg/deb>:
-    - pkg/deb/build
-    - pkg/deb/completion
-    - pkg/deb/doc
-    - pkg/deb/package
-  pkg/deb/build: |
-    cargo build --profile deb --target "${target-core}"
-    cargo build --profile deb --target "${target-gui}" --package garden-gui
-  pkg/deb/completion: |
-    mkdir -p "${debdir}/completion"
-    "$0" completion bash >"${debdir}/completion/garden.bash"
-    "$0" completion fish >"${debdir}/completion/garden.fish"
-    "$0" completion zsh >"${debdir}/completion/_garden"
-  pkg/deb/doc: mdbook build --dest-dir "${debdir}/userguide" doc
-  pkg/deb/package: |
+    - pkg/build
+    - pkg/completion
+    - pkg/doc
+    - pkg/gen/deb
+  pkg/build: |
+    cargo build --profile pkg --target "${target-core}"
+    cargo build --profile pkg --target "${target-gui}" --package garden-gui
+  pkg/completion: |
+    mkdir -p "${pkgdir}/completion"
+    "$0" completion bash >"${pkgdir}/completion/garden.bash"
+    "$0" completion fish >"${pkgdir}/completion/garden.fish"
+    "$0" completion zsh >"${pkgdir}/completion/_garden"
+  pkg/doc: mdbook build --dest-dir "${pkgdir}/userguide" doc
+  pkg/gen/deb: |
     mkdir -p target/debian
-    cargo deb --profile deb --target "${target-core}" --output target/debian
-    cargo deb --profile deb --target "${target-gui}" --manifest-path gui/Cargo.toml --output target/debian
+    cargo deb --profile pkg --target "${target-core}" --output target/debian
+    cargo deb --profile pkg --target "${target-gui}" --manifest-path gui/Cargo.toml --output target/debian
   publish: |
     cargo publish --package garden-tools "$@"
     cargo publish --package garden-gui "$@"