Skip to content
Snippets Groups Projects
Verified Commit c83f5a09 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

chore: update makefiles

parent c40b7760
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 34 additions and 22 deletions
development/makefiles/conan.mk
+ 6
− 0
View file @ c83f5a09
...@@ -49,3 +49,9 @@ export CONANEXAMPLECONF ...@@ -49,3 +49,9 @@ export CONANEXAMPLECONF
$(CONAN_CONFIG): $(CONAN_CONFIG):
$(QUIET) $(ECHO) "$$CONANEXAMPLECONF" >> $@ $(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)
development/makefiles/directories-go-lib.mk
+ 1
− 0
View file @ c83f5a09
...@@ -10,6 +10,7 @@ APPLICATION_PATH ?= $(PROJECT_ROOT) ...@@ -10,6 +10,7 @@ APPLICATION_PATH ?= $(PROJECT_ROOT)
DEPLOYMENT_PATH ?= $(PROJECT_ROOT) DEPLOYMENT_PATH ?= $(PROJECT_ROOT)
DEVELOPMENT_PATH ?= $(PROJECT_ROOT) DEVELOPMENT_PATH ?= $(PROJECT_ROOT)
DOCUMENTATION_PATH ?= $(PROJECT_ROOT) DOCUMENTATION_PATH ?= $(PROJECT_ROOT)
DOCUMENTATION_CONFIG_PATH ?= $(DOCUMENTATION_PATH)config/
RESOURCE_PATH ?= $(APPLICATION_PATH) RESOURCE_PATH ?= $(APPLICATION_PATH)
SOURCE_PATH ?= $(APPLICATION_PATH) SOURCE_PATH ?= $(APPLICATION_PATH)
......
development/makefiles/directories-go-utilities.mk
+ 1
− 0
View file @ c83f5a09
...@@ -10,6 +10,7 @@ APPLICATION_PATH ?= $(PROJECT_ROOT)application/ ...@@ -10,6 +10,7 @@ APPLICATION_PATH ?= $(PROJECT_ROOT)application/
DEPLOYMENT_PATH ?= $(PROJECT_ROOT)deployment/ DEPLOYMENT_PATH ?= $(PROJECT_ROOT)deployment/
DEVELOPMENT_PATH ?= $(PROJECT_ROOT)development/ DEVELOPMENT_PATH ?= $(PROJECT_ROOT)development/
DOCUMENTATION_PATH ?= $(PROJECT_ROOT)documentation/ DOCUMENTATION_PATH ?= $(PROJECT_ROOT)documentation/
DOCUMENTATION_CONFIG_PATH ?= $(DOCUMENTATION_PATH)config/
RESOURCE_PATH ?= $(APPLICATION_PATH)resource/ RESOURCE_PATH ?= $(APPLICATION_PATH)resource/
SOURCE_PATH ?= $(APPLICATION_PATH)source/ SOURCE_PATH ?= $(APPLICATION_PATH)source/
......
development/makefiles/directories-platform-part.mk
+ 1
− 1
View file @ c83f5a09
development/makefiles/docman.mk
+ 10
− 1
View file @ c83f5a09
...@@ -8,3 +8,12 @@ ...@@ -8,3 +8,12 @@
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)
development/makefiles/target-caddy.mk
+ 1
− 0
View file @ c83f5a09
...@@ -19,5 +19,6 @@ $(CADDY_BIN): ...@@ -19,5 +19,6 @@ $(CADDY_BIN):
.PHONY: run-caddy .PHONY: run-caddy
## run caddy webserver ## run caddy webserver
run-caddy: $(CADDY_BIN) run-caddy: $(CADDY_BIN)
$(ECHOMARKER) "Run Caddy"
$(QUIET) $(CADDY_BIN) run -config $(CADDY_CONFIG) -pidfile $(CADDY_PIDFILE) -watch $(QUIET) $(CADDY_BIN) run -config $(CADDY_CONFIG) -pidfile $(CADDY_PIDFILE) -watch
development/makefiles/target-conan.mk
+ 1
− 6
View file @ c83f5a09
...@@ -10,13 +10,8 @@ ifeq ($(CONAN_BIN),) ...@@ -10,13 +10,8 @@ ifeq ($(CONAN_BIN),)
$(error $(ERRORMARKER) Conan is not defined, check your Makefile if conan.mk is included) $(error $(ERRORMARKER) Conan is not defined, check your Makefile if conan.mk is included)
endif 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 .PHONY: run-conan
## run conan webserver ## run conan webserver
run-conan: $(CONAN_BIN) $(CONAN_CONFIG) run-conan: $(CONAN_BIN) $(CONAN_CONFIG)
$(ECHOMARKER) "Run Conan"
$(QUIET) $(CONAN_BIN) server serve --config $(CONAN_CONFIG) $(QUIET) $(CONAN_BIN) server serve --config $(CONAN_CONFIG)
development/makefiles/target-deploy-tool.mk
+ 2
− 1
View file @ c83f5a09
...@@ -17,6 +17,7 @@ deploy: compile ...@@ -17,6 +17,7 @@ deploy: compile
.PHONY: overview-to-s3 .PHONY: overview-to-s3
## overview-to-s3 ## 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.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.css $(UPLOAD_TOOL_URL)
$(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.js $(UPLOAD_TOOL_URL) $(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.js $(UPLOAD_TOOL_URL)
development/makefiles/target-docman.mk
+ 11
− 13
View file @ c83f5a09
############################################################################################# #############################################################################################
############################################################################################# #############################################################################################
## ##
...@@ -11,28 +10,27 @@ ifeq ($(DOCMAN_BIN),) ...@@ -11,28 +10,27 @@ ifeq ($(DOCMAN_BIN),)
$(error "$(DOCMAN_BIN) is not installed. Please check your makefile and include the docman.mk") $(error "$(DOCMAN_BIN) is not installed. Please check your makefile and include the docman.mk")
endif endif
$(DOCMAN_BIN): $(DOCMAN_HTML_ARTEFACT): $(DOCMAN_BIN) $(DOCMAN_SOURCE)
$(QUIET) $(MKDIR) -p $(VENDOR_PATH) $(ECHOMARKER) "Build HTML Documentation"
$(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) $(DOCMAN_BIN) document html --config $(DOCMAN_CONFIG_PATH)
$(QUIET) $(CHMOD) u+x $(DOCMAN_BIN)
$(PROJECT_ROOT)deployment/build/manual.html: $(DOCMAN_BIN)
$(DOCMAN_BIN) document html --config $(PROJECT_ROOT)documentation/config.yaml
$(PROJECT_ROOT)deployment/build/manual.pdf: $(DOCMAN_BIN) $(DOCMAN_PDF_ARTEFACT): $(DOCMAN_BIN) $(DOCMAN_SOURCE)
$(DOCMAN_BIN) document pdf --config $(PROJECT_ROOT)documentation/config.yaml $(ECHOMARKER) "Build PDF Documentation"
$(QUIET) $(DOCMAN_BIN) document pdf --config $(DOCMAN_CONFIG_PATH)
.PHONY: build-doc-pdf .PHONY: build-doc-pdf
## creating the documentation in pdf format ## 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 .PHONY: build-doc-html
## creating the documentation in html format ## creating the documentation in html format
build-doc-html: $(PROJECT_ROOT)deployment/build/manual.html build-doc-html: $(DOCMAN_HTML_ARTEFACT)
.PHONY: build-doc .PHONY: build-doc
## creating the documentation in pdf and html format ## creating the documentation in pdf and html format
build-doc: build-doc-pdf build-doc-html build-doc: build-doc-pdf build-doc-html
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment