Commit 655c112d authored by Alexey Golubev's avatar Alexey Golubev

Fixed parallel build

parent 2de28ba9
...@@ -7,8 +7,13 @@ OUTPUT = $(OUTPUT_DIR) ...@@ -7,8 +7,13 @@ OUTPUT = $(OUTPUT_DIR)
WEBAPPS_DIR = web-apps WEBAPPS_DIR = web-apps
WEBAPPS = $(OUTPUT)/$(WEBAPPS_DIR) WEBAPPS = $(OUTPUT)/$(WEBAPPS_DIR)
NODE_MODULES = build/node_modules ../web-apps/build/node_modules NODE_MODULES = build/node_modules ../web-apps/build/node_modules
WEBAPPS_FILES = ../web-apps/deploy/web-apps/apps/documenteditor/main/app.js ../web-apps/deploy/web-apps/apps/presentationeditor/main/app.js ../web-apps/deploy/web-apps/apps/spreadsheeteditor/main/app.js WEBAPPS_FILES += ../web-apps/deploy/web-apps/apps/api/documents/api.js
SDKJS_FILES = word/sdk-all.js cell/sdk-all.js slide/sdk-all.js WEBAPPS_FILES += ../web-apps/deploy/web-apps/apps/documenteditor/main/app.js
WEBAPPS_FILES += ../web-apps/deploy/web-apps/apps/presentationeditor/main/app.js
WEBAPPS_FILES += ../web-apps/deploy/web-apps/apps/spreadsheeteditor/main/app.js
SDKJS_FILES += word/sdk-all.js
SDKJS_FILES += cell/sdk-all.js
SDKJS_FILES += slide/sdk-all.js
all: $(WEBAPPS) all: $(WEBAPPS)
...@@ -18,7 +23,7 @@ $(WEBAPPS): $(WEBAPPS_FILES) ...@@ -18,7 +23,7 @@ $(WEBAPPS): $(WEBAPPS_FILES)
$(WEBAPPS_FILES): $(NODE_MODULES) $(SDKJS_FILES) $(WEBAPPS_FILES): $(NODE_MODULES) $(SDKJS_FILES)
cd ../$(WEBAPPS_DIR)/build && \ cd ../$(WEBAPPS_DIR)/build && \
$(GRUNT) deploy-$(filter %editor,$(subst /, ,$(@D))) $(GRUNT_FLAGS) $(GRUNT) deploy-$(filter %editor documents,$(subst /, ,$(@D)))-component $(GRUNT_FLAGS)
$(NODE_MODULES): $(NODE_MODULES):
cd $(@D) && \ cd $(@D) && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment