loleaflet/Makefile.am | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 9978c51595bef891a12f5b812aa716ad1637c7fb
Author: Henry Castro <hcas...@collabora.com>
Date: Thu May 24 13:39:21 2018 -0400
loleaflet: lint draw plugins
I forgot to add it, in previous commit
Change-Id: I9fce42d39d07f6d60910e2fc6fec86b78888b9d6
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 980ff833f..9e2638a58 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -137,9 +137,8 @@ $(builddir)/dist/admin-bundle.js: $(LOLEAFLET_ADMIN_DST)
$(BOOTSTRAP_DST) $(CURS
if ENABLE_DEBUG
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST)
$(LOLEAFLET_DRAW_JS_DST)
@echo "Checking loleaflet for JS errors..."
- @NODE_PATH=$(abs_builddir)/node_modules $(NODE)
node_modules/eslint/bin/eslint.js $(srcdir)/src $(srcdir)/js --ignore-path
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
+ @NODE_PATH=$(abs_builddir)/node_modules $(NODE)
node_modules/eslint/bin/eslint.js $(srcdir)/src
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src $(srcdir)/js --ignore-path
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@cp -a $(srcdir)/plugins/draw-$(DRAW_VERSION)/dist/images/*
$(builddir)/dist/images/
-# @$(NODE) node_modules/eslint/bin/eslint.js
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src --ignore-path
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@touch $@
$(builddir)/dist/bundle.css: $(LOLEAFLET_CSS_DST)
@@ -156,7 +155,7 @@ else
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
@mkdir -p $(dir $@)
@echo "Checking loleaflet for JS errors..."
- @NODE_PATH=$(abs_builddir)/node_modules $(NODE)
node_modules/eslint/bin/eslint.js $(srcdir)/src $(srcdir)/js --ignore-path
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
+ @NODE_PATH=$(abs_builddir)/node_modules $(NODE)
node_modules/eslint/bin/eslint.js $(srcdir)/src
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src $(srcdir)/js --ignore-path
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@echo "Concatenating loleaflet files..."
@(cat $(srcdir)/src/copyright.js | sed
's/{VERSION}/$(LOLEAFLET_VERSION)/' - \
&& echo "(function (window, document, undefined) {" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
