diff --git a/src/module_vm4ms/web_service/_install/dependency.xml b/src/module_vm4ms/_install/dependency.xml similarity index 75% rename from src/module_vm4ms/web_service/_install/dependency.xml rename to src/module_vm4ms/_install/dependency.xml index abacf1516e0f479214087b88519249f18b7308ab..227abf73166d76fe8c1da97a313dbe0889023f41 100755 --- a/src/module_vm4ms/web_service/_install/dependency.xml +++ b/src/module_vm4ms/_install/dependency.xml @@ -1,54 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- WS vMap --> -<installer> - <schema> - <name>s_vm4ms</name> - <version>2018.03.00</version> - <dependenciesCollection> - <dependency> - <nature>schema</nature> - <name>s_vitis</name> - <version>2018.05.00</version> - <object>vas</object> - </dependency> - </dependenciesCollection> - </schema> - <dependenciesCollection> - <dependency> - <name>vm4ms-pre-install</name> - <nature>extern-pre</nature> - <object>vm4ms</object> - </dependency> - <dependency> - <name>vm4ms-post-install</name> - <nature>extern-post</nature> - <object>vm4ms</object> - </dependency> - <dependency> - <nature>vas</nature> - <version>2018.05.00</version> - </dependency> - <dependency> - <nature>web_services</nature> - <name>vmap</name> - <version>2018.03.00</version> - </dependency> - <dependency> - <name>mapserver</name> - <nature>extern-post</nature> - <location>mapserver-7.0.7.1</location> - </dependency> - <!-- Dépendances de mapserver --> - <dependency> - <name>vcredist-mapserver</name> - <nature>extern-pre</nature> - <location>vcredist-10-86</location> - </dependency> - <dependency> - <name>vcredist-gdal</name> - <nature>extern-pre</nature> - <location>vcredist-11</location> - </dependency> - <!-- Fin des dépendances de mapserver --> - </dependenciesCollection> -</installer> +<?xml version="1.0" encoding="UTF-8"?> +<!-- WS vMap --> +<installer> + <schema> + <name>s_vm4ms</name> + <dependenciesCollection> + <dependency> + <nature>schema</nature> + <name>s_vitis</name> + <object>vitis</object> + </dependency> + </dependenciesCollection> + </schema> + <dependenciesCollection> + <dependency> + <name>vm4ms-pre-install</name> + <nature>extern-pre</nature> + <object>module_vm4ms</object> + </dependency> + <dependency> + <name>vm4ms-post-install</name> + <nature>extern-post</nature> + <object>module_vm4ms</object> + </dependency> + <dependency> + <nature>framework</nature> + <name>vitis</name> + </dependency> + <dependency> + <nature>modules</nature> + <name>module_vmap</name> + </dependency> + <dependency> + <name>mapserver</name> + <nature>extern-post</nature> + <location>mapserver-7.0.7.1</location> + </dependency> + <!-- Dépendances de mapserver --> + <dependency> + <name>vcredist-mapserver</name> + <nature>extern-pre</nature> + <location>vcredist-10-86</location> + </dependency> + <dependency> + <name>vcredist-gdal</name> + <nature>extern-pre</nature> + <location>vcredist-11</location> + </dependency> + <!-- Fin des dépendances de mapserver --> + </dependenciesCollection> +</installer> diff --git a/src/module_vm4ms/module/_install/dependency.xml b/src/module_vm4ms/module/_install/dependency.xml deleted file mode 100755 index d0d0e9f177b90c1d4bc7480f2c9eeceb82912d67..0000000000000000000000000000000000000000 --- a/src/module_vm4ms/module/_install/dependency.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Module vMap --> -<installer> - <dependenciesCollection> - <dependency> - <nature>core</nature> - <version>2018.05.00</version> - </dependency> - <dependency> - <nature>web_services</nature> - <name>vmap</name> - <version>2018.03.00</version> - </dependency> - <dependency> - <nature>web_services</nature> - <name>vm4ms</name> - <version>2018.03.00</version> - </dependency> - </dependenciesCollection> -</installer>