loleaflet/Makefile.am | 10 +++-------
loleaflet/build/deps.js | 4 ++++
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 315fc0b3e8d4ccd968984d15e5913600316add99
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Mar 11 16:53:39 2019 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Mon Mar 11 17:30:07 2019 -0400
loleaflet: move main.js to src/ directory
Simplify building loleaflet.
Change-Id: I3cdc6455b21e683b0331997766badd606c6aca43
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index e64869516..00953227f 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -308,8 +308,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(builddir)/dist/global.js \
$(builddir)/dist/jquery.mCustomScrollbar.js \
- $(builddir)/dist/w2ui-1.5.rc1.js \
- $(builddir)/dist/main.js
+ $(builddir)/dist/w2ui-1.5.rc1.js
@touch $@
else
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
@@ -335,8 +334,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(builddir)/dist/global.js \
$(srcdir)/js/jquery.mCustomScrollbar.js \
- $(srcdir)/js/w2ui-1.5.rc1.js \
- $(srcdir)/js/main.js
+ $(srcdir)/js/w2ui-1.5.rc1.js
@echo "Uglify loleaflet js files..."
NODE_PATH=$(abs_builddir)/node_modules $(NODE)
node_modules/uglify-js/bin/uglifyjs \
$(L10N_IOS_ALL_JS) \
@@ -344,7 +342,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.js \
$(builddir)/build/dist/loleaflet-src.js \
- $(srcdir)/js/main.js \
--output $@
endif
@@ -362,8 +359,7 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \
jquery.mCustomScrollbar.js \
w2ui-1.5.rc1.js \
- $(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
- main.js)" \
+ $(call LOLEAFLET_JS,$(srcdir)/build/build.js))" \
$(srcdir)/html/loleaflet.html.m4 > $@
node_modules: npm-shrinkwrap.json
diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index c1247ab54..88f60116f 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -499,6 +499,10 @@ var deps = {
DivOverlay: {
src: ['layer/marker/DivOverlay.js'],
desc: 'Div overlay to put on the map.'
+ },
+
+ Main: {
+ src: ['main.js']
}
};
diff --git a/loleaflet/js/main.js b/loleaflet/src/main.js
similarity index 100%
rename from loleaflet/js/main.js
rename to loleaflet/src/main.js
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
