diff --git a/conf/_install/dependency.xml b/conf/_install/dependency.xml index fa13407b5c1b4e02be417a52f01e738cf0184d36..72608d4b46a5695873e7c388c1b903ee6a87db07 100644 --- a/conf/_install/dependency.xml +++ b/conf/_install/dependency.xml @@ -2,6 +2,11 @@ <!-- Application --> <installer> <dependenciesCollection> + <dependency> + <nature>framework</nature> + <name>vitis</name> + <version>master</version> + </dependency> <dependency> <nature>modules</nature> <name>module_vmap</name> diff --git a/utils/get_deps.sh b/utils/get_deps.sh index a02bc29fd40111ee4058b0b3c227a079780fc6be..92b0273980ef5ae8db6eea7268fd3a5c406243b9 100755 --- a/utils/get_deps.sh +++ b/utils/get_deps.sh @@ -10,18 +10,38 @@ if [ "../conf/_install/dependency.xml" ]; then - let itemsCount=$(xmllint --xpath 'count(//dependenciesCollection/dependency/name)' ../conf/_install/dependency.xml) + let depsCount=$(xmllint --xpath 'count(//dependenciesCollection/dependency/name)' ../conf/_install/dependency.xml) declare -A aDeps + vitisVersion=master - for (( i=1; i <= $itemsCount; i++ )); do + for (( i=1; i <= $depsCount; 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)" + sName="$(xmllint --xpath 'string(//dependenciesCollection/dependency['$i']/name)' ../conf/_install/dependency.xml)" + sVersion="$(xmllint --xpath 'string(//dependenciesCollection/dependency['$i']/version)' ../conf/_install/dependency.xml)" + sNature="$(xmllint --xpath 'string(//dependenciesCollection/dependency['$i']/nature)' ../conf/_install/dependency.xml)" + + if [ $sName == "vitis" ]; then + vitisVersion=$sVersion + fi + if [ $sNature == "modules" ] || [ $sNature == "web_services" ] || [ $sName == "vitis" ]; then + aDeps[$i, name]=$sName + aDeps[$i, version]=$sVersion + aDeps[$i, nature]=$sNature + fi + + done + + echo "[INFO] dependencies:" + echo "vitis : $vitisVersion" + for (( i=1; i <= $depsCount; i++ )); do + + echo "name: ${aDeps[$i, name]}" + echo "version: ${aDeps[$i, version]}" done - export itemsCount + export vitisVersion + export depsCount export aDeps else echo "[ERROR] ../conf/_install/dependency.xml not found" diff --git a/utils/init_subtrees.sh b/utils/init_subtrees.sh index c15e99326e8a7405aa0faf8e857d45442705d255..810550ff62466e9dbb9de2f5ba988acd4c8bd70c 100755 --- a/utils/init_subtrees.sh +++ b/utils/init_subtrees.sh @@ -26,19 +26,23 @@ if [ -d "$(pwd)/src" ]; then fi mkdir src -# Vitis -echo "---- Init vitis ----" -git subtree add --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master - -echo "---- Init conf ----" -git subtree add --prefix src/closure "git@vm09.veremes.net:Development/vitis_apps/sources/closure.git" master - -# Modules -for (( i=1; i <= $itemsCount; i++ )); do - if [ ${aDeps[$i, nature]} == "modules" ] || [ ${aDeps[$i, nature]} == "web_services" ]; 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]} - fi -done +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 + + echo "---- Init conf ----" + git subtree add --prefix src/closure "git@vm09.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 + 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]} + fi + done + +fi