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

[Pranav Kant]

 loleaflet/.gitignore |    3 +++
 loleaflet/Makefile   |   16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 5ba6360a8b19073379f404b25771e95b11bbd56e
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Sep 21 13:39:00 2016 +0530

    loleaflet: Factor out generation of .json
    
    ... so that one can use the factored-out rule, build-l10n, to
    install these translation .json files in dist/ and start using
    them, without having to do 'make dist' first and then extract the
    package.
    
    Change-Id: Ie2814a9f2596246b487799968f3027aa48475e7b

diff --git a/loleaflet/.gitignore b/loleaflet/.gitignore
index 4bdf28b..30212c1 100644
--- a/loleaflet/.gitignore
+++ b/loleaflet/.gitignore
@@ -22,3 +22,6 @@ coverage/
 /load_test_out
 /spec/data/load_test
 *.tar.gz
+dist/l10n/ui-*json
+dist/l10n/help-*.json
+dist/l10n/styles/
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 1a4d7e5..0715080 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -21,7 +21,16 @@ build:
 	jake bundle[,$(DEBUG),$(MINIFY)]
 	jake bundle[admin,$(DEBUG),$(MINIFY)]
 
-all: build
+.PHONY: build-l10n
+build-l10n:
+	mkdir -p dist/l10n/styles
+
+	util/po2json.py --quiet po/*.po
+	mv po/*.json dist/l10n/
+	util/po2json.py --quiet po/styles/*.po
+	mv po/styles/*.json dist/l10n/styles/
+
+all: build build-l10n
 
 .PHONY: dist
 dist: MINIFY=true
@@ -29,11 +38,6 @@ dist: all
 	rm -rf loleaflet-$(VERSION)
 	mkdir loleaflet-$(VERSION)
 	cp -ar dist loleaflet-$(VERSION)
-	util/po2json.py --quiet po/*.po
-	mv po/*.json loleaflet-$(VERSION)/dist/l10n
-	util/po2json.py --quiet po/styles/*.po
-	mkdir -p loleaflet-$(VERSION)/dist/l10n/styles/
-	mv po/styles/*.json loleaflet-$(VERSION)/dist/l10n/styles/
 	tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
 	rm -rf loleaflet-$(VERSION)