strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
libreoffice-online/loleaflet/Makefile.am

676 lines
22 KiB
Text
Raw Normal View History

loleaflet: makefile: no built-in rules It is not needed to build loleaflet Change-Id: I2eb0ed999a0463b3f69e98a6a450961a7e6723d0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93168 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-29 07:14:16 -05:00
MAKEFLAGS = --no-builtin-rules
makefile: generate an index (ctag) file for the JavaScript language Change-Id: I495c7665786a47cfb007260368084a01c4163ea7 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/85766 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Henry Castro <hcastro@collabora.com>
2019-12-23 11:59:16 -06:00
CTAGS = ctags
Add a Makefile to create a tarball Not sure whether this makes sense, but for now...
2015-05-19 06:29:55 -05:00
Revert "configure:L10n: compile message catalog to binary format" This reverts commit 59241a2ea467992adadbacae00a15ec7fe0de2d9.
2019-03-15 11:27:27 -05:00
L10N_PO = $(wildcard $(srcdir)/po/*.po)
loleaflet: makefile: replace ENABLE_DEBUG var Now, it does not depend on ./configure script it is configurable to set BUNDLE=DEBUG or RELEASE (i.e. Android platform) Change-Id: Id43f156a05ea22f74334e7fdbe60d53b8b5a2891 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94982 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 10:31:03 -05:00
BUNDLE ?= $(if $(filter true,$(ENABLE_DEBUG)),DEBUG,RELEASE)
IS_DEBUG = $(if $(filter DEBUG,$(BUNDLE)),true,)
Revert "configure:L10n: compile message catalog to binary format" This reverts commit 59241a2ea467992adadbacae00a15ec7fe0de2d9.
2019-03-15 11:27:27 -05:00
android: generate debug and release loleaflet assets Change-Id: If3659de771b3d1f7015c1e4c26d6877f90afe306 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94996 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 11:43:29 -05:00
DIST_FOLDER ?= $(builddir)/dist
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
TYPESCRIPT_JS_DIR = $(builddir)/typescript_js
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
loleaflet: makefile: simplify NODE_PATH var Change-Id: I96a221f92aa2d3785cc6c83add84fc37680a6183 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94860 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 07:36:34 -05:00
export NODE_PATH=$(abs_builddir)/node_module
Revert "configure:L10n: compile message catalog to binary format" This reverts commit 59241a2ea467992adadbacae00a15ec7fe0de2d9.
2019-03-15 11:27:27 -05:00
if !ENABLE_MOBILEAPP
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
L10N_JSON = $(patsubst $(srcdir)/po/%.po,$(DIST_FOLDER)/l10n/%.json,$(L10N_PO))
android: Make the localization work for the JS pieces. To have the menu translated. Change-Id: I8d4d90d260aa3fcd80a8eb68515b22c58c9b3e18 Reviewed-on: https://gerrit.libreoffice.org/84931 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-12-11 04:46:52 -06:00
else
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
L10N_IOS_ALL_JS = $(DIST_FOLDER)/l10n-all.js
Revert "Try to make l10n work again in the iOS app" This reverts commit 318efba0533487f7fc19f06f6341ca44228e3771.
2019-03-15 11:23:28 -05:00
L10N_JSON = $(L10N_IOS_ALL_JS)
Make l10n of the messages from our JS code work in the mobile app The l10n-for-node code does not work in the app. Instead of loading the required JSON files at run-time, include all those translations that seem complete enough as JavaScript code in the bundle.js. Use a manaully curated list of translations, in a Perl script that generates the JavaScript code in question. Change-Id: I45d5cda477140ee63bb3fc8d9f1f4260bcdb97a7
2018-11-09 14:28:46 -06:00
android: Make the localization work for the JS pieces. To have the menu translated. Change-Id: I8d4d90d260aa3fcd80a8eb68515b22c58c9b3e18 Reviewed-on: https://gerrit.libreoffice.org/84931 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-12-11 04:46:52 -06:00
$(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) $(shell find $(srcdir)/l10n -name '*.*') $(srcdir)/util/create-l10n-all-js.pl
Make l10n of the messages from our JS code work in the mobile app The l10n-for-node code does not work in the app. Instead of loading the required JSON files at run-time, include all those translations that seem complete enough as JavaScript code in the bundle.js. Use a manaully curated list of translations, in a Perl script that generates the JavaScript code in question. Change-Id: I45d5cda477140ee63bb3fc8d9f1f4260bcdb97a7
2018-11-09 14:28:46 -06:00
for F in $(wildcard $(srcdir)/po/ui-*.po); do \
$(srcdir)/util/po2json.py $$F -o $$F.json; \
done
@mkdir -p $(dir $@)
perl $(srcdir)/util/create-l10n-all-js.pl >$@
for F in $(wildcard $(srcdir)/po/ui-*.po); do \
rm $$F.json; \
done
endif
Generate the l10n json files only when the appropriate po's change. Change-Id: I17c0f022775ec631e6493ba81fa41752f6841188
2017-05-05 04:18:26 -05:00
leaflet: update jquery-ui package with lightness them. Change-Id: I8273c2f7d8b46f63f582c11c2c0e81c303e04bcb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95352 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-02 04:46:39 -05:00
JQUERY_LIGHTNESS_IMAGE_PATH = $(srcdir)/images/jquery-ui-lightness
Actually, let's ship both these jQuery themes. Change-Id: I3e546e155d50fb280fe12c31b8c33523ac8e9f11
2019-01-10 05:34:43 -06:00
JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png)
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst $(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_LIGHTNESS_IMAGES))
Actually, let's ship both these jQuery themes. Change-Id: I3e546e155d50fb280fe12c31b8c33523ac8e9f11
2019-01-10 05:34:43 -06:00
leaflet: update jquery-ui package with lightness them. Change-Id: I8273c2f7d8b46f63f582c11c2c0e81c303e04bcb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95352 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-02 04:46:39 -05:00
JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui-dist/images
Actually, let's ship both these jQuery themes. Change-Id: I3e546e155d50fb280fe12c31b8c33523ac8e9f11
2019-01-10 05:34:43 -06:00
JQUERY_MINIFIED_IMAGES = $(wildcard $(JQUERY_MINIFIED_IMAGE_PATH)/*.png)
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
JQUERY_MINIFIED_DIST_IMAGES = $(patsubst $(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_MINIFIED_IMAGES))
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
loleaflet: move cursors to images directory Change-Id: Iea2f5753da022fec70d17fd325764cc46b371483
2018-05-24 13:44:04 -05:00
LOLEAFLET_IMAGES_SRC = $(shell find $(srcdir)/images -name '*.*')
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_IMAGES_DST = $(patsubst $(srcdir)/%,$(DIST_FOLDER)/%,$(LOLEAFLET_IMAGES_SRC))
configure: Add support for custom icons Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 Reviewed-on: https://gerrit.libreoffice.org/74491 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-06-21 03:43:53 -05:00
LOLEAFLET_IMAGES_CUSTOM_SRC = $(shell find $(CUSTOM_ICONS_DIRECTORY) -name '*.*')
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_IMAGES_CUSTOM_DST = $(patsubst $(CUSTOM_ICONS_DIRECTORY)/%,$(DIST_FOLDER)/images/%,$(LOLEAFLET_IMAGES_CUSTOM_SRC))
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
Revert "loleaflet: remove client side L10n" This reverts commit c9685387b9fb639ab9d31fa0619cb0beab430e8a. Change-Id: Ie11c04ffad8260c3c1d6357f18dd9f2a42912859
2019-03-15 11:25:41 -05:00
LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*')
android: Make the localization work for the JS pieces. To have the menu translated. Change-Id: I8d4d90d260aa3fcd80a8eb68515b22c58c9b3e18 Reviewed-on: https://gerrit.libreoffice.org/84931 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-12-11 04:46:52 -06:00
if !ENABLE_MOBILEAPP
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_L10N_DST = $(patsubst $(srcdir)/l10n/%,$(DIST_FOLDER)/l10n/%,$(LOLEAFLET_L10N_SRC))
Revert "loleaflet: remove client side L10n" This reverts commit c9685387b9fb639ab9d31fa0619cb0beab430e8a. Change-Id: Ie11c04ffad8260c3c1d6357f18dd9f2a42912859
2019-03-15 11:25:41 -05:00
endif
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
LOLEAFLET_HTML_SRC = $(shell find $(srcdir)/html -name '*.html')
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_HTML_DST = $(patsubst $(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(LOLEAFLET_HTML_SRC))
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
install the optional welcome text Change-Id: Ic3096110cab7068d7963056fab1002db4fc8451e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94970 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-27 07:20:43 -05:00
LOLEAFLET_WELCOME_SRC = $(shell find $(srcdir)/welcome -name '*.html')
LOLEAFLET_WELCOME_DST = $(patsubst $(srcdir)/welcome/%.html,$(DIST_FOLDER)/welcome/%.html,$(LOLEAFLET_WELCOME_SRC))
leaflet: Update admin console & drop bootstrap package. Change-Id: I9243393693c2464f2e9a4d24cccf9c5f3415e2ef Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95468 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-03 17:36:46 -05:00
LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html' -or -name '*.css' -or -name '*.ttf' -or -name 'OFL.txt')
loleaflet: add rule to bundle admin files Change-Id: Id3d25855d697ad607ae30ffffa1a9c6f565b6e6d
2018-05-26 15:57:40 -05:00
LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_ADMIN_DST = $(patsubst $(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLEAFLET_ADMIN_SRC))
loleaflet: fix build in admin files Change-Id: I0e96b18e6319ce0d4456c16f0fce008e4e4c4966
2018-05-10 12:41:37 -05:00
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
define file_target
$(1): $(2)
loleaflet: makefile: simplify bundling CSS So it can be flexible to bundle Debug or Release Change-Id: I02bb653d7ead2e3d2e72bca8911efe2573885af4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94910 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 17:00:51 -05:00
@mkdir -p $$(dir $$@)
Integrate browser-sync Tool to automatically reload used .css and .js files. To make it work symlinks are created instead of a copy if browsersync is enabled. 1. install: npm install -g browser-sync 2. use configure option: --enable-browsersync 3. remove loleaflet/dist directory 4. run server: LOOL_SERVE_FROM_FS=1 make run -j10 5. run browsersync: browser-sync start --config browsersync-config.js or make sync-writer Change-Id: Iebee1cc0b9a03bc866954ff33e3cb8a10b48e0af
2019-02-12 04:47:24 -06:00
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
`cp $$< $$@`; \
else \
`ln -sf ../$$< $$@`; \
fi
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
endef
define file_targets
$(foreach file,$(1),$(call file_target,\
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/$(notdir $(file)),\
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(file)))
endef
loleaflet: import l10n.js library The file was imported from node_modules/l10n-for-node/l10n.js, the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs Change-Id: I7bd4d400c504f57a94566e187c6d26361aed8bd0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89043 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 08:17:31 -06:00
define npm_source
for package in $(1); do \
npm pack $${package}; \
fname=$$(ls *.tgz); \
pdir=$${fname%%.tgz}; \
mkdir -p $${pdir}; \
tar -xzf $${fname} -C $${pdir} --strip-components=1; \
rm $${fname}; \
done
endef
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
LOLEAFLET_ADMIN_TS =\
admin/src/ModalDialogCreator.ts
LOLEAFLET_ADMIN_TS_JS = $(patsubst %.ts,$(TYPESCRIPT_JS_DIR)/%.js,$(LOLEAFLET_ADMIN_TS))
loleaflet: makefile: do not execute javascript to get admin files Change-Id: I84f3128499f038691abc762adec50c32f103b9f9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90448 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-03-12 15:37:06 -05:00
LOLEAFLET_ADMIN_JS =\
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
$(LOLEAFLET_ADMIN_TS_JS) \
loleaflet: makefile: do not execute javascript to get admin files Change-Id: I84f3128499f038691abc762adec50c32f103b9f9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90448 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-03-12 15:37:06 -05:00
admin/src/Base.js \
admin/src/Admin.js \
admin/src/AdminSocketBase.js \
admin/src/Util.js \
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketAnalytics.js \
admin/src/AdminSocketSettings.js \
tdf#114982 - AdminConsole: control logging Change-Id: I53cf4b0ff81ea9d6bf4ad595077f7365e7e34c00 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94130 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-05-13 08:40:05 -05:00
admin/src/AdminSocketHistory.js \
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
admin/src/AdminSocketLog.js
loleaflet: makefile: do not execute javascript to get admin files Change-Id: I84f3128499f038691abc762adec50c32f103b9f9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90448 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-03-12 15:37:06 -05:00
loleaflet: import l10n.js library The file was imported from node_modules/l10n-for-node/l10n.js, the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs Change-Id: I7bd4d400c504f57a94566e187c6d26361aed8bd0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89043 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 08:17:31 -06:00
NODE_MODULES_SRC =\
update autolinker package. Change-Id: I53c642763212d958fb0a860fcfbd8f4bbe7b37ff Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95166 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-29 14:52:50 -05:00
autolinker@3.14.1 \
loleaflet: import json2.js library The file was imported from node_modules/json-js/json2.js the main reason is to analyze the source code, debug and patch if necessary To get the source code from npm repository make libs Change-Id: I7d80646704b368f6961c75f1dabaabecde2527e6 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89146 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-20 10:04:32 -06:00
json-js@1.1.2 \
update select2 package. Change-Id: I8ff53d838e80011f110bd427e26adcd372d9a2fb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95217 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-01 02:27:28 -05:00
select2@4.0.13 \
loleaflet: import vex.combined.js library The file was imported from node_modules/vex-js/dist/js/vex.combined.js the main reason is to analyze the source code, debug and patch if necessary To get the source code from npm repository make libs Change-Id: I59e466e925d43bf4c599305898c656f69ec195d9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89099 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-20 06:25:27 -06:00
vex-js@4.1.0 \
l10n-for-node@0.0.1 \
update sanitize-url package Change-Id: I4cc68a010f54afc02777c140b28e41c07a0011fe Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95158 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-29 10:26:47 -05:00
@braintree/sanitize-url@4.0.1
loleaflet: import l10n.js library The file was imported from node_modules/l10n-for-node/l10n.js, the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs Change-Id: I7bd4d400c504f57a94566e187c6d26361aed8bd0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89043 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 08:17:31 -06:00
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
LOLEAFLET_CSS =\
loleaflet: fix select tag drop-down list Change-Id: I2350ff8a0e17ca9b2709460e3ed333a64d2c76e4
2018-09-02 09:28:52 -05:00
$(builddir)/node_modules/select2/dist/css/select2.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(srcdir)/css/w2ui-1.5.rc1.css \
$(srcdir)/css/leaflet.css \
loleaflet: optimize slideshow spinner This commit fixes 2 issues: - a UX issue described by tdf#124544 (slideshow spinner is not displayed for the correct duration - user shown a blank screen while the browser downloads slideshow.svg) - an additional HTTP request is being made to loading.html just to display an ordinary spinner (that can be otherwise loaded via css for example) tdf#124544 Change-Id: I90d1e73d1514d736dd58a53caa5921b42bc1bd75 Reviewed-on: https://gerrit.libreoffice.org/70250 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-04-04 05:57:23 -05:00
$(srcdir)/css/leaflet-spinner.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(srcdir)/css/selectionMarkers.css \
$(srcdir)/css/loleaflet.css \
$(srcdir)/css/toolbar.css \
Split css files - added empty files Change-Id: I67863622d37e350e8a5eafa4cd5f65ec4a2baed3
2019-10-16 05:34:54 -05:00
$(srcdir)/css/toolbar-mobile.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(srcdir)/css/partsPreviewControl.css \
loleaflet: add sidebar (cherry picked from commit 01c828c911fa70b263fee699efbc656fde54d03f) Change-Id: Idc215e67b21b1f0ba48b3d391041278dd6526cfe
2018-08-12 21:05:45 -05:00
$(srcdir)/css/sidebar.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(srcdir)/css/scrollBar.css \
$(srcdir)/css/searchControl.css \
Split css files - added empty files Change-Id: I67863622d37e350e8a5eafa4cd5f65ec4a2baed3
2019-10-16 05:34:54 -05:00
$(srcdir)/css/impress.css \
$(srcdir)/css/impress-mobile.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(srcdir)/css/spreadsheet.css \
Split css files - added empty files Change-Id: I67863622d37e350e8a5eafa4cd5f65ec4a2baed3
2019-10-16 05:34:54 -05:00
$(srcdir)/css/writer.css \
$(srcdir)/css/writer-mobile.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(srcdir)/css/editor.css \
Move the malihu-custom-scrollbar-plugin js and css into our tree for hacking I plan to add some hacks into it to fix the horrible jumping around after touch-based interaction, specifically for the iOS app. Change-Id: Ia6cfbfe7f487b52ba7652e49eb3fdb59af0c82ae
2018-11-15 09:25:08 -06:00
$(srcdir)/css/jquery.mCustomScrollbar.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(builddir)/node_modules/jquery-contextmenu/dist/jquery.contextMenu.css \
loleaflet: update vex.js library Change-Id: I6b32c6a60a27aa27eb32784bb73e40c979f67def Reviewed-on: https://gerrit.libreoffice.org/71726 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-03 04:41:39 -05:00
$(builddir)/node_modules/vex-js/dist/css/vex.css \
$(builddir)/node_modules/vex-js/dist/css/vex-theme-plain.css \
$(builddir)/node_modules/vex-js/dist/css/vex-theme-bottom-right-corner.css \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(builddir)/node_modules/smartmenus/dist/css/sm-core-css.css \
$(builddir)/node_modules/smartmenus/dist/css/sm-simple/sm-simple.css \
Revert "loleaflet: remove jquery-ui.js" This is needed for the functionality of the dialogs. This reverts commit e81441f63bb19981fa5a47b0fd251a91a8b98c1f.
2019-03-20 03:44:39 -05:00
$(srcdir)/css/menubar.css \
Use mobilewizard.css also Change-Id: I6d8667f30e6ed35ee930f50ae247fd6522f5d251
2019-10-16 10:40:53 -05:00
$(srcdir)/css/mobilewizard.css \
jsdialog: style word count dialog Change-Id: Ibffe28ddecbbcfcf01aac6e5a112c34134668633 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94692 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-05-22 08:48:57 -05:00
$(srcdir)/css/jsdialogs.css \
notebookbar: add stylesheet Change-Id: Ide159a6df5e9c3ffa9d64fc88b78f3902a991836 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93255 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-22 06:11:29 -05:00
$(srcdir)/css/notebookbar.css \
Split css files - added empty files Change-Id: I67863622d37e350e8a5eafa4cd5f65ec4a2baed3
2019-10-16 05:34:54 -05:00
$(srcdir)/css/vex.css \
leaflet: update jquery-ui package with lightness them. Change-Id: I8273c2f7d8b46f63f582c11c2c0e81c303e04bcb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95352 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-02 04:46:39 -05:00
$(srcdir)/css/jquery-ui-lightness.css
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(DIST_FOLDER)/$(notdir $(file)))
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file))))
$(eval $(call file_targets,$(LOLEAFLET_CSS)))
NODE_MODULES_JS =\
loleaflet: makefile: replace ENABLE_DEBUG var Now, it does not depend on ./configure script it is configurable to set BUNDLE=DEBUG or RELEASE (i.e. Android platform) Change-Id: Id43f156a05ea22f74334e7fdbe60d53b8b5a2891 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94982 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 10:31:03 -05:00
$(if $(IS_DEBUG),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js) \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
node_modules/jquery/dist/jquery.js \
node_modules/jquery-mousewheel/jquery.mousewheel.js \
Revert "loleaflet: move jquery.contextMenu.js to loleaflet/js" This is no longer required because d6fe8ff0856170d922d29dbb869496dd24aab233 This reverts commit 2ea141c02f48d5ec82f69691ef045c7c036f0752.
2019-05-10 09:03:09 -05:00
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
leaflet: update jquery-ui package with lightness them. Change-Id: I8273c2f7d8b46f63f582c11c2c0e81c303e04bcb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95352 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-02 04:46:39 -05:00
node_modules/jquery-ui-dist/jquery-ui.js \
loleaflet: import Autolinker.js library The file was imported from node_modules/autolinker/dist/Autolinker.js the main reason is to analyze the source code, debug and patch if necessary To get the source code from npm repository make libs Change-Id: I3eea7cc6e8d61623398d77ed74e751ccd861252b Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89150 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-20 10:21:44 -06:00
node_modules/smartmenus/dist/jquery.smartmenus.js
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
loleaflet: import sanitize-url.js library The file was imported from node_modules/@braintree/sanitize-url/index.js the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs To bundle the file sanitize-url.js browserify braintree-sanitize-url/index.js --standalone sanitizeUrl > sanitize-url.js Change-Id: I7869a1349648ae1f8f2194859ebb398b1a73733e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89055 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 13:08:17 -06:00
LOLEAFLET_LIBS_JS =\
loleaflet: import Autolinker.js library The file was imported from node_modules/autolinker/dist/Autolinker.js the main reason is to analyze the source code, debug and patch if necessary To get the source code from npm repository make libs Change-Id: I3eea7cc6e8d61623398d77ed74e751ccd861252b Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89150 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-20 10:21:44 -06:00
Autolinker.js \
loleaflet: import json2.js library The file was imported from node_modules/json-js/json2.js the main reason is to analyze the source code, debug and patch if necessary To get the source code from npm repository make libs Change-Id: I7d80646704b368f6961c75f1dabaabecde2527e6 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89146 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-20 10:04:32 -06:00
json2.js \
loleaflet: import select2.js library The file was imported fromnode_modules/select2/dist/js/select2.js the main reason is to analyze the source code, debug and patch if necessary To get the source code from npm repository make libs Change-Id: Ibe0fd718d1dd6157d463a304c56fd6475821a0eb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89110 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-20 07:54:53 -06:00
select2.js \
loleaflet: import vex.combined.js library The file was imported from node_modules/vex-js/dist/js/vex.combined.js the main reason is to analyze the source code, debug and patch if necessary To get the source code from npm repository make libs Change-Id: I59e466e925d43bf4c599305898c656f69ec195d9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89099 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-20 06:25:27 -06:00
vex.combined.js \
loleaflet: import sanitize-url.js library The file was imported from node_modules/@braintree/sanitize-url/index.js the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs To bundle the file sanitize-url.js browserify braintree-sanitize-url/index.js --standalone sanitizeUrl > sanitize-url.js Change-Id: I7869a1349648ae1f8f2194859ebb398b1a73733e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89055 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 13:08:17 -06:00
sanitize-url.js
loleaflet: makefile: create variable to expand more JS libs It simplifies and expand more Javascript Libraries to be used in "loleaflet" bundle Change-Id: I94aab1989fcef844344a297cd511c796ba642bd4
2019-05-02 14:26:05 -05:00
Revert "loleaflet: remove client side L10n" This reverts commit c9685387b9fb639ab9d31fa0619cb0beab430e8a. Change-Id: Ie11c04ffad8260c3c1d6357f18dd9f2a42912859
2019-03-15 11:25:41 -05:00
if !ENABLE_MOBILEAPP
loleaflet: import l10n.js library The file was imported from node_modules/l10n-for-node/l10n.js, the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs Change-Id: I7bd4d400c504f57a94566e187c6d26361aed8bd0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89043 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 08:17:31 -06:00
LOLEAFLET_LIBS_JS +=\
l10n.js
Revert "loleaflet: remove client side L10n" This reverts commit c9685387b9fb639ab9d31fa0619cb0beab430e8a. Change-Id: Ie11c04ffad8260c3c1d6357f18dd9f2a42912859
2019-03-15 11:25:41 -05:00
endif
loleaflet: import l10n.js library The file was imported from node_modules/l10n-for-node/l10n.js, the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs Change-Id: I7bd4d400c504f57a94566e187c6d26361aed8bd0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89043 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 08:17:31 -06:00
LOLEAFLET_LIBS_JS +=\
jquery.mCustomScrollbar.js \
w2ui-1.5.rc1.js
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS))
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
NODE_MODULES_JS_DST = $(patsubst %.js,$(DIST_FOLDER)/%.js,$(NODE_MODULES_JS))
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
loleaflet: makefile: create variable to expand more JS libs It simplifies and expand more Javascript Libraries to be used in "loleaflet" bundle Change-Id: I94aab1989fcef844344a297cd511c796ba642bd4
2019-05-02 14:26:05 -05:00
LOLEAFLET_LIBS_JS_SRC = $(patsubst %.js,$(srcdir)/js/%.js,$(LOLEAFLET_LIBS_JS))
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_LIBS_JS_DST = $(patsubst %.js,$(DIST_FOLDER)/%.js,$(LOLEAFLET_LIBS_JS))
loleaflet: makefile: create variable to expand more JS libs It simplifies and expand more Javascript Libraries to be used in "loleaflet" bundle Change-Id: I94aab1989fcef844344a297cd511c796ba642bd4
2019-05-02 14:26:05 -05:00
loleaflet: makefile: avoid to execute javascript to get a list file We are in state to bundle Javacript files for different platforms: Android, IOS, desktop. And each platform could add specific chunk Javascript code according its specific requirements. Change-Id: Ib52ae816cb9443c8605fdf70aaa4c5e4c81b962d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89557 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-21 11:09:26 -06:00
LOLEAFLET_JS =\
src/Leaflet.js \
src/errormessages.js \
src/unocommands.js \
src/viamapi-client.js \
src/core/Log.js \
src/core/Util.js \
src/core/LOUtil.js \
src/core/Class.js \
src/core/Events.js \
src/core/Socket.js \
src/core/Matrix.js \
src/geometry/Point.js \
src/geometry/Bounds.js \
src/geometry/Transformation.js \
src/dom/DomUtil.js src/geo/LatLng.js \
src/geo/LatLngBounds.js \
src/geo/projection/Projection.LonLat.js \
src/geo/crs/CRS.js \
src/geo/crs/CRS.Simple.js \
src/map/Map.js \
src/map/Clipboard.js \
src/layer/Layer.js \
src/layer/tile/GridLayer.js \
src/layer/tile/TileLayer.js \
introduce CanvasTileLayer with support for split-panes which is derived from TileLayer but renders tiles on a canvas instead. TODO: Generalize certain methods of TileLayer instead of a complete re-implementation in CanvasTileLayer just because a few things need to change. Change-Id: I51001f83f8f663d194bc9c4b018fa9950c40f420 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98351 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-07-07 02:50:34 -05:00
src/layer/tile/CanvasTileLayer.js \
introduce SplitPanesContext class This will store the split position and notify others and update the splitters when someone changes this. Change-Id: Ic1a2d665c972c369ce4e1362d0add50f72125d8a Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98350 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-07-07 02:13:32 -05:00
src/layer/SplitPanesContext.js \
loleaflet: makefile: avoid to execute javascript to get a list file We are in state to bundle Javacript files for different platforms: Android, IOS, desktop. And each platform could add specific chunk Javascript code according its specific requirements. Change-Id: Ib52ae816cb9443c8605fdf70aaa4c5e4c81b962d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89557 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-21 11:09:26 -06:00
src/layer/tile/TileLayer.TableOverlay.js \
src/layer/ObjectFocusDarkOverlay.js \
src/layer/tile/WriterTileLayer.js \
src/layer/tile/ImpressTileLayer.js \
src/layer/tile/CalcTileLayer.js \
src/layer/BackgroundColor.js \
src/layer/ImageOverlay.js \
src/layer/marker/ProgressOverlay.js \
src/layer/marker/TextInput.js \
src/layer/marker/Icon.js \
src/layer/marker/Icon.Default.js \
src/layer/marker/Marker.js \
src/layer/marker/Cursor.js \
src/layer/marker/DivIcon.js \
src/layer/Popup.js \
src/layer/Layer.Popup.js \
src/layer/marker/Marker.Popup.js \
src/layer/LayerGroup.js \
src/layer/FeatureGroup.js \
src/layer/CalcGridLines.js \
src/layer/vector/Renderer.js \
src/layer/vector/Path.js \
src/layer/vector/Path.Popup.js \
src/geometry/LineUtil.js \
src/layer/vector/Polyline.js \
src/geometry/PolyUtil.js \
src/layer/vector/Polygon.js \
src/layer/vector/Rectangle.js \
add draggable splitters that controls the split-panes Change-Id: I7d6f681fbacfd8b1a6699c52a8bd9d007f20b99d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98355 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-07-07 04:27:24 -05:00
src/layer/vector/SplitterLine.js \
loleaflet: makefile: avoid to execute javascript to get a list file We are in state to bundle Javacript files for different platforms: Android, IOS, desktop. And each platform could add specific chunk Javascript code according its specific requirements. Change-Id: Ib52ae816cb9443c8605fdf70aaa4c5e4c81b962d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89557 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-21 11:09:26 -06:00
src/layer/vector/CircleMarker.js \
src/layer/vector/Circle.js \
src/layer/vector/SVG.js \
add split-panes support for overlay layer (This is only for svg renderer) There are separate svg DOM-nodes for each split-pane with view-box set appropriately. The L.Path based objects are shared for each split-pane, but there will be separate identical 'path' DOM-nodes for each svg container. This patch introduces L.SplitPanesRenderer/L.SplitPanesSVG (has same external api as L.Renderer/L.SVG). These are wrapper classes to host child renderers, one per split-pane and delegate calls to them appropriately. Change-Id: Id44e9a1312500e6b43cdd8e4f42e235b43d22772 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98354 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-07-07 03:59:54 -05:00
src/layer/vector/SplitPanesRenderer.js \
src/layer/vector/SplitPanesSVG.js \
loleaflet: makefile: avoid to execute javascript to get a list file We are in state to bundle Javacript files for different platforms: Android, IOS, desktop. And each platform could add specific chunk Javascript code according its specific requirements. Change-Id: Ib52ae816cb9443c8605fdf70aaa4c5e4c81b962d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89557 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-21 11:09:26 -06:00
src/layer/vector/Path.Transform.SVG.js \
src/core/Handler.js \
src/layer/vector/SVGGroup.js \
src/layer/vector/Path.Drag.Transform.js \
src/layer/vector/Path.Drag.js \
src/layer/vector/Path.Transform.Util.js \
src/layer/vector/Path.Transform.js \
src/layer/vector/SVG.VML.js \
src/layer/vector/Path.Transform.SVG.VML.js \
src/layer/vector/Canvas.js \
src/layer/vector/Path.Transform.Canvas.js \
MSForms: handle formfieldbutton message. Change-Id: I17243823d9bc0074b7fd015bca23de9399e0e26c
2020-04-29 06:36:05 -05:00
src/layer/FormFieldButtonLayer.js \
loleaflet: makefile: avoid to execute javascript to get a list file We are in state to bundle Javacript files for different platforms: Android, IOS, desktop. And each platform could add specific chunk Javascript code according its specific requirements. Change-Id: Ib52ae816cb9443c8605fdf70aaa4c5e4c81b962d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89557 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-21 11:09:26 -06:00
src/dom/DomEvent.js \
src/dom/Draggable.js \
src/map/handler/Map.Drag.js \
src/map/handler/Map.Scroll.js \
src/map/handler/Map.DoubleClickZoom.js \
src/dom/DomEvent.Pointer.js \
src/map/handler/Map.TouchGesture.js \
src/map/handler/Map.BoxZoom.js \
src/map/handler/Map.Keyboard.js \
src/dom/DomEvent.MultiClick.js \
src/map/handler/Map.Mouse.js \
src/map/handler/Map.Print.js \
src/map/handler/Map.SlideShow.js \
src/map/handler/Map.FileInserter.js \
src/map/handler/Map.StateChanges.js \
src/map/handler/Map.WOPI.js \
src/layer/marker/Marker.Drag.js \
src/control/Control.Toolbar.js \
src/control/Control.js \
src/control/Control.PartsPreview.js \
src/control/Control.Header.js \
src/control/Control.ColumnHeader.js \
src/control/Control.RowHeader.js \
src/control/Control.DocumentRepair.js \
src/control/Control.DownloadProgress.js \
src/control/Control.ContextMenu.js \
src/control/Control.Menubar.js \
src/control/Control.Tabs.js \
src/control/Control.Permission.js \
src/control/Control.Selection.js \
src/control/Control.Scroll.js \
src/control/Control.LokDialog.js \
src/control/Control.AlertDialog.js \
src/control/Control.Infobar.js src/control/ColorPicker.js \
src/control/Control.JSDialogBuilder.js \
src/control/Control.MobileWizard.js \
src/control/Control.LanguageDialog.js \
src/control/Control.Attribution.js \
src/control/Control.MobileSlide.js \
src/control/Control.Scale.js \
Move statusbar code to separate file Change-Id: Ia4940b1725bbc4326dfeb520a6bcb6423b9a25b9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92036 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-10 04:29:52 -05:00
src/control/Control.StatusBar.js \
Move SearchBar to separate file Change-Id: I6db64d35f40f3a762f50df010ead9395a873fb20 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92037 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-10 08:19:56 -05:00
src/control/Control.SearchBar.js \
Move mobile top bar to separate file Change-Id: I26fc5be1b73b4ff68be00c21a6691c7712d08c1e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92158 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-10 10:36:40 -05:00
src/control/Control.MobileTopBar.js \
Move bottom mobile toolbar to separate file Change-Id: I32e8fe251fcabd5d1c5af19cd7a72f60250c2851 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92159 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-10 12:44:21 -05:00
src/control/Control.MobileBottomBar.js \
Move user list to a separate file Change-Id: I1cd8881d8ea342b96bd5ea5bd4972f971c89881d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92210 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-14 11:07:25 -05:00
src/control/Control.UserList.js \
Move formula bar to separate file Change-Id: If380e8bc8091151872a728cc632313aa3f4cfda1 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92269 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-15 06:38:46 -05:00
src/control/Control.FormulaBar.js \
Move sheets bar to separate file Change-Id: Id2cdfdd50e178e4de54a41fa1926e94def9a43f5 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92271 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-15 07:15:22 -05:00
src/control/Control.SheetsBar.js \
Move presentation toolbar to separate file Change-Id: I47faf807bbbd79e27c9eb5156fc24dc4bc053aab Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92272 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-15 08:25:22 -05:00
src/control/Control.PresentationBar.js \
Move signing bar to separate file In the future should be merged with Signing.js Change-Id: I3b5db8b20dcead4e0f1f80643de474fdba8245af Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92348 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-16 04:13:21 -05:00
src/control/Control.SigningBar.js \
Move top toolbar to separate file Change-Id: I0465b32af1fbb2534aa6db41342df3993b7837bf Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92349 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-16 06:19:55 -05:00
src/control/Control.TopToolbar.js \
Introduce UIManager Change-Id: I944622a352aae7951f3e69286bb163645fa23276 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92405 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-16 11:21:44 -05:00
src/control/Control.UIManager.js \
Move DocumentNameInput to separate file Change-Id: I20b5620269b46902a612d2b43346d3b02c3636cd Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92622 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-20 06:55:35 -05:00
src/control/Control.DocumentNameInput.js \
notebookbar: Create toolbars depending on settings Change-Id: I66a03e9d8e9104b9f7868f24601525d502734e0e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93051 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-21 07:10:38 -05:00
src/control/Control.Notebookbar.js \
notebookbar: separate file for each app Change-Id: If61ed762a3dd55c0cef7d58b7a3b1ddf8276cce3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93304 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-05-01 05:19:29 -05:00
src/control/Control.NotebookbarWriter.js \
src/control/Control.NotebookbarCalc.js \
notebookbar: separate configuration for impress Change-Id: Ibd7cdd9302f9033aca0de908ade036fa2dc50ede Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93650 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-05-07 04:33:18 -05:00
src/control/Control.NotebookbarImpress.js \
notebookbar: use builder to create Change-Id: If8bbbaba66aba887587b8679f7a1ac9f5ccb4490 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93052 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-22 04:29:31 -05:00
src/control/Control.NotebookbarBuilder.js \
loleaflet: makefile: avoid to execute javascript to get a list file We are in state to bundle Javacript files for different platforms: Android, IOS, desktop. And each platform could add specific chunk Javascript code according its specific requirements. Change-Id: Ib52ae816cb9443c8605fdf70aaa4c5e4c81b962d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89557 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-21 11:09:26 -06:00
src/control/Control.Layers.js \
src/control/Search.js \
src/control/Permission.js \
src/control/Toolbar.js \
src/control/Signing.js \
src/control/Parts.js \
src/control/Scroll.js \
src/control/Styles.js \
src/control/Ruler.js \
src/dom/PosAnimation.js \
src/map/anim/Map.PanAnimation.js \
src/dom/PosAnimation.Timer.js \
src/map/anim/Map.ZoomAnimation.js \
src/map/anim/Map.FlyTo.js \
src/layer/AnnotationManager.js \
src/control/Control.Scroll.Annotation.js \
src/layer/marker/Annotation.js \
src/layer/marker/DivOverlay.js \
src/main.js
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
LOLEAFLET_JS_SRC = $(shell find $(srcdir)/src -name '*.js')
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
LOLEAFLET_JS_DST = $(patsubst $(srcdir)/src/%.js,$(DIST_FOLDER)/src/%.js,$(LOLEAFLET_JS_SRC))
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
COMMA := ,
EMPTY :=
SPACE := $(EMPTY) $(EMPTY)
LOLEAFLET_VERSION = $(shell cd $(srcdir) && git log -1 --pretty=format:"%h")
android: create intermediate dir for build variants It is better to separate the intermediate asset files Change-Id: I50ff1b6e045679afa48c7024652de40db8fa2a71 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95366 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-06-02 09:26:34 -05:00
INTERMEDIATE_DIR ?= $(if $(IS_DEBUG),$(abs_builddir)/debug,$(abs_builddir)/release)
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
2017-11-10 00:00:06 -06:00
Fix build from non-git source archives like tar or zip Change-Id: I359056c9ad2550b625eb3e7b8e71d841eedea93b Reviewed-on: https://gerrit.libreoffice.org/41553 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-08-25 02:08:13 -05:00
EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
Include loleaflet files to source archive Change-Id: Ia7583786fd5a709e56f3319fac25e554465ab3df
2017-01-03 22:24:55 -06:00
loleaflet: makefile: simplify the rules for bundling loleaflet So it can be flexible to bundle Debug or Release and it can be used in other platform (i.e. Android) Change-Id: Ia98abc0711c98b8f34654956534ce414f34dbdb4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94891 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 14:25:28 -05:00
define bundle_loleaflet
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(if $(IS_DEBUG),\
loleaflet: makefile: simplify the rules for bundling loleaflet So it can be flexible to bundle Debug or Release and it can be used in other platform (i.e. Android) Change-Id: Ia98abc0711c98b8f34654956534ce414f34dbdb4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94891 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 14:25:28 -05:00
@touch $@,
@m4 -PE -DIOSAPP=$(ENABLE_IOSAPP) \
-DGTKAPP=$(ENABLE_GTKAPP) \
-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
-DMOBILEAPPNAME="$(APP_NAME)" \
-DVERSION=$(LOLEAFLET_VERSION) \
-DCOPYRIGHT=$(srcdir)/src/copyright.js \
-DLOLEAFLET_JS=$(subst $(SPACE),$(COMMA),$(patsubst %.js,$(srcdir)/%.js,$(LOLEAFLET_JS))) \
$(srcdir)/loleaflet-src.js.m4 > $@)
endef
define prereq_loleaflet
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(if $(IS_DEBUG),$(LOLEAFLET_JS_DST),$(LOLEAFLET_JS_SRC))
loleaflet: makefile: simplify the rules for bundling loleaflet So it can be flexible to bundle Debug or Release and it can be used in other platform (i.e. Android) Change-Id: Ia98abc0711c98b8f34654956534ce414f34dbdb4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94891 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 14:25:28 -05:00
endef
loleaflet: makefile: simplify bundling CSS So it can be flexible to bundle Debug or Release Change-Id: I02bb653d7ead2e3d2e72bca8911efe2573885af4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94910 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 17:00:51 -05:00
define bundle_css
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(if $(IS_DEBUG),\
loleaflet: makefile: simplify bundling CSS So it can be flexible to bundle Debug or Release Change-Id: I02bb653d7ead2e3d2e72bca8911efe2573885af4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94910 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 17:00:51 -05:00
@touch $@,\
@echo "Uglify loleaflet css files..."
@$(NODE) node_modules/uglifycss/uglifycss $(LOLEAFLET_CSS) > $@)
endef
define prereq_css
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(if $(IS_DEBUG),$(LOLEAFLET_CSS_DST),$(LOLEAFLET_CSS))
loleaflet: makefile: simplify bundling CSS So it can be flexible to bundle Debug or Release Change-Id: I02bb653d7ead2e3d2e72bca8911efe2573885af4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94910 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 17:00:51 -05:00
endef
loleaflet: makefile: simplify rule bundle.js Change-Id: I805b3a46a5864ca31e22ab685d6749c748255372 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94912 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 18:28:52 -05:00
define bundle_all
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(if $(IS_DEBUG),\
loleaflet: makefile: simplify rule bundle.js Change-Id: I805b3a46a5864ca31e22ab685d6749c748255372 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94912 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 18:28:52 -05:00
@touch $@,\
@echo "Uglify loleaflet js files..."
@m4 -PE -DL10N_IOS_ALL_JS=$(L10N_IOS_ALL_JS) \
-DNODE_MODULES_JS=$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS)) \
-DLOLEAFLET_LIBS_JS=$(subst $(SPACE),$(COMMA),$(LOLEAFLET_LIBS_JS_SRC)) \
-DLOLEAFLET_JS=$(INTERMEDIATE_DIR)/loleaflet-src.js \
$(srcdir)/bundle.js.m4 > $(INTERMEDIATE_DIR)/bundle.js
@$(NODE) node_modules/uglify-js/bin/uglifyjs \
$(INTERMEDIATE_DIR)/bundle.js \
--output $@)
endef
define prereq_all
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(if $(IS_DEBUG),$(NODE_MODULES_JS_DST) $(LOLEAFLET_LIBS_JS_DST),\
loleaflet: makefile: simplify rule bundle.js Change-Id: I805b3a46a5864ca31e22ab685d6749c748255372 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94912 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 18:28:52 -05:00
$(NODE_MODULES_JS_SRC) $(LOLEAFLET_LIBS_JS_SRC))
endef
loleaflet: makefile: simplify global file rule Change-Id: I9c9bf7fa48f8c9dcd318195235cb99e407215543 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94913 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 19:17:22 -05:00
define global_file
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(if $(IS_DEBUG),
loleaflet: makefile: simplify global file rule Change-Id: I9c9bf7fa48f8c9dcd318195235cb99e407215543 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94913 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 19:17:22 -05:00
@cp $< $@,
@echo "Uglify global.js file..."
@$(NODE) node_modules/uglify-js/bin/uglifyjs $< --output $@)
endef
loleaflet: makefile: update PHONY targets Change-Id: I3201c3f155aae597871f682686a8acdba47ae8a5 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94979 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 10:00:13 -05:00
.PHONY: build-loleaflet
loleaflet: install node modules in configure phase It is not necessary to clean these files since they do not change frequently Change-Id: I092013c02effffe6c45bccbf81369e583cffe806 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93111 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-28 16:25:49 -05:00
all-local: build-loleaflet
loleaflet: fix make -j N Change-Id: I994ff4b352c93ff910d93f5f176c4e7ced2dc21d
2018-05-26 09:26:47 -05:00
android: Create the html, js and css and copy it to the right place. Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 06:22:25 -06:00
if !ENABLE_MOBILEAPP
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
We don't need the admin stuff in the mobile app
2018-11-08 17:03:45 -06:00
endif
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
$(TYPESCRIPT_JS_DIR)/%.js: $(srcdir)/%.ts
@mkdir -p $(dir $@)
$(srcdir)/node_modules/typescript/bin/tsc --outFile $@ $<
leaflet: Introduce typescript. Initiate a modal library with typescript. Change-Id: I92113f7552f938f0874e8b16904e8bef0b5249a3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95624 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins
2020-06-09 03:13:52 -05:00
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
build-loleaflet: \
leaflet: Introduce typescript. Initiate a modal library with typescript. Change-Id: I92113f7552f938f0874e8b16904e8bef0b5249a3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95624 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins
2020-06-09 03:13:52 -05:00
$(LOLEAFLET_L10N_DST) \
Revert "configure:L10n: compile message catalog to binary format" This reverts commit 59241a2ea467992adadbacae00a15ec7fe0de2d9.
2019-03-15 11:27:27 -05:00
$(L10N_JSON) \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
$(LOLEAFLET_IMAGES_DST) \
configure: Add support for custom icons Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 Reviewed-on: https://gerrit.libreoffice.org/74491 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-06-21 03:43:53 -05:00
$(LOLEAFLET_IMAGES_CUSTOM_DST) \
Actually, let's ship both these jQuery themes. Change-Id: I3e546e155d50fb280fe12c31b8c33523ac8e9f11
2019-01-10 05:34:43 -06:00
$(JQUERY_LIGHTNESS_DIST_IMAGES) \
$(JQUERY_MINIFIED_DIST_IMAGES) \
We don't need the admin stuff in the mobile app
2018-11-08 17:03:45 -06:00
$(ADMIN_BUNDLE) \
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/bundle.css \
$(DIST_FOLDER)/device-mobile.css \
$(DIST_FOLDER)/device-tablet.css \
$(DIST_FOLDER)/device-desktop.css \
$(DIST_FOLDER)/bundle.js \
$(DIST_FOLDER)/loleaflet.html
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@echo "build loleaflet completed"
android: Create the html, js and css and copy it to the right place. Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 06:22:25 -06:00
if ENABLE_ANDROIDAPP
android: generate debug and release loleaflet assets Change-Id: If3659de771b3d1f7015c1e4c26d6877f90afe306 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94996 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 11:43:29 -05:00
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)/branding.css" "$(APP_BRANDING_DIR)/branding.js" $(DIST_FOLDER)/ ; else touch $(DIST_FOLDER)/branding.css ; fi
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)"/images/*.svg $(DIST_FOLDER)/images/ ; fi
@if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)/images/toolbar-bg-logo.svg" $(DIST_FOLDER)/images/toolbar-bg.svg ; fi
android: Create the html, js and css and copy it to the right place. Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 06:22:25 -06:00
@echo
android: change dependency to generate assets According to gradle graph tasks, add a dependecy to generate loleaflet assets Change-Id: I5b528989c645903840eae44b7770b7d2425bb921 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92662 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-21 17:11:13 -05:00
@echo "JS, HTML and CSS has been updated (android/lib/src/main/assets/dist)."
android: Create the html, js and css and copy it to the right place. Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 06:22:25 -06:00
endif
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
loleaflet: makefile: rename LOLEAFLET_PREFIX var In order to not confuse it is renamed to INTERMEDIATE_DIR Change-Id: Iccdea0d77b17c3d4285b891b79a408a795328d13 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94873 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 09:45:55 -05:00
$(INTERMEDIATE_DIR)/admin-src.js
loleaflet: makefile: replace ENABLE_DEBUG var Now, it does not depend on ./configure script it is configurable to set BUNDLE=DEBUG or RELEASE (i.e. Android platform) Change-Id: Id43f156a05ea22f74334e7fdbe60d53b8b5a2891 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94982 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 10:31:03 -05:00
@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE) node_modules/browserify/bin/cmd.js -g browserify-css $(if $(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
loleaflet: add rule to bundle admin files Change-Id: Id3d25855d697ad607ae30ffffa1a9c6f565b6e6d
2018-05-26 15:57:40 -05:00
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_JS)
loleaflet: makefile: set default INTERMEDIATE_DIR var and configurable. Change-Id: I4f1b111e1f9ce4e8c9e0b13755dce04f99672e1e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94981 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 10:16:08 -05:00
@mkdir -p $(dir $@)
loleaflet: add rule to bundle admin files Change-Id: Id3d25855d697ad607ae30ffffa1a9c6f565b6e6d
2018-05-26 15:57:40 -05:00
@echo "Checking for admin JS errors..."
loleaflet: makefile: simplify NODE_PATH var Change-Id: I96a221f92aa2d3785cc6c83add84fc37680a6183 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94860 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 07:36:34 -05:00
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
loleaflet: makefile: do not execute javascript to get admin files Change-Id: I84f3128499f038691abc762adec50c32f103b9f9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90448 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-03-12 15:37:06 -05:00
@awk 'FNR == 1 {print ""} 1' $(patsubst %.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
Fix dependencies of the TypeScript file. The assumption is that the amount of TS files will grow; so move away from a generic 'tsc' call that is supposed to walk through the tree with exact calling that for the files that have been changed. This should hopefully finally sort out the Jenkins problems with ModalDialogCreator.tsj Change-Id: I5f2883de7e43fd53fa8a67f12d0a965da8611942 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97082 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24 15:23:50 -05:00
$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
@mkdir -p $(dir $@)
loleaflet: makefile: move the command to check UNO commands Change-Id: Ic841b0de22d3e62779fe0c112a33c942ba87b160 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94977 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 09:08:16 -05:00
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
loleaflet: update node_shrinkwrap Change-Id: Icf4683c074c6c4dc6e478412230a431137bdb7fa
2018-05-27 06:50:37 -05:00
@echo "Checking for loleaflet JS errors..."
loleaflet: makefile: simplify NODE_PATH var Change-Id: I96a221f92aa2d3785cc6c83add84fc37680a6183 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94860 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 07:36:34 -05:00
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/src \
loleaflet: add path transformation plugin added, indented plug-ins from the repository: + https://github.com/w8r/Leaflet.Path.Drag commit df9c39b5a567150e445c448e2404d801f3a517c4 + https://github.com/w8r/Leaflet.Path.Transform commit 6feed9bf21ed86b2beb52dbc4b11d47c3709d8ea Change-Id: I6c0762fd8fd943cc136dcc9a7a1b476c7be794e0
2018-10-30 08:18:54 -05:00
$(srcdir)/js --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(call bundle_loleaflet)
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(DIST_FOLDER)/bundle.css: $(call prereq_css)
loleaflet: makefile: simplify bundling CSS So it can be flexible to bundle Debug or Release Change-Id: I02bb653d7ead2e3d2e72bca8911efe2573885af4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94910 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 17:00:51 -05:00
@mkdir -p $(dir $@)
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(call bundle_css)
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(DIST_FOLDER)/bundle.js: $(INTERMEDIATE_DIR)/loleaflet-src.js $(call prereq_all)
loleaflet: makefile: simplify rule bundle.js Change-Id: I805b3a46a5864ca31e22ab685d6749c748255372 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94912 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 18:28:52 -05:00
@mkdir -p $(dir $@)
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(call bundle_all)
loleaflet: makefile: simplify rule bundle.js Change-Id: I805b3a46a5864ca31e22ab685d6749c748255372 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94912 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 18:28:52 -05:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/global.js: $(srcdir)/js/global.js
loleaflet: makefile: simplify global file rule Change-Id: I9c9bf7fa48f8c9dcd318195235cb99e407215543 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94913 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 19:17:22 -05:00
@mkdir -p $(dir $@)
loleaflet: makefile: simplify IS_DEBUG var Change-Id: I5322d9308f63fb0e501aa883cfbe3cfd7c4fb663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95062 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 11:08:06 -05:00
$(call global_file)
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
loleaflet: makefile: remove duplicates prerequisites Change-Id: I409225be5f69524105967d3a72466ff284afc724 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94866 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 08:20:50 -05:00
$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 \
$(LOLEAFLET_HTML_DST) \
$(DIST_FOLDER)/bundle.css \
$(DIST_FOLDER)/global.js \
$(DIST_FOLDER)/bundle.js
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@echo "Generating loleaflet.html..."
loleaflet: makefile: replace ENABLE_DEBUG var Now, it does not depend on ./configure script it is configurable to set BUNDLE=DEBUG or RELEASE (i.e. Android platform) Change-Id: Id43f156a05ea22f74334e7fdbe60d53b8b5a2891 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94982 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 10:31:03 -05:00
@m4 -PE -DDEBUG=$(IS_DEBUG) \
Factor out loleaflet/dist construction for iOS app building The idea is that on a Linux box you have a tree of online that you configure with --enable-iosapp. Then running 'make' there will only create the stuff in loleaflet/dist. That loleaflet/dist can then be copied to the Mac where you build the iOS app. (To me, this approach seemed for now simpler than to get all the PKG_CONFIG etc stuff working that running configure normally requires, and run all the node, npm, and associated crack, on a Mac.) Change-Id: Id2e495d0521922d0666fdab5fdcb5fcd460136f1
2018-08-31 05:24:17 -05:00
-DIOSAPP=$(ENABLE_IOSAPP) \
Add --enable-gtkapp configury option Change-Id: Ib805581663aeec62d713f87ca72ab3cfe95db79f
2018-10-16 17:22:24 -05:00
-DGTKAPP=$(ENABLE_GTKAPP) \
android: Create the html, js and css and copy it to the right place. Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 06:22:25 -06:00
-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
Use the app name more generally, not only on iOS. Preparation for using it on Android too. Change-Id: Iee7778b2625a02a98daff5df87c39f4ab1d18144 Reviewed-on: https://gerrit.libreoffice.org/70651 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-03-30 13:12:19 -05:00
-DMOBILEAPPNAME="$(APP_NAME)" \
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
-DLOLEAFLET_CSS="$(subst $(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
-DGLOBAL_JS="$(DIST_FOLDER)/global.js" \
loleaflet: add javascript websocket bootstrap that... is executed after parsing html Change-Id: Ib62de3db2449bbe9dc474469c299036259f8f2de
2019-01-27 12:04:26 -06:00
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \
loleaflet: makefile: create variable to expand more JS libs It simplifies and expand more Javascript Libraries to be used in "loleaflet" bundle Change-Id: I94aab1989fcef844344a297cd511c796ba642bd4
2019-05-02 14:26:05 -05:00
$(LOLEAFLET_LIBS_JS) \
loleaflet: makefile: remove old depecrated expansion I probably forgot to remove it Change-Id: I0183605fdf07235a7e3d61e91893133690feb074 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94974 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 08:54:06 -05:00
$(LOLEAFLET_JS))" \
add copyright notice to About Box Change-Id: I51c2c5e7c2b0cf232b8a2f2dbcb3b9f3f04737ea Reviewed-on: https://gerrit.libreoffice.org/70205 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-04-03 09:26:51 -05:00
-DVENDOR="$(VENDOR)" \
loleaflet: remove the script tags that they already were bundled them Change-Id: I791c6c6850b39d5327c5c3c521138531f3a6f148
2018-05-27 08:16:52 -05:00
$(srcdir)/html/loleaflet.html.m4 > $@
loleaflet: Debug mode bundle.js with source maps
2016-08-07 11:27:29 -05:00
loleaflet: install node modules in configure phase It is not necessary to clean these files since they do not change frequently Change-Id: I092013c02effffe6c45bccbf81369e583cffe806 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93111 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-28 16:25:49 -05:00
node_modules: package.json archived-packages
loleaflet: fix make -j N Change-Id: I994ff4b352c93ff910d93f5f176c4e7ced2dc21d
2018-05-26 09:26:47 -05:00
@npm install
@touch node_modules
loleaflet: build: Skip expensive 'npm install' This always takes ~2 seconds irrespective of whether node_modules needs updating or not. Lets add appropriate dependencies and save these precious 2 seconds. Change-Id: Ided4ff334316c16521e5ea7a69d15736a1cc170f
2016-12-12 04:24:43 -06:00
loleaflet: remove install node_module in configure phase Fair enough, let's not get in conflict with IOS platform, It is restored and get another solution Change-Id: I1cde236595479bdf41e29d8a30bb9d71aa196e54 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95036 Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 07:17:16 -05:00
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status node_modules
@case '$?' in \
loleaflet: makefile: update Makefile rule Change-Id: If52e0c1094e71cd52e665a0bbbdda2f4a9f0cd5f Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95059 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 10:27:32 -05:00
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@;; \
loleaflet: remove install node_module in configure phase Fair enough, let's not get in conflict with IOS platform, It is restored and get another solution Change-Id: I1cde236595479bdf41e29d8a30bb9d71aa196e54 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95036 Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-28 07:17:16 -05:00
esac;
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/device-%.css: $(srcdir)/css/device-%.css
mobile detection: Create a separate device-*.css for the phone/tablet/desktop. The problem is that the @media-based detection often disagrees with the JS-based detection which then leads to many problems - most notably that part of the UI behaves as if it was a tablet, and the other part as if was a mobile phone, leading to a terrible user experience. This commit changes it so that there is only one way how to detect if we are on mobile phone, tablet or desktop: using the JavaScript, and we will load the appropriate css accordingly. Only one @media-based rule is converted as an example, the rest will follow. Change-Id: Id7bfb58ca12264904b3329db1542ae6b54893f11 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91416 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-03-30 04:59:20 -05:00
@mkdir -p $(dir $@)
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
loleaflet: makefile: simplify NODE_PATH var Change-Id: I96a221f92aa2d3785cc6c83add84fc37680a6183 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94860 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-26 07:36:34 -05:00
$(NODE) node_modules/uglifycss/uglifycss $< > $@ ; \
mobile detection: Create a separate device-*.css for the phone/tablet/desktop. The problem is that the @media-based detection often disagrees with the JS-based detection which then leads to many problems - most notably that part of the UI behaves as if it was a tablet, and the other part as if was a mobile phone, leading to a terrible user experience. This commit changes it so that there is only one way how to detect if we are on mobile phone, tablet or desktop: using the JavaScript, and we will load the appropriate css accordingly. Only one @media-based rule is converted as an example, the rest will follow. Change-Id: Id7bfb58ca12264904b3329db1542ae6b54893f11 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91416 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-03-30 04:59:20 -05:00
else \
ln -sf $(abs_srcdir)/$< $@ ; \
fi
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/plugins/%.js: $(srcdir)/plugins/%.js
loleaflet: debug: do not bundle the draw plugin files Change-Id: I022f121410eb0a3cd59b2b3b1a160ff7d244ad53
2018-05-17 16:13:24 -05:00
@mkdir -p $(dir $@)
Integrate browser-sync Tool to automatically reload used .css and .js files. To make it work symlinks are created instead of a copy if browsersync is enabled. 1. install: npm install -g browser-sync 2. use configure option: --enable-browsersync 3. remove loleaflet/dist directory 4. run server: LOOL_SERVE_FROM_FS=1 make run -j10 5. run browsersync: browser-sync start --config browsersync-config.js or make sync-writer Change-Id: Iebee1cc0b9a03bc866954ff33e3cb8a10b48e0af
2019-02-12 04:47:24 -06:00
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
`cp $< $@`; \
else \
`ln -sf $(abs_srcdir)/$< $@`; \
fi
loleaflet: debug: do not bundle the draw plugin files Change-Id: I022f121410eb0a3cd59b2b3b1a160ff7d244ad53
2018-05-17 16:13:24 -05:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/images/%: $(CUSTOM_ICONS_DIRECTORY)/%
configure: Add support for custom icons Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 Reviewed-on: https://gerrit.libreoffice.org/74491 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-06-21 03:43:53 -05:00
@mkdir -p $(dir $@)
@cp $< $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/images/%: $(srcdir)/images/%
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
@cp $< $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/%.html: $(srcdir)/html/%.html
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
Browsersync: Also sync html files Change-Id: I55db923954fc0c59e1726640c980a539a12293ba Reviewed-on: https://gerrit.libreoffice.org/72455 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-17 04:26:47 -05:00
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
`cp $< $@`; \
install the optional welcome text Change-Id: Ic3096110cab7068d7963056fab1002db4fc8451e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94970 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-27 07:20:43 -05:00
else \
`ln -sf $(abs_srcdir)/$< $@`; \
fi
$(DIST_FOLDER)/welcome/%.html: $(srcdir)/welcome/%.html
@mkdir -p $(dir $@)
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
`cp $< $@`; \
Browsersync: Also sync html files Change-Id: I55db923954fc0c59e1726640c980a539a12293ba Reviewed-on: https://gerrit.libreoffice.org/72455 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-17 04:26:47 -05:00
else \
`ln -sf $(abs_srcdir)/$< $@`; \
fi
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/src/%.js: $(srcdir)/src/%.js
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
Integrate browser-sync Tool to automatically reload used .css and .js files. To make it work symlinks are created instead of a copy if browsersync is enabled. 1. install: npm install -g browser-sync 2. use configure option: --enable-browsersync 3. remove loleaflet/dist directory 4. run server: LOOL_SERVE_FROM_FS=1 make run -j10 5. run browsersync: browser-sync start --config browsersync-config.js or make sync-writer Change-Id: Iebee1cc0b9a03bc866954ff33e3cb8a10b48e0af
2019-02-12 04:47:24 -06:00
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
`cp $< $@`; \
else \
`echo $< $@`; \
`ln -sf $(abs_srcdir)/$< $@`; \
fi
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/%.js: $(srcdir)/js/%.js
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
Integrate browser-sync Tool to automatically reload used .css and .js files. To make it work symlinks are created instead of a copy if browsersync is enabled. 1. install: npm install -g browser-sync 2. use configure option: --enable-browsersync 3. remove loleaflet/dist directory 4. run server: LOOL_SERVE_FROM_FS=1 make run -j10 5. run browsersync: browser-sync start --config browsersync-config.js or make sync-writer Change-Id: Iebee1cc0b9a03bc866954ff33e3cb8a10b48e0af
2019-02-12 04:47:24 -06:00
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
`cp $< $@`; \
else \
`ln -sf $(abs_srcdir)/$< $@`; \
fi
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/node_modules/%.js: $(builddir)/node_modules/%.js
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
@cp $< $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/$(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png: $(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png
Actually, let's ship both these jQuery themes. Change-Id: I3e546e155d50fb280fe12c31b8c33523ac8e9f11
2019-01-10 05:34:43 -06:00
@mkdir -p $(dir $@)
@cp $< $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/images/%.png: $(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png
Actually, let's ship both these jQuery themes. Change-Id: I3e546e155d50fb280fe12c31b8c33523ac8e9f11
2019-01-10 05:34:43 -06:00
@mkdir -p $(dir $@)
@cp $< $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/$(JQUERY_MINIFIED_IMAGE_PATH)/%.png: $(JQUERY_MINIFIED_IMAGE_PATH)/%.png
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
@cp $< $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/images/%.png: $(JQUERY_MINIFIED_IMAGE_PATH)/%.png
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
@cp $< $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/l10n/%: $(srcdir)/l10n/%
use Makefile to build loleaflet Concatenate and minify all javascript files in the release build but not in the debug build. Also, it is enabled to use a build directory Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7 Reviewed-on: https://gerrit.libreoffice.org/52802 Reviewed-by: pranavk <pranavk@collabora.co.uk> Tested-by: pranavk <pranavk@collabora.co.uk>
2018-04-12 14:57:00 -05:00
@mkdir -p $(dir $@)
Revert "configure:L10n: compile message catalog to binary format" This reverts commit 59241a2ea467992adadbacae00a15ec7fe0de2d9.
2019-03-15 11:27:27 -05:00
@cp $< $@
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
2017-11-10 00:00:06 -06:00
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/l10n/%.json: $(srcdir)/po/%.po
put back po->json make rule Change-Id: Idbd45a48f3215f36b68e444a83c4eb07ea37e1bb
2019-03-18 08:20:26 -05:00
@$(srcdir)/util/po2json.py $< -o $@
android: parameterize the Dist folder Now, It is possible to build lolealfet to assets folder directly Change-Id: Ie5f7de65bcd4d6e4ab5df2b2697b4c02cbbbef67 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92597 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-19 18:43:20 -05:00
$(DIST_FOLDER)/admin/%: $(srcdir)/admin/%
loleaflet: fix build in admin files Change-Id: I0e96b18e6319ce0d4456c16f0fce008e4e4c4966
2018-05-10 12:41:37 -05:00
@mkdir -p $(dir $@)
@cp $< $@
dist-hook and install-data-hook for loleaflet Also tell automake to use tar-pax instead to allow bigger file names (> 99). Change-Id: I1d910a08684e780c958c7edc9852432705d51b18
2017-01-04 08:08:33 -06:00
install-data-hook:
mkdir -p $(DESTDIR)$(pkgdatadir)/loleaflet; \
cp -ar dist/ $(DESTDIR)$(pkgdatadir)/loleaflet/;
loleaflet: import l10n.js library The file was imported from node_modules/l10n-for-node/l10n.js, the main reason is to analyze the source code, debug and patch if necessary To obtain the source code from npm repository make libs Change-Id: I7bd4d400c504f57a94566e187c6d26361aed8bd0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89043 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-02-19 08:17:31 -06:00
libs:
@mkdir -p $(abs_srcdir)/libs
@cd $(abs_srcdir)/libs \
&& $(call npm_source,$(NODE_MODULES_SRC))
New loleaflet toolbar
2016-02-08 10:20:05 -06:00
pot:
pot file update, to help automate the pootle connection Added more explanation in the README. Corrected template -> templates
2016-08-10 05:36:57 -05:00
xgettext --from-code=UTF-8 --keyword=_ --output=po/templates/loleaflet-ui.pot \
loleaflet: add rule to bundle admin files Change-Id: Id3d25855d697ad607ae30ffffa1a9c6f565b6e6d
2018-05-26 15:57:40 -05:00
admin/admin.strings.js \
loleaflet: isolate the admin build process Change-Id: Ib48ef2b0e6c778a65be949da1eb164cf5f87692d
2018-05-26 22:24:34 -05:00
admin/src/AdminSocketAnalytics.js \
admin/src/AdminSocketBase.js \
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketSettings.js \
admin/src/Util.js \
loleaflet: add new files for l10n to Makefile.am Change-Id: I836cd28ef284752c48bcecc36f16d38ac168bac3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-16 07:23:59 -05:00
src/control/ColorPicker.js \
enable l10n of Control.AlertDialog.js Change-Id: I841aa6b7ef02fd6681fc55f16976a38de69c54b6 Reviewed-on: https://gerrit.libreoffice.org/48061 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-01-17 09:55:11 -06:00
src/control/Control.AlertDialog.js \
loleaflet: src/control/Control.ContextMenu.js contains translatable strings Change-Id: I4010eb296a1771f0e8fbfa5078b4847193cfc188 Reviewed-on: https://gerrit.libreoffice.org/36491 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-04-12 15:22:49 -05:00
src/control/Control.ContextMenu.js \
l10n: add src/control/Control.DocumentRepair.js for string extraction to pot file
2016-09-20 02:52:24 -05:00
src/control/Control.DocumentRepair.js \
loleaflet: download widget skeleton for larger copy/paste data operation Change-Id: I64d8edc014241e94c45677185a935714b8eeb192
2019-06-24 07:32:43 -05:00
src/control/Control.DownloadProgress.js \
loleaflet: add new files for l10n to Makefile.am Change-Id: I836cd28ef284752c48bcecc36f16d38ac168bac3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-16 07:23:59 -05:00
src/control/Control.FormulaBar.js \
jsdialogs: UI Builder Change-Id: I6cfcae90542eca84d45a99b15dc97ed3356a0626 Reviewed-on: https://gerrit.libreoffice.org/79724 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-09-23 06:31:20 -05:00
src/control/Control.JSDialogBuilder.js \
Mobile language indicator and dialog Change-Id: I2358ac60a3ba1a0f177e9fa3f965b7043ab99559
2019-07-22 04:44:05 -05:00
src/control/Control.LanguageDialog.js \
loleaflet: enable l10n of menus
2016-05-23 15:49:11 -05:00
src/control/Control.Menubar.js \
loleaflet: add new files for l10n to Makefile.am Change-Id: I836cd28ef284752c48bcecc36f16d38ac168bac3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-16 07:23:59 -05:00
src/control/Control.MobileBottomBar.js \
src/control/Control.MobileTopBar.js \
jsdialogs: Mobile Wizard Change-Id: Ida2dc48d86ea4f28b08ec24a7638f27ad8633dbf Reviewed-on: https://gerrit.libreoffice.org/79723 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com>
2019-08-28 13:42:12 -05:00
src/control/Control.MobileWizard.js \
loleaflet: add new files for l10n to Makefile.am Change-Id: I836cd28ef284752c48bcecc36f16d38ac168bac3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-16 07:23:59 -05:00
src/control/Control.PresentationBar.js \
loleaflet: add new localizable files to Makefile.am and regenerate pot file Change-Id: I6a91186eba13da6745c2cddb6e96b7b148d797dc
2017-03-13 07:03:00 -05:00
src/control/Control.Scroll.Annotation.js \
loleaflet: add new files for l10n to Makefile.am Change-Id: I836cd28ef284752c48bcecc36f16d38ac168bac3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-16 07:23:59 -05:00
src/control/Control.SearchBar.js \
src/control/Control.SheetsBar.js \
Move signing bar to separate file In the future should be merged with Signing.js Change-Id: I3b5db8b20dcead4e0f1f80643de474fdba8245af Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92348 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-16 04:13:21 -05:00
src/control/Control.SigningBar.js \
loleaflet: add new files for l10n to Makefile.am Change-Id: I836cd28ef284752c48bcecc36f16d38ac168bac3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-16 07:23:59 -05:00
src/control/Control.StatusBar.js \
loleaflet: bccu#1649 l10n of Admin Console
2016-05-31 16:26:02 -05:00
src/control/Control.Tabs.js \
Fix path (again) After 59306e2f4c9b6d9ea2d669b5b9ae45573bbbc160 "loleaflet: rename toolbar.js to Control.Toolbar.js" Change-Id: Iaa5556da289e23b8942a020b75a805c87dc03c70
2019-04-01 03:27:32 -05:00
src/control/Control.Toolbar.js \
Move top toolbar to separate file Change-Id: I0465b32af1fbb2534aa6db41342df3993b7837bf Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92349 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-16 06:19:55 -05:00
src/control/Control.TopToolbar.js \
loleaflet: add new files for l10n to Makefile.am Change-Id: I836cd28ef284752c48bcecc36f16d38ac168bac3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-16 07:23:59 -05:00
src/control/Control.UserList.js \
Introduce UIManager Change-Id: I944622a352aae7951f3e69286bb163645fa23276 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92405 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-16 11:21:44 -05:00
src/control/Control.UIManager.js \
Move DocumentNameInput to separate file Change-Id: I20b5620269b46902a612d2b43346d3b02c3636cd Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92622 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-20 06:55:35 -05:00
src/control/Control.DocumentNameInput.js \
notebookbar: Create toolbars depending on settings Change-Id: I66a03e9d8e9104b9f7868f24601525d502734e0e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93051 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-21 07:10:38 -05:00
src/control/Control.Notebookbar.js \
notebookbar: separate file for each app Change-Id: If61ed762a3dd55c0cef7d58b7a3b1ddf8276cce3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93304 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-05-01 05:19:29 -05:00
src/control/Control.NotebookbarWriter.js \
src/control/Control.NotebookbarCalc.js \
notebookbar: separate configuration for impress Change-Id: Ibd7cdd9302f9033aca0de908ade036fa2dc50ede Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93650 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-05-07 04:33:18 -05:00
src/control/Control.NotebookbarImpress.js \
notebookbar: use builder to create Change-Id: If8bbbaba66aba887587b8679f7a1ac9f5ccb4490 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93052 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-22 04:29:31 -05:00
src/control/Control.NotebookbarBuilder.js \
loleaflet: update list of localizable files Change-Id: I1542466cbc8165da93f28ab6378dad456a3d8998
2018-11-15 04:13:06 -06:00
src/control/Ruler.js \
Updated pot files Change-Id: I560f9eff4556941d211d03080237d2cf0599aa6f
2019-09-17 03:52:53 -05:00
src/control/Signing.js \
loleaflet: l10n of src/control/Toolbar.js
2016-06-09 08:26:08 -05:00
src/control/Toolbar.js \
loleaflet: mark-up strings for l10n in src/map/Map.js
2016-05-31 09:36:21 -05:00
src/core/Socket.js \
loleaflet: update list of localizable files Change-Id: I1542466cbc8165da93f28ab6378dad456a3d8998
2018-11-15 04:13:06 -06:00
src/errormessages.js \
loleaflet: add new localizable files to Makefile.am and regenerate pot file Change-Id: I6a91186eba13da6745c2cddb6e96b7b148d797dc
2017-03-13 07:03:00 -05:00
src/layer/marker/Annotation.js \
Rename misleading ClipboardContainer -> TextInput Change-Id: Idb5ccb9959e0c77dfcdbb2793330bb048db0f0f8
2019-11-15 10:26:52 -06:00
src/layer/marker/TextInput.js \
Updated pot files Change-Id: I560f9eff4556941d211d03080237d2cf0599aa6f
2019-09-17 03:52:53 -05:00
src/layer/tile/CalcTileLayer.js \
src/layer/tile/ImpressTileLayer.js \
loleaflet: add new localizable files to Makefile.am and regenerate pot file Change-Id: I6a91186eba13da6745c2cddb6e96b7b148d797dc
2017-03-13 07:03:00 -05:00
src/layer/tile/TileLayer.js \
Updated pot files Change-Id: I560f9eff4556941d211d03080237d2cf0599aa6f
2019-09-17 03:52:53 -05:00
src/layer/tile/WriterTileLayer.js \
Start of separating clipboard code to Clipboard.js. Change-Id: I59ba0c093002cb60b13d2f71a4801e76f6a94b2a
2019-06-22 12:42:48 -05:00
src/map/Clipboard.js \
Updated pot files Change-Id: I560f9eff4556941d211d03080237d2cf0599aa6f
2019-09-17 03:52:53 -05:00
src/map/Map.js \
loleaflet: update list of localizable files Change-Id: I1542466cbc8165da93f28ab6378dad456a3d8998
2018-11-15 04:13:06 -06:00
src/map/handler/Map.FileInserter.js \
src/map/handler/Map.WOPI.js
loleaflet: bccu#1649 l10n of Admin Console
2016-05-31 16:26:02 -05:00
fix file paths 'make pot' Change-Id: I135c05955e4b8752d527838162f4a7ed345fcc6d
2018-05-11 09:38:47 -05:00
html2po --pot --input=html/loleaflet-help.html --output=po/templates/loleaflet-help.pot --duplicates=merge
New loleaflet toolbar
2016-02-08 10:20:05 -06:00
Extract iOS strings with prop2po from Translate Toolkit + update pots Change-Id: I0b7a7f2b9dd9bcbc52117fbe3e1009cc5f629ea2
2019-04-13 14:59:41 -05:00
prop2po --pot --personality=strings --encoding=utf8 --input=$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings --output=po/templates/ios.pot
add plist2pot.sh to Makefile Change-Id: I7cbd25ccb6ceaa4ce5a90eca1db2d7d5631edbe7
2019-03-29 16:34:42 -05:00
New loleaflet toolbar
2016-02-08 10:20:05 -06:00
l10n: pot
pot file update, to help automate the pootle connection Added more explanation in the README. Corrected template -> templates
2016-08-10 05:36:57 -05:00
for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done
for i in po/help-*.po; do pot2po --input=po/templates/loleaflet-help.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done
Extract iOS strings with prop2po from Translate Toolkit + update pots Change-Id: I0b7a7f2b9dd9bcbc52117fbe3e1009cc5f629ea2
2019-04-13 14:59:41 -05:00
for i in po/ios-*.po;do pot2po --input=po/templates/ios.pot --template=$$i --output=$$i.new; mv $$i.new $$i; done
# FIXME: po2prop gives 'string index out of range' error.
# for lang in ca cs da de el es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
# mkdir -p $(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/$$lang.lproj; \
# po2prop --personality=strings --encoding=utf8 --template=$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings --input=po/ios-$$lang.po --output=$(abs_top_srcdir)/ios/Mobile/Resources/Settings.bundle/$$lang.lproj/Root.strings; \
# done
New loleaflet toolbar
2016-02-08 10:20:05 -06:00
Unify loleaflet's make with top level make Top level make would now build loleaflet too if necessary. Respect value of ENABLE_DEBUG and if present add debug-info to generated js bundles too. Add new rule, clean-local in loleaflet. Change-Id: I3a9b727824f2877fc72719a8bfdeebed5448cb7d
2016-12-12 06:23:32 -06:00
clean-local:
loleaflet: fix when cleaning the dist folder Change-Id: If4abbc0acbc15b99d65fe6db488ab300378ec663 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92983 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-27 10:20:10 -05:00
@rm -rf $(DIST_FOLDER)
loleaflet: makefile: set default INTERMEDIATE_DIR var and configurable. Change-Id: I4f1b111e1f9ce4e8c9e0b13755dce04f99672e1e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94981 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-05-27 10:16:08 -05:00
@rm -rf $(INTERMEDIATE_DIR)
loleaflet: generate jsconfig.json Very useful with vim plugin YouCompleteMe with a TSServer-based completion engine for JavaScript and TypeScript Change-Id: Ib2961940f171691e10c2af10ebb911283ee1ff20 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91861 Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-05 08:47:27 -05:00
@rm -f $(abs_srcdir)/jsconfig.json
@rm -f $(abs_srcdir)/admin/jsconfig.json
Unify loleaflet's make with top level make Top level make would now build loleaflet too if necessary. Respect value of ENABLE_DEBUG and if present add debug-info to generated js bundles too. Add new rule, clean-local in loleaflet. Change-Id: I3a9b727824f2877fc72719a8bfdeebed5448cb7d
2016-12-12 06:23:32 -06:00
makefile: generate an index (ctag) file for the JavaScript language Change-Id: I495c7665786a47cfb007260368084a01c4163ea7 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/85766 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Henry Castro <hcastro@collabora.com>
2019-12-23 11:59:16 -06:00
ctags:
@$(CTAGS) --language-force=JavaScript $(LOLEAFLET_JS_SRC) $(srcdir)/js/global.js
loleaflet: generate jsconfig.json Very useful with vim plugin YouCompleteMe with a TSServer-based completion engine for JavaScript and TypeScript Change-Id: Ib2961940f171691e10c2af10ebb911283ee1ff20 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91861 Tested-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-05 08:47:27 -05:00
$(abs_srcdir)/jsconfig.json:
@printf "{\n \
\"compilerOptions\" : {},\n \
\"include\" : [\"src/**/*\", \"js/**/*\"],\n \
\"exclude\" : [\"node_modules\", \"admin/**/*\"]\n}" > $@
$(abs_srcdir)/admin/jsconfig.json:
@printf "{\n \
\"compilerOptions\" : {},\n \
\"include\" : [\"./**/*\"],\n \
\"exclude\" : [\"node_modules\"]\n}" > $@
jsconfig: $(abs_srcdir)/jsconfig.json $(abs_srcdir)/admin/jsconfig.json
Reference in a new issue Copy permalink