From b174f5bbbee6b9df5588394a76bf6fc4dba253bf Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 26 Jul 2021 22:38:34 +0300 Subject: [PATCH] [deploy] copy common resources --- build/Gruntfile.js | 2 ++ build/common.json | 14 ++++++++++++++ build/documenteditor.json | 6 ------ build/presentationeditor.json | 6 ------ build/spreadsheeteditor.json | 6 ------ 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/build/Gruntfile.js b/build/Gruntfile.js index adff92d5e8..b73b3b55ff 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -240,6 +240,7 @@ module.exports = function(grunt) { } } }); + doRegisterTask('apps-common'); doRegisterTask('sockjs'); doRegisterTask('xregexp'); doRegisterTask('megapixel'); @@ -604,6 +605,7 @@ module.exports = function(grunt) { var copyTask = grunt.option('desktop')? "copy": "copy:script"; grunt.registerTask('deploy-api', ['api-init', 'clean', copyTask, 'replace:writeVersion']); + grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy']); grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', copyTask]); grunt.registerTask('deploy-sockjs', ['sockjs-init', 'clean', 'copy']); diff --git a/build/common.json b/build/common.json index ae094a888c..ac73a304ab 100644 --- a/build/common.json +++ b/build/common.json @@ -79,6 +79,19 @@ } } }, + "apps-common": { + "clean": [ + "../deploy/web-apps/apps/common" + ], + "copy": { + "alphabetletters": { + "expand": true, + "cwd": "../apps/common/main/resources/alphabetletters", + "src": "*.json", + "dest": "../deploy/web-apps/apps/common/main/resources/alphabetletters" + } + } + }, "bootstrap": { "clean": [ "../deploy/web-apps/vendor/bootstrap" @@ -231,6 +244,7 @@ "deploy": [ "increment-build", "deploy-api", + "deploy-apps-common", "deploy-sdk", "deploy-sockjs", "deploy-xregexp", diff --git a/build/documenteditor.json b/build/documenteditor.json index b53481e283..9f20bf075e 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -157,12 +157,6 @@ "src": "*", "dest": "../deploy/web-apps/apps/documenteditor/main/resources/watermark" }, - { - "expand": true, - "cwd": "../apps/common/main/resources/alphabetletters", - "src": "*.json", - "dest": "../deploy/web-apps/apps/documenteditor/main/resources/alphabetletters" - }, { "expand": true, "cwd": "../apps/common/main/resources/symboltable", diff --git a/build/presentationeditor.json b/build/presentationeditor.json index 8d7a67e491..9e5961a4aa 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -151,12 +151,6 @@ "src": "*", "dest": "../deploy/web-apps/apps/presentationeditor/main/locale/" }, - { - "expand": true, - "cwd": "../apps/common/main/resources/alphabetletters", - "src": "*.json", - "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/alphabetletters" - }, { "expand": true, "cwd": "../apps/common/main/resources/symboltable", diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 4de4b4bae7..784cea7d40 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -165,12 +165,6 @@ "src": "*", "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/formula-lang" }, - { - "expand": true, - "cwd": "../apps/common/main/resources/alphabetletters", - "src": "*.json", - "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/alphabetletters" - }, { "expand": true, "cwd": "../apps/common/main/resources/symboltable",