configure.ac | 26 +++----------------------- loleaflet/Makefile.am | 7 ++++++- 2 files changed, 9 insertions(+), 24 deletions(-)
New commits: commit 8e1cf47112b5aa238deacb2975b1141dbaa4c782 Author: Henry Castro <[email protected]> AuthorDate: Thu May 28 08:17:16 2020 -0400 Commit: Henry Castro <[email protected]> CommitDate: Thu May 28 14:30:22 2020 +0200 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 <[email protected]> Reviewed-by: Henry Castro <[email protected]> diff --git a/configure.ac b/configure.ac index 124bfe983..3b2edb7c1 100644 --- a/configure.ac +++ b/configure.ac @@ -992,31 +992,13 @@ fi AC_SUBST(ENABLE_SETCAP) - -tryLinkFile () { - if test ! -r "$1"; then - AC_MSG_ERROR(["$1: file not found"]) - fi - - rm -f $2 - ln -s "$1" "$2" 2>/dev/null || - ln "$1" "$2" 2>/dev/null || - cp -p "$1" "$2" || - AC_MSG_ERROR(["cannot link or copy $1 to $2"]) -} - -if test "$srcdir" != '.'; then - mkdir -p loleaflet - tryLinkFile $srcdir/loleaflet/package.json loleaflet/package.json - tryLinkFile $srcdir/loleaflet/archived-packages loleaflet/archived-packages - cp -p $srcdir/loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json -fi - AC_CONFIG_LINKS([discovery.xml:discovery.xml]) AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu]) +AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json]) AC_CONFIG_LINKS([cypress_test/package.json:cypress_test/package.json]) AC_CONFIG_LINKS([cypress_test/cypress.json:cypress_test/cypress.json]) AC_LINK_FILES([cypress_test/plugins], [cypress_test/plugins]) +AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages]) AC_LINK_FILES([cypress_test/eslint_plugin], [cypress_test/eslint_plugin]) APP_BRANDING_DIR= @@ -1087,6 +1069,7 @@ AC_CONFIG_FILES([Makefile gtk/Makefile test/Makefile loleaflet/Makefile + loleaflet/npm-shrinkwrap.json loolwsd.spec loolwsd.xml debian/loolwsd.postinst]) @@ -1106,9 +1089,6 @@ fi AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh]) -AC_CONFIG_COMMANDS_PRE([AS_IF([test `uname -s` = "Linux"], - [echo Installing node modules packages... && (cd loleaflet && npm install)])]) - AC_OUTPUT AC_LANG_POP diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 8addfff8c..1959b1204 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -1,6 +1,5 @@ MAKEFLAGS = --no-builtin-rules CTAGS = ctags -CONFIG_STATUS_DEPENDENCIES=$(builddir)/node_modules L10N_PO = $(wildcard $(srcdir)/po/*.po) @@ -438,6 +437,12 @@ node_modules: package.json archived-packages @npm install @touch node_modules +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status node_modules + @case '$?' in \ + *node_modules*) \ + touch Makefile;; \ + esac; + $(DIST_FOLDER)/device-%.css: $(srcdir)/css/device-%.css @mkdir -p $(dir $@) @if test -z '$(ENABLE_BROWSERSYNC)'; then \ diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json.in similarity index 100% rename from loleaflet/npm-shrinkwrap.json rename to loleaflet/npm-shrinkwrap.json.in _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
