diff --git a/conf/_install/dependency.xml b/conf/_install/dependency.xml index 4ad29d754c9fec337bd2c129a32a434e3ff136d8..fa13407b5c1b4e02be417a52f01e738cf0184d36 100644 --- a/conf/_install/dependency.xml +++ b/conf/_install/dependency.xml @@ -4,28 +4,28 @@ <dependenciesCollection> <dependency> <nature>modules</nature> - <name>vmap</name> - <version>2018.03.00</version> + <name>module_vmap</name> + <version>master</version> </dependency> <dependency> <nature>modules</nature> - <name>vm4ms</name> - <version>2018.03.00</version> + <name>module_vm4ms</name> + <version>master</version> </dependency> <dependency> <nature>modules</nature> - <name>anc</name> - <version>2018.03.00</version> + <name>module_anc</name> + <version>master</version> </dependency> <dependency> <nature>web_services</nature> - <name>cadastreV2</name> - <version>2018.02.04</version> + <name>module_cadastreV2</name> + <version>master</version> </dependency> <dependency> <nature>web_services</nature> - <name>cadastre</name> - <version>2018.02.02</version> + <name>module_cadastre</name> + <version>master</version> </dependency> </dependenciesCollection> </installer> diff --git a/utils/get_deps.sh b/utils/get_deps.sh new file mode 100755 index 0000000000000000000000000000000000000000..a02bc29fd40111ee4058b0b3c227a079780fc6be --- /dev/null +++ b/utils/get_deps.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Récupère l'ensemble des dépendances depuis conf/_install/dependency.xml +# Nécessite xmllint : sudo apt install libxml2-utils +# +# +# +# + + +if [ "../conf/_install/dependency.xml" ]; then + + let itemsCount=$(xmllint --xpath 'count(//dependenciesCollection/dependency/name)' ../conf/_install/dependency.xml) + declare -A aDeps + + for (( i=1; i <= $itemsCount; i++ )); do + + aDeps[$i, name]="$(xmllint --xpath 'string(//dependenciesCollection/dependency['$i']/name)' ../conf/_install/dependency.xml)" + aDeps[$i, version]="$(xmllint --xpath 'string(//dependenciesCollection/dependency['$i']/version)' ../conf/_install/dependency.xml)" + aDeps[$i, nature]="$(xmllint --xpath 'string(//dependenciesCollection/dependency['$i']/nature)' ../conf/_install/dependency.xml)" + + done + + export itemsCount + export aDeps +else + echo "[ERROR] ../conf/_install/dependency.xml not found" +fi diff --git a/utils/init_subtrees.sh b/utils/init_subtrees.sh index 96b014a2c0def9dc83a4d21ac1bbe867b894ca6a..6ad90674f8de6ffc66c56baf28298d2a53152319 100755 --- a/utils/init_subtrees.sh +++ b/utils/init_subtrees.sh @@ -4,15 +4,20 @@ # Script d'initialisation d'un dépot vMap versionné sous git # Initislise l'ensemble des dépendances sous forme de subtrees # -# +# Nécessite xmllint : sudo apt install libxml2-utils # APP_NAME="vmap" -APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 ) + +# Récupère la liste des dépendances +. ./get_deps.sh cd .. -rm -Rf src +if [ -d "$(pwd)/src" ]; then + git rm -r src + git commit -a -m "Reset sources" +fi mkdir src # Vitis @@ -23,9 +28,11 @@ echo "---- Init conf ----" git subtree add --prefix src/closure "git@vm09.veremes.net:Development/vitis_apps/sources/closure.git" master # Modules -for module in "${APP_MODULES[@]}"; do - echo "---- Init module_${module} ----" +for (( i=1; i <= $itemsCount; i++ )); do + if [[ ${aDeps[$i, name]} == modules ] || [ ${aDeps[$i, name]} == web_services ]]; then + echo "---- Init ${aDeps[$i, name]} : ${aDeps[$i, version]}----" - # Ajoute le dépôt - git subtree add --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master + # 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" master + fi done