From 5fec7981e5b8cac54a0770856843884d022345e6 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 12 Oct 2018 15:34:20 +0200
Subject: [PATCH] Squashed 'src/module_vm4ms/' changes from 1964e93..9b7aed8
9b7aed8 Update dependency.xml
0033955 Update dependency.xml
b03d7e5 Update dependency.xml
189e0e6 Update dependency.xml
2c489f9 Update dependency.xml
7743bd8 Update dependency.xml
598189b Change dependencies model
87b86b4 Change dependencies model
git-subtree-dir: src/module_vm4ms
git-subtree-split: 9b7aed87080a039ce9b1c7bbf9f3656ce39b8813
---
.../_install => _install}/dependency.xml | 105 +++++++++---------
module/_install/dependency.xml | 20 ----
2 files changed, 51 insertions(+), 74 deletions(-)
rename {web_service/_install => _install}/dependency.xml (75%)
delete mode 100755 module/_install/dependency.xml
diff --git a/web_service/_install/dependency.xml b/_install/dependency.xml
similarity index 75%
rename from web_service/_install/dependency.xml
rename to _install/dependency.xml
index abacf151..227abf73 100755
--- a/web_service/_install/dependency.xml
+++ b/_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/module/_install/dependency.xml b/module/_install/dependency.xml
deleted file mode 100755
index d0d0e9f1..00000000
--- a/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>
--
GitLab