diff --git a/.gitignore b/.gitignore index 37badcac6f61764acd079cd5ce173b2cf48e01b4..d8b5d9919508b3efbd1b1fdc1d91adb22b53876d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ 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/ diff --git a/install.sh b/install.sh index b5ceb92ab36c08371f45820bd7101ca44e16108d..532422eb10a41d6bca8c0e5e18317d3319b813e1 100755 --- a/install.sh +++ b/install.sh @@ -11,7 +11,15 @@ if [ `whoami` == "root" ]; then echo "Please, do not run this script as sudo" else cd utils/ - ./init_symlinks.sh + # ./init_symlinks.sh ./pull_subtrees.sh ./copy_hooks.sh + + cd ../conf + npm install grunt --save + npm install grunt-cli + npm install grunt-closure-tools --save + npm install google-closure-compiler@20160911.0.0 --save + npm install google-closure-library@20160911.0.0 --save + grunt fi diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh index f8ba5fc59f9144fa65801add6c1625c77e45371f..c2793f2ee9ad6e0f53da243fb1b6d26dd9baa20b 100755 --- a/utils/pull_subtrees.sh +++ b/utils/pull_subtrees.sh @@ -21,6 +21,7 @@ git subtree pull --prefix src/vitis --squash -m "pull subtree" "git@gitlab.vere # fichiers à ignorer git update-index --assume-unchanged conf/properties.json +git update-index --assume-unchanged conf/package.json git update-index --assume-unchanged src/vitis/vas/rest/.htaccess git update-index --assume-unchanged src/vitis/vas/rest/conf/properties.inc git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_domain.inc