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

[Andras Timar]

 loleaflet/Makefile            |   11 +++--------
 loleaflet/dist/loleaflet.html |    4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 07b68b37a9c7b971f8dc73dab7b0037c96d5a396
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Apr 13 16:55:05 2016 +0200

    loleaflet: put everything we use to dist/ and package only dist/

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 61799b0..f12d273 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -16,14 +16,9 @@ all:
 .PHONY: dist
 dist: all
 	rm -rf loleaflet-$(VERSION)
-	mkdir loleaflet-$(VERSION)
-	cp README loleaflet-$(VERSION)
-	cp reference.html loleaflet-$(VERSION)
-	tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document docs spec \
-		node_modules/mocha/mocha.css \
-		node_modules/mocha/mocha.js \
-		node_modules/happen/happen.js \
-		| (cd loleaflet-$(VERSION) && tar xf -)
+	mkdir -p loleaflet-$(VERSION)/dist/plugins/draw-$(DRAW_VERSION)
+	cp -ar dist loleaflet-$(VERSION)
+	cp -ar plugins/draw-$(DRAW_VERSION)/dist loleaflet-$(VERSION)/dist/plugins/draw-$(DRAW_VERSION)
 	util/po2json.py po/*.po
 	mv po/*.json loleaflet-$(VERSION)/dist/l10n
 	util/po2json.py po/styles/*.po
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 38e60a8..c8f442b 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -15,7 +15,7 @@
 <link rel="stylesheet" href="/loleaflet/dist/searchControl.css">
 <link rel="stylesheet" href="/loleaflet/dist/spreadsheet.css">
 <link rel="stylesheet" href="/loleaflet/dist/branding.css"> <!-- add your logo here -->
-<link rel="stylesheet" href="/loleaflet/plugins/draw-0.2.4/dist/leaflet.draw.css">
+<link rel="stylesheet" href="/loleaflet/dist/plugins/draw-0.2.4/dist/leaflet.draw.css">
 <link rel="stylesheet" href="/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.css">
 <link rel="stylesheet" href="/loleaflet/dist/contextMenu/jquery.contextMenu.css">
 <link rel="stylesheet" href="/loleaflet/dist/dialog/vex.css" />
@@ -37,7 +37,7 @@
     <script src="/loleaflet/dist/toolbar/evol.colorpicker.min.js"></script>
     <script src="/loleaflet/dist/toolbar/jquery.simplemodal.1.4.4.min.js"></script>
     <script src="/loleaflet/dist/leaflet-src.js"></script>
-    <script src="/loleaflet/plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
+    <script src="/loleaflet/dist/plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
     <script src="/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.js"></script>
     <script src="/loleaflet/dist/contextMenu/jquery.contextMenu.js"></script>
     <script src="/loleaflet/dist/contextMenu/jquery.ui.position.min.js"></script>