Skip to content
Snippets Groups Projects
Commit b1438204 authored by Armand Bahi's avatar Armand Bahi
Browse files

update app template

parent c5717edc
Branches
Tags
No related merge requests found
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/
......
......@@ -3,7 +3,13 @@ module.exports = function (grunt) {
var compilerPackage = require('google-closure-compiler');
compilerPackage.grunt(grunt);
var devMode = grunt.option('dev');
var sHome = '../';
if (devMode) {
sHome = '../client/';
}
var sClosureDepsHome = '../../../../../';
// Project configuration.
......@@ -11,7 +17,7 @@ module.exports = function (grunt) {
'closure-compiler': {
GTF: {
files: {
'../javascript/gtf.min.js': [
[sHome + '/javascript/gtf.min.js']: [
// Fichiers Vitis
sHome + 'javascript/require/*.js',
sHome + 'javascript/app/**/*.js',
......@@ -51,13 +57,13 @@ module.exports = function (grunt) {
language_in: 'ECMASCRIPT5',
language_out: 'ECMASCRIPT5',
closure_entry_point: ['vitis.gtf', 'vitis', 'oVFB'],
create_source_map: '../javascript/gtf.min.js.map',
create_source_map: sHome + '/javascript/gtf.min.js.map',
output_wrapper: '(function(){\n%output%\n}).call(this)\n//# sourceMappingURL=../javascript/gtf.min.js.map'
}
},
widget: {
files: {
'../javascript/widget.min.js': [
[sHome + '/javascript/widget.min.js']: [
// Fichiers Vitis
sHome + 'modules/gtf/javascript/widget/deps.js',
sHome + 'javascript/app/app.js',
......@@ -100,7 +106,7 @@ module.exports = function (grunt) {
language_in: 'ECMASCRIPT5',
language_out: 'ECMASCRIPT5',
closure_entry_point: ['vitis.gtf.widget', 'vitis'],
create_source_map: '../javascript/widget.min.js.map',
create_source_map: sHome + '/javascript/widget.min.js.map',
output_wrapper: '(function(){\n%output%\n}).call(this)\n//# sourceMappingURL=../javascript/widget.min.js.map'
}
}
......@@ -127,7 +133,7 @@ module.exports = function (grunt) {
]
},
targetName: {
dest: '../javascript/gtf.deps.js'
dest: sHome + '/javascript/gtf.deps.js'
}
}
});
......
......@@ -94,6 +94,7 @@ if [[ $depsCount > 0 ]]; then
if [ -d "${APP_EXISTING_PATH}/$folder_path" ]; then
echo "copy $folder_path"
cp -Rf "${APP_EXISTING_PATH}/$folder_path" "$(pwd)/$folder_path"
chmod 777 -R "$(pwd)/$folder_path"
fi
done
......
......@@ -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
......
......@@ -26,7 +26,12 @@ if [[ $depsCount > 0 ]]; then
echo "---- Push ${aDeps[$i, name]} ----"
# Push le dépôt
{ # 'try' block
git subtree push --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master
} || { # 'catch' block
echo "could not push ${aDeps[$i, name]}"
}
fi
done
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment