[Libreoffice-commits] online.git: configure.ac ios/README

[Tor Lillqvist (via logerrit)]

 configure.ac |    3 ++-
 ios/README   |   27 ++-------------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

New commits:
commit 48a5397ff414fbda982ecb60166b691676e4eadf
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue May 26 09:41:09 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue May 26 09:02:14 2020 +0200

    Run the 'npm install' at configure time only on Linux
    
    I don't want to make it necessary to have npm on macOS (in the case of
    building the iOS app, otherwise Online is Linux-only). I still want to
    use the method where the JS bits are built on a Linux machine and
    loleaflet/dist is copied over to the Mac where you build the iOS app.
    
    Remove the apparently never seriously used instructions for the other
    way from ios/README. If somebody actually *uses* that way for real,
    for a longer time, then please reinstate them, and modify
    configure.ac, etc.
    
    Change-Id: I22a8ca4746907bb11aad11d7c995b0de2fdbc157
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94815
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index f634ff697..124bfe983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1106,7 +1106,8 @@ fi
 
 AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
 
-AC_CONFIG_COMMANDS_PRE([echo Installing node modules packages... && (cd loleaflet && npm install)])
+AC_CONFIG_COMMANDS_PRE([AS_IF([test `uname -s` = "Linux"],
+                              [echo Installing node modules packages... && (cd loleaflet && npm install)])])
 
 AC_OUTPUT
 
diff --git a/ios/README b/ios/README
index cc213758d..29c86cdbb 100644
--- a/ios/README
+++ b/ios/README
@@ -54,12 +54,7 @@ open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10
 autogen.sh, configure, or make, or open the Mobile Xcode project there
 yet. We call this the app folder.
 
-4) Here the instructions split. tml uses the first way, mmeeks tried
-to use the second way. The paths will join again at step 4.
-
-EITHER:
-
-4a) On a Linux machine: Do a separate clone of the online repo, run
+4) On a Linux machine: Do a separate clone of the online repo, run
 autogen.sh, and configure it with the --enable-iosapp option:
 
 ./configure --enable-iosapp --with-app-name="My Own Mobile LibreOffice"
@@ -88,28 +83,10 @@ safest to install it somewhere that is not in your $PATH. Let's say
 in $PATH, is less risky.)
 
 Run the autogen.sh script in the app folder, with GNU libtool
-available:
+available, for instance:
 
 PATH=/opt/libtool/bin:$PATH ./autogen.sh
 
-OR:
-
-4b) Install brew: https://brew.sh/
-
-   Then:
-
-brew install libtool npm
-./autogen.sh
-sudo python -m ensurepip --default-pip
-sudo pip install polib lxml
-make ; make
-
-Then run:
-
-./autogen.sh
-
-Now the instructions join again:
-
 5) In the app folder from step 2, edit the
 ios/Mobile.xcodeproj/project.pbxproj file in your favourite text
 editor. Change LOSRCDIR and all instances of "../ios-device" to refer