Skip to content

Commit

Permalink
Makefile: changed target setup to develop for consistency
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Maier <maiera@de.ibm.com>
  • Loading branch information
andy-maier committed Sep 18, 2018
1 parent 5394a5e commit 04886cc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ install:
- pwd
- git clone https://github.com/andy-maier/ansible.git --branch zhmc-fixes --depth 1 ../ansible
- $PIP_CMD list
- make setup
- make develop
- make install
- $PIP_CMD install python-coveralls
- $PIP_CMD list
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ help:
@echo 'Package version will be: $(package_version)'
@echo 'Currently active Python environment: Python $(python_mn_version)'
@echo 'Valid targets are:'
@echo ' setup - Set up the development environment'
@echo ' develop - Set up the development environment'
@echo ' dist - Build the distribution files in: $(dist_build_dir)'
@echo ' docs - Build the documentation in: $(doc_build_dir)'
@echo ' doccheck - Run check whether generated module docs are up to date'
Expand Down Expand Up @@ -220,7 +220,7 @@ _pip:
$(PIP_CMD) install $(pip_level_opts) wheel

.PHONY: setup
setup: _pip requirements.txt dev-requirements.txt os_setup.sh $(ansible_repo_dir)
develop: _pip requirements.txt dev-requirements.txt os_setup.sh $(ansible_repo_dir)
@echo 'Setting up the development environment with PACKAGE_LEVEL=$(PACKAGE_LEVEL)'
bash -c './os_setup.sh'
$(PIP_CMD) install $(pip_level_opts) -r dev-requirements.txt
Expand Down Expand Up @@ -248,7 +248,7 @@ test: $(test_log_file)
@echo '$@ done.'

.PHONY: all
all: setup dist docs check test
all: develop dist docs check test
@echo '$@ done.'

.PHONY: install
Expand Down

0 comments on commit 04886cc

Please sign in to comment.