diff --git a/.dockerignore b/.dockerignore index e66200a3042564cb46798b1416b9594d78f53433..4d11826c80cb953d9d51aa45d1fe14fa487c50e3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,5 +7,6 @@ client-uwp daemon lrc ring_* +plugins .git */.git diff --git a/.gitmodules b/.gitmodules index 6f11f46f647943c53a4ba242fef16cbb15caa625..1d1c4da141aa35457834cac003f484c94d95985b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,6 +25,6 @@ [submodule "client-qt"] path = client-qt url = https://review.jami.net/jami-client-qt -[submodule "jami-plugins"] - path = jami-plugins - url = ../jami-plugins +[submodule "plugins"] + path = plugins + url = https://review.jami.net/jami-plugins diff --git a/jami-plugins b/jami-plugins deleted file mode 160000 index 27ad30868a337d6e615a649f236cd393db160c0a..0000000000000000000000000000000000000000 --- a/jami-plugins +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 27ad30868a337d6e615a649f236cd393db160c0a diff --git a/make-ring.py b/make-ring.py index 5c6f024110339ca03da6d3d4ba18617cbbde48c9..5e829f852e3f1ba70b49021b8e510c7a14112682 100755 --- a/make-ring.py +++ b/make-ring.py @@ -282,7 +282,7 @@ def run_init(): for name in module_names: copy_file("./scripts/commit-msg", ".git/modules/"+name+"/hooks") - module_names_to_format = ['daemon', 'lrc', 'client-qt'] + module_names_to_format = ['daemon', 'lrc', 'client-qt', 'plugins'] for name in module_names_to_format: execute_script( ['./scripts/format.sh --install %(path)s'], diff --git a/plugins b/plugins new file mode 160000 index 0000000000000000000000000000000000000000..9dcf4309a37d32ff8fc349cd96a9c54363530b4b --- /dev/null +++ b/plugins @@ -0,0 +1 @@ +Subproject commit 9dcf4309a37d32ff8fc349cd96a9c54363530b4b diff --git a/scripts/update-submodules.sh b/scripts/update-submodules.sh index 15befcc6cbcc7a384c5a19eed9128bff80fcc941..6c565e03113cccff19f13afd464630c67771c32b 100755 --- a/scripts/update-submodules.sh +++ b/scripts/update-submodules.sh @@ -8,5 +8,6 @@ git add client-android \ client-qt \ client-uwp \ daemon \ - lrc + lrc \ + plugins git commit