Utilisation de dependency.xml pour la gestion des subtrees

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>

utils/get_deps.sh

+#!/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

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
+		git subtree add --prefix src/${aDeps[$i, name]} "git@vm09.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master
+	fi
 done