BBL-381 | adding Makefile standalone approach for ref-architecture la…

…yer + sintaxt spaces improvement
binbashar · Sep 11, 2020 · 5c2353a · 5c2353a
1 parent b362ada
commit 5c2353a
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 60 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: help
-SHELL                    := /bin/bash
-MAKEFILE_PATH            := ./Makefile
-MAKEFILES_DIR            := ./@bin/makefiles
+SHELL         := /bin/bash
+MAKEFILE_PATH := ./Makefile
+MAKEFILES_DIR := ./@bin/makefiles
 
 help:
 	@echo 'Available Commands:'

diff --git a/ansible/roles/Makefile b/ansible/roles/Makefile
@@ -1,7 +1,7 @@
 .PHONY: help
-SHELL 			:= /bin/bash
-MAKEFILE_PATH   := ./Makefile
-MAKEFILES_DIR   := ../../@bin/makefiles
+SHELL         := /bin/bash
+MAKEFILE_PATH := ./Makefile
+MAKEFILES_DIR := ../../@bin/makefiles
 
 #
 # ARG VARIABLES

diff --git a/docker/Makefile b/docker/Makefile
@@ -1,7 +1,7 @@
 .PHONY: help
-SHELL 			:= /bin/bash
-MAKEFILE_PATH   := ./Makefile
-MAKEFILES_DIR   := ../@bin/makefiles
+SHELL         := /bin/bash
+MAKEFILE_PATH := ./Makefile
+MAKEFILES_DIR := ../@bin/makefiles
 
 #
 # ARG VARIABLES

diff --git a/helm/Makefile b/helm/Makefile
@@ -1,7 +1,7 @@
 .PHONY: help
-SHELL 			:= /bin/bash
-MAKEFILE_PATH   := ./Makefile
-MAKEFILES_DIR   := ../@bin/makefiles
+SHELL         := /bin/bash
+MAKEFILE_PATH := ./Makefile
+MAKEFILES_DIR := ../@bin/makefiles
 
 #
 # ARG VARIABLES

diff --git a/jenkins/Makefile b/jenkins/Makefile
@@ -1,7 +1,7 @@
 .PHONY: help
-SHELL 			:= /bin/bash
-MAKEFILE_PATH   := ./Makefile
-MAKEFILES_DIR   := ../@bin/makefiles
+SHELL         := /bin/bash
+MAKEFILE_PATH := ./Makefile
+MAKEFILES_DIR := ../@bin/makefiles
 
 #
 # ARG VARIABLES

diff --git a/ref-architecture/Makefile b/ref-architecture/Makefile
@@ -1,26 +1,7 @@
 .PHONY: help
-SHELL 					:= /bin/bash
-MAKEFILE_IMPORT_GIT 	:= ../@bin/makefiles/git/Makefile.git
-MAKEFILE_IMPORT_GITHUB 	:= ../@bin/makefiles/github/Makefile.github
-
-#
-# MAKE GIT DEFINITIONS
-#
-define MAKE_GIT
-make \
--f ${MAKEFILE_IMPORT_GIT} \
-REPOS_LIST='${REPOS_LIST}'
-endef
-
-#
-# MAKE GITHUB DEFINITIONS
-#
-define MAKE_GITHUB
-make \
--f ${MAKEFILE_IMPORT_GITHUB} \
-REPOS_LIST='${REPOS_LIST}' \
-GIT_GITHUB_REPO_TOPICS='${GIT_GITHUB_REPO_TOPICS}'
-endef
+SHELL         := /bin/bash
+MAKEFILE_PATH := ./Makefile
+MAKEFILES_DIR := ../@bin/makefiles
 
 #
 # ARG VARIABLES
@@ -42,25 +23,18 @@ help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " - \033[36m%-18s\033[0m %s\n", $$1, $$2}'
 
 #==============================================================#
-# GITHUB MODULE MGMT                                           #
+# INITIALIZATION                                               #
 #==============================================================#
-github-repo-get-all-topics: ## Github get all repo topics - eg: make GITHUB_TOKEN="4df7...406" -f Makefile.github github-repo-get-all-topics
-	${MAKE_GITHUB} github-repo-get-all-topics
+init-makefiles: ## initialize makefiles
+	rm -rf ${MAKEFILES_DIR}
+	mkdir -p ${MAKEFILES_DIR}
+	git clone https://github.com/binbashar/le-dev-makefiles.git ${MAKEFILES_DIR}
+	echo "" >> ${MAKEFILE_PATH}
+	sed -i '/^#include.*/s/^#//' ${MAKEFILE_PATH}
 
-github-repo-replace-all-topics: ## Github replace all repo topics - eg: make GITHUB_TOKEN="4df7...406" -f Makefile.github github-repo-replace-all-topics
-	${MAKE_GITHUB} github-repo-replace-all-topics
-
-#==============================================================#
-# GIT MODULE MGMT											   #
-#==============================================================#
-git-clone-repo: ## Git clone repo
-	${MAKE_GIT} git-clone-repo
-
-git-pull-master: ## Git pull repo from master branch
-	${MAKE_GIT} git-pull-master
-
-git-sync-fork-upstream: ## Git sync from master forked upstream repos
-	${MAKE_GIT} git-sync-fork-upstream
-
-git-sync-tag-fork-upstream: ## Git tag sync from master forked upstream repos
-	${MAKE_GIT} git-sync-tag-fork-upstream
+#
+## IMPORTANT: Automatically managed
+## Must NOT UNCOMMENT the #include lines below
+#
+#include ${MAKEFILES_DIR}/git/git.mk
+#include ${MAKEFILES_DIR}/github/github.mk
diff --git a/terraform/Makefile b/terraform/Makefile
@@ -1,7 +1,7 @@
 .PHONY: help
-SHELL 			:= /bin/bash
-MAKEFILE_PATH   := ./Makefile
-MAKEFILES_DIR   := ../@bin/makefiles
+SHELL         := /bin/bash
+MAKEFILE_PATH := ./Makefile
+MAKEFILES_DIR := ../@bin/makefiles
 
 #
 # ARG VARIABLES