Merge pull request #38 from NHSDigital/mb-makefile-updates

Update Makefile to fix dev setup

Author: malcolmbaig

Makefile

@@ -4,11 +4,20 @@ include scripts/shared.mk
 
 clean:: _clean-docker  # Clean-up project resources (main) @Operations
 
-config: manage_breast_screening/config/.env _install-dependencies githooks-config _install-poetry db migrate seed  # Configure development environment (main) @Configuration
+# Configure development environment (main) @Configuration
+config: manage_breast_screening/config/.env \
+	_install-tools \
+	_install-poetry \
+	githooks-config \
+	dependencies \
+	assets \
+	db migrate seed
 
 dependencies: # Install dependencies needed to build and test the project @Pipeline
 	poetry install
 	npm install
+
+assets: # Compile assets @Pipeline
 	npm run compile
 
 build: # Build the project artefact @Pipeline
@@ -54,7 +63,7 @@ rebuild-db: _clean-docker db migrate seed  # Create a fresh development database
 migrate:  # Run migrations
 	poetry run ./manage.py migrate
 
-seed:  # load seed data
+seed:  # Load seed data
 	poetry run ./manage.py loaddata clinics participants
 
 _install-poetry:

package-lock.json

@@ -1,13 +1,13 @@
 # Shared functionality based on https://github.com/NHSDigital/repository-template/blob/main/scripts/init.mk
 
-_install-dependency: # Install asdf dependency - mandatory: name=[listed in the '.tool-versions' file]; optional: version=[if not listed]
+_install-tool: # Install asdf dependency - mandatory: name=[listed in the '.tool-versions' file]; optional: version=[if not listed]
 	echo ${name}
 	asdf plugin add ${name} ||:
 	asdf install ${name} $(or ${version},)
 
-_install-dependencies: # Install all the dependencies listed in .tool-versions
+_install-tools: # Install all the tools listed in .tool-versions
 	for plugin in $$(grep ^[a-z] .tool-versions | sed 's/[[:space:]].*//'); do \
-		make _install-dependency name="$${plugin}" ; \
+		make _install-tool name="$${plugin}" ; \
 	done
 
 # This script parses all the make target descriptions and renders the help output.
@@ -59,7 +59,7 @@ HELP_SCRIPT = \
 		} \
 	}
 
-.PHONY: _install-dependency _install-dependencies
+.PHONY: _install-tool _install-tools
 .ONESHELL:
 MAKEFLAGS := --no-print-directory
 SHELL := /bin/bash