From 80273b308826c21f4b7639a34416cf35107a6271 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 14 Dec 2017 12:52:22 +0100 Subject: [PATCH] use relative paths for submodules --- .gitmodules | 10 +++++----- Makefile | 4 ++-- pmg-gui | 1 + proxmox-mailgateway-gui | 1 - proxmox-widget-toolkit | 2 +- pve-manager | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) create mode 160000 pmg-gui delete mode 160000 proxmox-mailgateway-gui diff --git a/.gitmodules b/.gitmodules index 6707680..aca2f67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ -[submodule "proxmox-mailgateway-gui"] - path = proxmox-mailgateway-gui - url = ssh://gitolite3@proxdev.maurer-it.com/pmg/proxmox-mailgateway-gui +[submodule "pmg-gui"] + path = pmg-gui + url = ../pmg-gui/ [submodule "proxmox-widget-toolkit"] path = proxmox-widget-toolkit - url = ssh://gitolite3@proxdev.maurer-it.com/pve/proxmox-widget-toolkit + url = ../proxmox-widget-toolkit/ [submodule "pve-manager"] path = pve-manager - url = ssh://gitolite3@proxdev.maurer-it.com/pve/pve-manager + url = ../pve-manager/ diff --git a/Makefile b/Makefile index 35bb542..4f8bbb5 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ $(DEBS): | submodule .PHONY: submodule submodule: - test -f "proxmox-mailgateway-gui/Makefile" || git submodule update --init + test -f "pmg-gui/Makefile" || git submodule update --init .PHONY: install install: ${PMG_LANG_FILES} ${PVE_LANG_FILES} @@ -48,7 +48,7 @@ pve-lang-%.js: proxmox-widget-toolkit-%.po pve-manager-%.po .PHONY: update update: ./jsgettext.pl -p "proxmox-widget-toolkit 1.0" -o proxmox-widget-toolkit.pot proxmox-widget-toolkit/ - ./jsgettext.pl -p "proxmox-mailgateway 5.0" -o proxmox-mailgateway.pot -b proxmox-widget-toolkit.pot proxmox-mailgateway-gui/js/ + ./jsgettext.pl -p "proxmox-mailgateway 5.0" -o proxmox-mailgateway.pot -b proxmox-widget-toolkit.pot pmg-gui/js/ ./jsgettext.pl -p "pve-manager 5.0" -o pve-manager.pot -b proxmox-widget-toolkit.pot pve-manager/www/manager6/ for j in proxmox-widget-toolkit proxmox-mailgateway pve-manager; do for i in $(LINGUAS); do echo -n "$$j-$$i: ";msgmerge -s -v $$j-$$i.po $$j.pot >$$j-$$i.po.tmp && mv $$j-$$i.po.tmp $$j-$$i.po; done; done diff --git a/pmg-gui b/pmg-gui new file mode 160000 index 0000000..07f1416 --- /dev/null +++ b/pmg-gui @@ -0,0 +1 @@ +Subproject commit 07f1416a4c3b04e951764c36379ede1a811b10ca diff --git a/proxmox-mailgateway-gui b/proxmox-mailgateway-gui deleted file mode 160000 index 9584871..0000000 --- a/proxmox-mailgateway-gui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9584871dc765cbfeaddb8e1a557394534c476006 diff --git a/proxmox-widget-toolkit b/proxmox-widget-toolkit index ca31548..6689e1c 160000 --- a/proxmox-widget-toolkit +++ b/proxmox-widget-toolkit @@ -1 +1 @@ -Subproject commit ca31548b042feadb449337eb10d75f3b7020a7a4 +Subproject commit 6689e1cedd032f2aeab4e939c806f55c6a3a5497 diff --git a/pve-manager b/pve-manager index 0557c80..c6f0412 160000 --- a/pve-manager +++ b/pve-manager @@ -1 +1 @@ -Subproject commit 0557c80859f76c31978e170ef35ad0e03fa9a7bf +Subproject commit c6f0412f7a1e6141d4524db63e50ccabc72ed5a3 -- 2.39.2