Skip to content

Commit

Permalink
tooling: Export cloe-launch-profile as part of export and package tar…
Browse files Browse the repository at this point in the history
…gets

This also changes the name of the target in the cli Makefile from
conan-profile to export, to be orthogonal with the other Makefile.
  • Loading branch information
cassava committed Apr 26, 2023
1 parent e91e768 commit 0ac5224
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ deploy-cli:

.PHONY: export-cli
export-cli:
${MAKE} -C cli conan-profile
${MAKE} -C cli export

export: export-cli
package: export-cli

.PHONY: docs
docs:
Expand Down
9 changes: 5 additions & 4 deletions cli/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ help:
echo "Available targets:"
echo " install to install cloe-launch locally"
echo " editable to install cloe-launch locally in editable mode"
echo " export to export cloe-launch-profile Conan python package"

.PHONY: install
install: conan-profile
install: export
command -v ${PIP} >/dev/null 2>&1
# Work-around pip confused by pyproject.toml
-mv pyproject.toml pyproject.toml.bak
Expand All @@ -34,7 +35,7 @@ install: conan-profile
mv pyproject.toml.bak pyproject.toml

.PHONY: editable
editable: conan-profile
editable: export
command -v ${PIP} >/dev/null 2>&1
# Work-around pip confused by pyproject.toml
-mv pyproject.toml pyproject.toml.bak
Expand All @@ -44,6 +45,6 @@ editable: conan-profile
)
mv pyproject.toml.bak pyproject.toml

.PHONY: conan-profile
conan-profile:
.PHONY: export
export:
conan export .

0 comments on commit 0ac5224

Please sign in to comment.