From f318d9fbc403f44d22164cdbf2e7fed79f3f0555 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Thu, 25 Jan 2018 16:48:40 +0300 Subject: [PATCH 1/2] fix multi-thread building --- apps/documenteditor/main/index.html.deploy | 2 +- apps/presentationeditor/main/index.html.deploy | 2 +- apps/spreadsheeteditor/main/index.html.deploy | 2 +- build/documenteditor.json | 2 +- build/presentationeditor.json | 2 +- build/spreadsheeteditor.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 4e8d56999..e0cb3f975 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -282,7 +282,7 @@ }; - +
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 8ddfe9f80..fe3ba2df8 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -282,7 +282,7 @@ }; - +
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index bf64e4594..32cfb6356 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -281,7 +281,7 @@ }; - +
diff --git a/build/documenteditor.json b/build/documenteditor.json index cf848dd71..a0437b70c 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -171,7 +171,7 @@ "expand": true, "cwd": "../apps/common/main/resources/img", "src": "**/*.svg", - "dest": "../deploy/web-apps/apps/common/main/resources/img" + "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img" } ], "clean": [ diff --git a/build/presentationeditor.json b/build/presentationeditor.json index b929b26d8..4d4d69398 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -171,7 +171,7 @@ "expand": true, "cwd": "../apps/common/main/resources/img", "src": "**/*.svg", - "dest": "../deploy/web-apps/apps/common/main/resources/img" + "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img" } ], "clean": [ diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 9f3bef6c4..c9b26a804 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -185,7 +185,7 @@ "expand": true, "cwd": "../apps/common/main/resources/img", "src": "**/*.svg", - "dest": "../deploy/web-apps/apps/common/main/resources/img" + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img" } ], "clean": [ From c2d4d22640d7a902c76419c7f2ff4d2b2035b7dc Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Thu, 25 Jan 2018 17:31:52 +0300 Subject: [PATCH 2/2] remove substituted svg --- build/documenteditor.json | 2 +- build/presentationeditor.json | 2 +- build/spreadsheeteditor.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/documenteditor.json b/build/documenteditor.json index a0437b70c..f1af2278e 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -175,7 +175,7 @@ } ], "clean": [ - "../deploy/web-apps/apps/common" + "../deploy/web-apps/apps/documenteditor/main/resources/img/**/*.svg" ] } }, diff --git a/build/presentationeditor.json b/build/presentationeditor.json index 4d4d69398..2cda41c26 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -175,7 +175,7 @@ } ], "clean": [ - "../deploy/web-apps/apps/common" + "../deploy/web-apps/apps/presentationeditor/main/resources/img/**/*.svg" ] }, "reporter": { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index c9b26a804..660f25856 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -189,7 +189,7 @@ } ], "clean": [ - "../deploy/web-apps/apps/common" + "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/**/*.svg" ] } },