diff --git a/development/makefiles/conan.mk b/development/makefiles/conan.mk index 64dacde6f1c63ff0675faa641df6f467fbf30289..7025948407cdc675d8f745fe39ab7a52d1ec78bf 100644 --- a/development/makefiles/conan.mk +++ b/development/makefiles/conan.mk @@ -49,3 +49,9 @@ export CONANEXAMPLECONF $(CONAN_CONFIG): $(QUIET) $(ECHO) "$$CONANEXAMPLECONF" >> $@ + + +$(CONAN_BIN): + $(QUIET) $(MKDIR) -p $(VENDOR_PATH) + $(QUIET) $(WGET) -O $(CONAN_BIN) http://download.schukai.com/tools/conan/conan-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`) + $(QUIET) $(CHMOD) u+x $(CONAN_BIN) diff --git a/development/makefiles/directories-go-lib.mk b/development/makefiles/directories-go-lib.mk index 5dd10706f18eb7c8bd9a62a293be4b59d1a59aac..257f8ab4051fe1852c021b00d509ba4a100d5361 100644 --- a/development/makefiles/directories-go-lib.mk +++ b/development/makefiles/directories-go-lib.mk @@ -10,6 +10,7 @@ APPLICATION_PATH ?= $(PROJECT_ROOT) DEPLOYMENT_PATH ?= $(PROJECT_ROOT) DEVELOPMENT_PATH ?= $(PROJECT_ROOT) DOCUMENTATION_PATH ?= $(PROJECT_ROOT) +DOCUMENTATION_CONFIG_PATH ?= $(DOCUMENTATION_PATH)config/ RESOURCE_PATH ?= $(APPLICATION_PATH) SOURCE_PATH ?= $(APPLICATION_PATH) diff --git a/development/makefiles/directories-go-utilities.mk b/development/makefiles/directories-go-utilities.mk index f754f0370196ba8529d9cf23b614f0e6bb12788c..8fc26182636a50433b8832b20b36bd80c704140a 100644 --- a/development/makefiles/directories-go-utilities.mk +++ b/development/makefiles/directories-go-utilities.mk @@ -10,6 +10,7 @@ APPLICATION_PATH ?= $(PROJECT_ROOT)application/ DEPLOYMENT_PATH ?= $(PROJECT_ROOT)deployment/ DEVELOPMENT_PATH ?= $(PROJECT_ROOT)development/ DOCUMENTATION_PATH ?= $(PROJECT_ROOT)documentation/ +DOCUMENTATION_CONFIG_PATH ?= $(DOCUMENTATION_PATH)config/ RESOURCE_PATH ?= $(APPLICATION_PATH)resource/ SOURCE_PATH ?= $(APPLICATION_PATH)source/ diff --git a/development/makefiles/directories-platform-part.mk b/development/makefiles/directories-platform-part.mk index 63f3003061861bb11557de3bc76e38e602630c1e..f7111b0cece276ae9deded64537215ceecbe6c74 100644 --- a/development/makefiles/directories-platform-part.mk +++ b/development/makefiles/directories-platform-part.mk @@ -14,7 +14,7 @@ SCRIPT_PATH ?= $(PROJECT_ROOT)$(RELATIVE_SCRIPT_PATH) VENDOR_PATH ?= $(PROJECT_ROOT)vendor/ NODE_PATH ?= $(PROJECT_ROOT)node_modules/ TEST_PATH ?= $(PROJECT_ROOT)test/ -DEVELOPMENT_PATH ?= $(PROJECT_ROOT) +DEVELOPMENT_PATH ?= $(PROJECT_ROOT) LICENSE_PATH ?= $(PROJECT_ROOT) DIST_PATH ?= $(PROJECT_ROOT)dist/ diff --git a/development/makefiles/docman.mk b/development/makefiles/docman.mk index cc61cff5ba99d12818613002164e4aaf3353b7ac..40b21228b0786d9763014feadbe4b20b5dd86709 100644 --- a/development/makefiles/docman.mk +++ b/development/makefiles/docman.mk @@ -7,4 +7,13 @@ ############################################################################################# -DOCMAN_BIN ?= $(VENDOR_PATH)docman +DOCMAN_BIN ?= $(VENDOR_PATH)docman +DOCMAN_CONFIG_PATH ?= $(DOCUMENTATION_CONFIG_PATH)docman.yaml +DOCMAN_HTML_ARTEFACT ?= $(PROJECT_ROOT)deployment/build/manual.html +DOCMAN_PDF_ARTEFACT ?= $(PROJECT_ROOT)deployment/build/manual.pdf +DOCMAN_SOURCE ?= $(shell find $(DOCUMENTATION_PATH) -type f) + +$(DOCMAN_BIN): + $(QUIET) $(MKDIR) -p $(VENDOR_PATH) + $(QUIET) $(WGET) -O $(DOCMAN_BIN) http://download.schukai.com/tools/docman/docman-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`) + $(QUIET) $(CHMOD) u+x $(DOCMAN_BIN) diff --git a/development/makefiles/target-caddy.mk b/development/makefiles/target-caddy.mk index 4387423c6595cd58474e536f0cf4a181a69c2d3d..7258e3e180f6789c42d15d04f6fd70b5b9f10388 100644 --- a/development/makefiles/target-caddy.mk +++ b/development/makefiles/target-caddy.mk @@ -19,5 +19,6 @@ $(CADDY_BIN): .PHONY: run-caddy ## run caddy webserver run-caddy: $(CADDY_BIN) + $(ECHOMARKER) "Run Caddy" $(QUIET) $(CADDY_BIN) run -config $(CADDY_CONFIG) -pidfile $(CADDY_PIDFILE) -watch diff --git a/development/makefiles/target-conan.mk b/development/makefiles/target-conan.mk index 4a9a06ff83dd2d43ef85c2955d90e98f67ca6953..1e42f1f4bdf341c6292655f5d09a6b623c9089c6 100644 --- a/development/makefiles/target-conan.mk +++ b/development/makefiles/target-conan.mk @@ -10,13 +10,8 @@ ifeq ($(CONAN_BIN),) $(error $(ERRORMARKER) Conan is not defined, check your Makefile if conan.mk is included) endif - -$(CONAN_BIN): - $(QUIET) $(MKDIR) -p $(VENDOR_PATH) - $(QUIET) $(WGET) -O $(CONAN_BIN) http://download.schukai.com/tools/conan/conan-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`) - $(QUIET) $(CHMOD) u+x $(CONAN_BIN) - .PHONY: run-conan ## run conan webserver run-conan: $(CONAN_BIN) $(CONAN_CONFIG) + $(ECHOMARKER) "Run Conan" $(QUIET) $(CONAN_BIN) server serve --config $(CONAN_CONFIG) diff --git a/development/makefiles/target-deploy-tool.mk b/development/makefiles/target-deploy-tool.mk index 4e69db87e41f75f0579b27f024ff3c42d73fd5f8..e47b8995407279b2184e50a1af9f77fa9a018632 100644 --- a/development/makefiles/target-deploy-tool.mk +++ b/development/makefiles/target-deploy-tool.mk @@ -17,6 +17,7 @@ deploy: compile .PHONY: overview-to-s3 ## overview-to-s3 overview-to-s3: + $(ECHOMARKER) "Deploy to aws" $(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.html $(UPLOAD_TOOL_URL) $(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.css $(UPLOAD_TOOL_URL) - $(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.js $(UPLOAD_TOOL_URL) \ No newline at end of file + $(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.js $(UPLOAD_TOOL_URL) diff --git a/development/makefiles/target-docman.mk b/development/makefiles/target-docman.mk index 050374042edb1b317f88df55b763df189bf0d25c..2c8424b021d89735576befbc4016b647b8c84f26 100644 --- a/development/makefiles/target-docman.mk +++ b/development/makefiles/target-docman.mk @@ -1,4 +1,3 @@ - ############################################################################################# ############################################################################################# ## @@ -11,28 +10,27 @@ ifeq ($(DOCMAN_BIN),) $(error "$(DOCMAN_BIN) is not installed. Please check your makefile and include the docman.mk") endif -$(DOCMAN_BIN): - $(QUIET) $(MKDIR) -p $(VENDOR_PATH) - $(QUIET) $(WGET) -O $(DOCMAN_BIN) http://download.schukai.com/tools/docman/docman-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`) - $(QUIET) $(CHMOD) u+x $(DOCMAN_BIN) - -$(PROJECT_ROOT)deployment/build/manual.html: $(DOCMAN_BIN) - $(DOCMAN_BIN) document html --config $(PROJECT_ROOT)documentation/config.yaml +$(DOCMAN_HTML_ARTEFACT): $(DOCMAN_BIN) $(DOCMAN_SOURCE) + $(ECHOMARKER) "Build HTML Documentation" + $(QUIET) $(DOCMAN_BIN) document html --config $(DOCMAN_CONFIG_PATH) -$(PROJECT_ROOT)deployment/build/manual.pdf: $(DOCMAN_BIN) - $(DOCMAN_BIN) document pdf --config $(PROJECT_ROOT)documentation/config.yaml +$(DOCMAN_PDF_ARTEFACT): $(DOCMAN_BIN) $(DOCMAN_SOURCE) + $(ECHOMARKER) "Build PDF Documentation" + $(QUIET) $(DOCMAN_BIN) document pdf --config $(DOCMAN_CONFIG_PATH) .PHONY: build-doc-pdf ## creating the documentation in pdf format -build-doc-pdf: $(PROJECT_ROOT)deployment/build/manual.pdf +build-doc-pdf: $(DOCMAN_PDF_ARTEFACT) .PHONY: build-doc-html ## creating the documentation in html format -build-doc-html: $(PROJECT_ROOT)deployment/build/manual.html - +build-doc-html: $(DOCMAN_HTML_ARTEFACT) .PHONY: build-doc ## creating the documentation in pdf and html format build-doc: build-doc-pdf build-doc-html + + +