From 1dccb17e9a2e4a9e0d4e35e1487f28a122565e30 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Thu, 18 Oct 2018 10:45:20 +0200
Subject: [PATCH] Modify vas symlinks
---
.gitignore | 29 ++++++++++++++++-------------
utils/init_symlinks.sh | 36 +++++++++++++++++++++++++++++-------
2 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index d8b5d991..663498ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,20 @@
-client
-vas
+# client
+# vas
conf/closure
conf/node_modules/
conf/properties.json
src/closure/conf/depswriter/
-src/vitis/vas/log/
-src/vitis/vas/public/
-src/vitis/vas/server/
-src/vitis/vas/ws_data/
-src/vitis/vas/tmp/
-src/vitis/client/modules/
-! src/vitis/client/modules/vitis/
-src/vitis/vas/rest/ws/*
-! src/vitis/vas/rest/ws/vitis/
-src/vitis/vas/sql/*
-! src/vitis/vas/sql/sqlQueries.xml
+src/vitis/client/javascript/*.js*
+
+vas/log/
+vas/public/
+vas/server/
+vas/ws_data/
+vas/tmp/
+vas/shared/
+# src/vitis/client/modules/
+# ! src/vitis/client/modules/vitis/
+# src/vitis/vas/rest/ws/*
+# ! src/vitis/vas/rest/ws/vitis/
+# src/vitis/vas/sql/*
+# ! src/vitis/vas/sql/sqlQueries.xml
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
index c98ed30e..1eaf4969 100755
--- a/utils/init_symlinks.sh
+++ b/utils/init_symlinks.sh
@@ -19,14 +19,36 @@ read APP_EXISTING_PATH
cd ..
+# Supprime les anciens symlinks
+if [ -e "client" ]; then
+ rm client
+fi
+if [ -e "vas" ]; then
+ rm vas
+fi
+find src/vitis/client -type l -delete
+find src/vitis/vas/sql -type l -delete
+find src/vitis/vas/rest -type l -delete
+
# Vitis
echo "---- Link vitis ----"
if ! [ -e "$(pwd)/client" ]; then
- echo "---- Link vitis 2 ----"
ln -rsf src/vitis/client client
fi
if ! [ -e "$(pwd)/vas" ]; then
- ln -rsf src/vitis/vas vas
+# ln -rsf src/vitis/vas vas
+
+ mkdir vas
+ mkdir vas/rest
+ mkdir vas/rest/conf
+ ln -rsf src/vitis/vas/doc vas/doc
+ ln -rsf src/vitis/vas/rest/class vas/rest/class
+ ln -rsf src/vitis/vas/rest/inc vas/rest/inc
+ ln -rsf src/vitis/vas/rest/ws vas/rest/ws
+ ln -rsf src/vitis/vas/rest/index.phtml vas/rest/index.phtml
+ ln -rsf src/vitis/vas/rest/index.vhtml vas/rest/index.vhtml
+ ln -rsf src/vitis/vas/sql vas/sql
+ ln -rsf src/vitis/vas/util vas/util
fi
# Conf
@@ -55,11 +77,11 @@ if [[ $depsCount > 0 ]]; then
ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module}
fi
fi
- if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
- if ! [ -e "src/vitis/vas/rest/conf/${module}" ]; then
- ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
- fi
- fi
+ # if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
+ # if ! [ -e "src/vitis/vas/rest/conf/${module}" ]; then
+ # ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
+ # fi
+ # fi
if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then
if ! [ -e "src/vitis/vas/sql/${module}" ]; then
ln -rsf src/module_${module}/web_service/sql src/vitis/vas/sql/${module}
--
GitLab