From a759c65019a44ab2566be754af798348b0cfef01 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Mon, 27 May 2024 20:47:36 +0200 Subject: [PATCH] Switch components to submodules --- .gitignore | 4 ---- .gitmodules | 9 +++++++++ Makefile | 17 ++++------------- common | 1 + controller | 1 + core | 1 + 6 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 .gitmodules create mode 160000 common create mode 160000 controller create mode 160000 core diff --git a/.gitignore b/.gitignore index 07d4c70..95e4256 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -/common -/core -/controller - /emgauwa-*.json /emgauwa-*.sqlite diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3670a3a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "common"] + path = common + url = git@git.serguzim.me:emgauwa/common.git +[submodule "core"] + path = core + url = git@git.serguzim.me:emgauwa/core.git +[submodule "controller"] + path = controller + url = git@git.serguzim.me:emgauwa/controller.git diff --git a/Makefile b/Makefile index 777e071..f6c0284 100644 --- a/Makefile +++ b/Makefile @@ -2,17 +2,8 @@ configs: $(MAKE) -C core config $(MAKE) -C controller config -git-clone-http: - git clone https://git.serguzim.me/emgauwa/common.git - git clone https://git.serguzim.me/emgauwa/core.git - git clone https://git.serguzim.me/emgauwa/controller.git - -git-clone-ssh: - git clone git@git.serguzim.me:emgauwa/common.git - git clone git@git.serguzim.me:emgauwa/core.git - git clone git@git.serguzim.me:emgauwa/controller.git - git-status: - @printf "===== COMMON =====\n" && cd common && git status - @printf "\n\n===== CORE =====\n" && cd core && git status - @printf "\n\n===== CONTROLLER =====\n" && cd controller && git status + git submodule foreach git status + +git-diff: + git diff --submodule=diff diff --git a/common b/common new file mode 160000 index 0000000..473832f --- /dev/null +++ b/common @@ -0,0 +1 @@ +Subproject commit 473832f58a258e404d7bba0ca20a3ff58e6ba11c diff --git a/controller b/controller new file mode 160000 index 0000000..8244a1d --- /dev/null +++ b/controller @@ -0,0 +1 @@ +Subproject commit 8244a1d8374d46462b7396afd3a81c99cebdd89a diff --git a/core b/core new file mode 160000 index 0000000..470b9c9 --- /dev/null +++ b/core @@ -0,0 +1 @@ +Subproject commit 470b9c905b6e1f494f0554b75d77d5349bf11c85