loleaflet/Makefile.am | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 7a0386c189bda122e704b77e95ca21463d322d5f
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Fri Nov 10 11:30:06 2017 +0530
Copy jquery-ui image files to dist/ during normal make
No need of dist-hook now to do the same. The good thing is that now
these images will also be available to a developer which was earlier not
possible without manually copying the files left & right. This means no
more annoying errors in developer's browser console.
Change-Id: Ie180720086feace00b61891f56ee3532f5f9df7b
(cherry picked from commit 66556c1668f2b8e11b28faffc62ee269e53d19dd)
Reviewed-on: https://gerrit.libreoffice.org/49014
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 9b34f78d..cebcebe0 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -14,9 +14,13 @@ L10N_JSON = $(patsubst po/%.po,dist/l10n/%.json,$(L10N_PO))
L10N_STYLES_PO = $(wildcard po/styles/*.po)
L10N_STYLES_JSON = $(patsubst
po/styles/%.po,dist/l10n/styles/%.json,$(L10N_STYLES_PO))
+JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
+JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
+JQUERY_UI_DIST_IMAGES = $(patsubst
$(JQUERY_UI_IMAGE_PATH)/%.png,dist/$(JQUERY_UI_IMAGE_PATH)/%.png,$(JQUERY_UI_IMAGES))
+
EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
-all-local: node_modules $(L10N_JSON) $(L10N_STYLES_JSON)
+all-local: node_modules $(L10N_JSON) $(L10N_STYLES_JSON)
$(JQUERY_UI_DIST_IMAGES)
rm -rf dist/plugins/draw-$(DRAW_VERSION) || true
mkdir -p dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist
../../dist/plugins/draw-$(DRAW_VERSION)
@@ -26,6 +30,10 @@ node_modules: npm-shrinkwrap.json
npm install
touch node_modules
+dist/$(JQUERY_UI_IMAGE_PATH)/%.png: $(JQUERY_UI_IMAGE_PATH)/%.png
+ mkdir -p dist/$(JQUERY_UI_IMAGE_PATH)
+ cp -a $(JQUERY_UI_IMAGE_PATH)/* dist/$(JQUERY_UI_IMAGE_PATH)/
+
dist/l10n/%.json: po/%.po
@util/po2json.py $< -o $@
@@ -36,12 +44,6 @@ install-data-hook:
mkdir -p $(DESTDIR)$(pkgdatadir)/loleaflet; \
cp -ar dist/ $(DESTDIR)$(pkgdatadir)/loleaflet/;
-dist-hook:
- chmod u+w $(distdir)/dist
-
- mkdir -p
$(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
- cp -a
"node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png"
$(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
-
pot:
xgettext --from-code=UTF-8 --keyword=_
--output=po/templates/loleaflet-ui.pot \
admin.strings.js \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
