diff --git a/utils/init_subtrees.sh b/utils/init_subtrees.sh index 810550ff62466e9dbb9de2f5ba988acd4c8bd70c..465a94b4699653ef8a8a7ce92914a2c0a4e2896a 100755 --- a/utils/init_subtrees.sh +++ b/utils/init_subtrees.sh @@ -30,19 +30,19 @@ if [[ $depsCount > 0 ]]; then # Vitis echo "---- Init vitis ----" - git subtree add --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion + git subtree add --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion echo "---- Init conf ----" - git subtree add --prefix src/closure "git@vm09.veremes.net:Development/vitis_apps/sources/closure.git" master + git subtree add --prefix src/closure "git@gitlab.veremes.net:Development/vitis_apps/sources/closure.git" master # Modules for (( i=1; i <= $depsCount; i++ )); do - if [ ${aDeps[$i, nature]} == "modules" ] || [ ${aDeps[$i, nature]} == "web_services" ]; then + if [ ${aDeps[$i, nature]} == "modules" ]; then echo "---- Init ${aDeps[$i, name]} : ${aDeps[$i, version]}----" # Ajoute le dépôt - git subtree add --prefix src/${aDeps[$i, name]} "git@vm09.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} + git subtree add --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} fi done -fi +fi \ No newline at end of file diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh index 9324f12724e355387e2990f877270d31a927e8e5..20929dcee3b4fa3c41fa7cb28775c9302d3e6bfa 100755 --- a/utils/init_symlinks.sh +++ b/utils/init_symlinks.sh @@ -7,13 +7,15 @@ # git subtree split -P module/ -b module_split_branch # # Add subtree -# git subtree add --prefix vmap "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master +# git subtree add --prefix vmap "git@gitlab.veremes.net:Development/vitis_apps/sources/Vitis.git" master # # APP_NAME="vmap" -APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 ) + +# Récupère la liste des dépendances +. ./get_deps.sh cd .. @@ -28,26 +30,33 @@ ln -rsf conf src/vitis/client/conf ln -rsf src/closure/conf conf/closure # Modules -for module in "${APP_MODULES[@]}"; do - echo "---- Link module_${module} ----" - if [ -d "$(pwd)/src/module_${module}/module" ]; then - ln -rsf src/module_${module}/module src/vitis/client/modules/${module} - fi - if [ -d "$(pwd)/src/module_${module}/web_service/ws" ]; then - ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module} - fi - if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then - ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module} - fi - if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then - ln -rsf src/module_${module}/web_service/conf src/vitis/vas/sql/${module} - fi - if [ -d "$(pwd)/src/module_${module}/web_service/class" ]; then - for class_dir in $( ls "$(pwd)/src/module_${module}/web_service/class"); do - if [ -d "$(pwd)/src/module_${module}/web_service/class/${class_dir}" ]; then - echo "---- Link module_${module}/${class_dir} ----" - ln -rsf src/module_${module}/web_service/class/${class_dir} src/vitis/vas/rest/class/${class_dir} +if [[ $depsCount > 0 ]]; then + for (( i=1; i <= $depsCount; i++ )); do + if [ ${aDeps[$i, nature]} == "modules" ]; then + if [ ${aDeps[$i, nature]:0:7} == "module_" ]; then + $module = ${aDeps[$i, name]:7} + echo "---- Link module_${module} ----" + if [ -d "$(pwd)/src/module_${module}/module" ]; then + ln -rsf src/module_${module}/module src/vitis/client/modules/${module} + fi + if [ -d "$(pwd)/src/module_${module}/web_service/ws" ]; then + ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module} + fi + if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then + ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module} + fi + if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then + ln -rsf src/module_${module}/web_service/conf src/vitis/vas/sql/${module} + fi + if [ -d "$(pwd)/src/module_${module}/web_service/class" ]; then + for class_dir in $( ls "$(pwd)/src/module_${module}/web_service/class"); do + if [ -d "$(pwd)/src/module_${module}/web_service/class/${class_dir}" ]; then + echo "---- Link module_${module}/${class_dir} ----" + ln -rsf src/module_${module}/web_service/class/${class_dir} src/vitis/vas/rest/class/${class_dir} + fi + done + fi fi - done - fi -done + fi + done +fi diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh index 1158e63bccc4184a9d49e8f3d2452d7256fd5e1f..09d9703845533b4b7243e61410a4c0f3234e7067 100755 --- a/utils/pull_subtrees.sh +++ b/utils/pull_subtrees.sh @@ -9,18 +9,24 @@ APP_NAME="vmap" -APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 ) + +# Récupère la liste des dépendances +. ./get_deps.sh cd .. # Vitis echo "---- Pull vitis ----" -git subtree pull --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master +git subtree pull --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master # Modules -for module in "${APP_MODULES[@]}"; do - echo "---- Pull module_${module} ----" +if [[ $depsCount > 0 ]]; then + for (( i=1; i <= $depsCount; i++ )); do + if [ ${aDeps[$i, nature]} == "modules" ]; then + echo "---- Pull ${aDeps[$i, name]} ----" - # Ajoute le dépôt - git subtree pull --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master -done + # Ajoute le dépôt + git subtree pull --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master + fi + done +fi diff --git a/utils/push_subtrees.sh b/utils/push_subtrees.sh index 665ed8fdde44e60a721e9fe77277d347ad44caef..fb430d5f9da57f08c7c52810b31bbfe400b18eae 100755 --- a/utils/push_subtrees.sh +++ b/utils/push_subtrees.sh @@ -9,18 +9,24 @@ APP_NAME="vmap" -APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 ) + +# Récupère la liste des dépendances +. ./get_deps.sh cd .. # Vitis echo "---- Push vitis ----" -git subtree push --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master +git subtree push --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master # Modules -for module in "${APP_MODULES[@]}"; do - echo "---- Push module_${module} ----" +if [[ $depsCount > 0 ]]; then + for (( i=1; i <= $depsCount; i++ )); do + if [ ${aDeps[$i, nature]} == "modules" ]; then + echo "---- Push ${aDeps[$i, name]} ----" - # Ajoute le dépôt - git subtree push --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master -done + # Push le dépôt + git subtree push --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master + fi + done +fi