[Libreoffice-commits] online.git: loleaflet/Makefile.am

[Jan Holesovsky (via logerrit)]

 loleaflet/Makefile.am |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

New commits:
commit d91e5cd682afbbf26170c5a8d7b731dd03328842
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Jun 24 22:23:50 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Jun 25 09:41:28 2020 +0200

    Fix dependencies of the TypeScript file.
    
    The assumption is that the amount of TS files will grow; so move away
    from a generic 'tsc' call that is supposed to walk through the tree with
    exact calling that for the files that have been changed.
    
    This should hopefully finally sort out the Jenkins problems with
    ModalDialogCreator.tsj
    
    Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 9d9c991e6..762c2079a 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -6,6 +6,7 @@ BUNDLE ?= $(if $(filter true,$(ENABLE_DEBUG)),DEBUG,RELEASE)
 IS_DEBUG = $(if $(filter DEBUG,$(BUNDLE)),true,)
 
 DIST_FOLDER ?= $(builddir)/dist
+TYPESCRIPT_JS_DIR = $(builddir)/typescript_js
 
 export NODE_PATH=$(abs_builddir)/node_module
 
@@ -82,7 +83,13 @@ define npm_source
 	done
 endef
 
+LOLEAFLET_ADMIN_TS =\
+	admin/src/ModalDialogCreator.ts
+
+LOLEAFLET_ADMIN_TS_JS = $(patsubst %.ts,$(TYPESCRIPT_JS_DIR)/%.js,$(LOLEAFLET_ADMIN_TS))
+
 LOLEAFLET_ADMIN_JS =\
+	$(LOLEAFLET_ADMIN_TS_JS) \
 	admin/src/Base.js \
 	admin/src/Admin.js \
 	admin/src/AdminSocketBase.js \
@@ -91,8 +98,7 @@ LOLEAFLET_ADMIN_JS =\
 	admin/src/AdminSocketAnalytics.js \
 	admin/src/AdminSocketSettings.js \
 	admin/src/AdminSocketHistory.js \
-	admin/src/AdminSocketLog.js \
-	admin/src/ModalDialogCreator.js
+	admin/src/AdminSocketLog.js
 
 NODE_MODULES_SRC =\
 	autolinker at 3.14.1 \
@@ -388,11 +394,11 @@ if !ENABLE_MOBILEAPP
 ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
 endif
 
-compilets:
-	$(srcdir)/node_modules/typescript/bin/tsc
-	@touch $@
+$(TYPESCRIPT_JS_DIR)/%.js: $(srcdir)/%.ts
+	@mkdir -p $(dir $@)
+	$(srcdir)/node_modules/typescript/bin/tsc --outFile $@ $<
 
-build-loleaflet: compilets \
+build-loleaflet: \
 	$(LOLEAFLET_L10N_DST) \
 	$(L10N_JSON) \
 	$(LOLEAFLET_IMAGES_DST) \
@@ -419,13 +425,13 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
 	$(INTERMEDIATE_DIR)/admin-src.js
 	@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if $(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
 
-$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL) compilets
+$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_JS)
 	@mkdir -p $(dir $@)
 	@echo "Checking for admin JS errors..."
 	@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
 	@awk 'FNR == 1 {print ""} 1' $(patsubst %.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
 
-$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet) compilets
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
 	@mkdir -p $(dir $@)
 	$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
 	@echo "Checking for loleaflet JS errors..."