[Libreoffice-commits] online.git: ios/README
ios/README | 56 ++-- 1 file changed, 46 insertions(+), 10 deletions(-) New commits: commit 508a659232a45795981d8865f19ac2f997615d07 Author: Tomaž Vajngerl AuthorDate: Mon Jun 3 15:04:53 2019 +0900 Commit: Tomaž Vajngerl CommitDate: Mon Jun 3 15:04:53 2019 +0900 Update ios/README - instructions how to build POCO - fixes the changes made since Change-Id: I157d23ce914b8afb06ccf6e6c33f8aa12661d1bb diff --git a/ios/README b/ios/README index be2f1062f..388377689 100644 --- a/ios/README +++ b/ios/README @@ -13,24 +13,56 @@ cross-compiling LibreOffice.) Of course there is no requirement to use those --enable options; as a minimum, just --with-distro=LibreOfficeiOS should work. +for use with the SIMULATOR you can use: +--with-distro=LibreOfficeiOS_Sim + +Debug is implied when compiling for use in the simulator, but if you +don't want that, then edit "distro-configs/LibreOfficeiOS_Sim.conf" + This will produce a large number of static archives (.a) here and there in instdir and workdir, but no app that can be run as such. (You can see a list of them in workdir/CustomTarget/ios/ios-all-static-libs.list) -2) Do a separate clone of the online repo on macOS, but don't do any +2) Build LOOL Dependencies + +POCO LIBRARY + +2.1) Get the source poco library at https://pocoproject.org/download.html +2.2) Unpack + +2.3a) Compile for DEVICE (arm64) use: +./configure --config=iPhone --static --no-tests --no-samples --omit=Data/ODBC,Data/MySQL --prefix=$HOME/poco-ios-arm64 +make POCO_TARGET_OSARCH=arm64 -s -j4 +make POCO_TARGET_OSARCH=arm64 install + +2.3b) Compile for SIMULATOR (x86_64) use: +./configure --config=iPhoneSimulator --static --no-tests --no-samples --omit=Data/ODBC,Data/MySQL --prefix=$HOME/poco-ios-x64 +make POCO_TARGET_OSARCH=x86_64 -s -j4 +make POCO_TARGET_OSARCH=x86_64 install + +This will install the poco static libraries and headers to your $home +directory into poco-ios-arm64 (and poco-ios-x64) directory. You can +change the directory to your wishes, but by installing it this way into +a directory in $HOME it doesn't polute your root directories, doesn't +need root permissions and can be removed easily. + +If compiler can't find you need to install: +open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg + +3) Do a separate clone of the online repo on macOS, but don't do any autogen.sh, configure, or make, or open the Mobile Xcode project there yet. We call this the app folder. -3) Here the instructions split. tml uses the first way, mmeeks tried +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: -3a) On a Linux machine: Do a separate clone of the online repo, run +4a) 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-iosapp-name="My Own Mobile LibreOffice" +./configure --enable-iosapp --with-app-name="My Own Mobile LibreOffice" Then run make. That will produce files in loleaflet/dist, nothing else. Copy those to the corresponding folder in the app folder from @@ -62,7 +94,7 @@ PATH=/opt/libtool/bin:$PATH ./autogen.sh OR: -3b) Install brew: https://brew.sh/ +4b) Install brew: https://brew.sh/ Then: @@ -78,25 +110,29 @@ Then run: Now the instructions join again: -4) In the app folder from step 2, edit the +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 the the LibreOffice core source directory from step 1. -5) In the app folder, run: +6) In the app folder, run: + +for DEVICE: +./configure --enable-iosapp --with-app-name="My Own Mobile LibreOffice" --with-lo-builddir=$HOME/lode/dev/LO --with-poco-includes=$HOME/poco-ios-arm64/include --with-poco-libs=$HOME/poco-ios-arm64/lib -./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice" --with-lo-builddir=$HOME/lo/ios --with-poco-includes=/opt/ios-poco/include --with-poco-libs=/opt/ios-poco/lib +for SIMULATOR: +./configure --enable-iosapp --with-app-name="My Own Mobile LibreOffice" --with-lo-builddir=$HOME/lode/dev/LO --with-poco-includes=$HOME/poco-ios-x64/include --with-poco-libs=$HOME/poco-ios-x64/lib The configure script puts the app name as the CFBundleDisplayName property into the ios/Mobile/Info.plist file, and sets up some symbolic links that point to the LibreOffice core source and build directories (which typically will be the same, of course). -6) Before opening the Xcode project for the first time +7) Before opening the Xcode project for the first time - seriously consider disabling source code indexing, this spawns a vast number of git processes, and consumes huge amounts of CPU & memory:
[Libreoffice-commits] online.git: ios/README
ios/README | 71 ++--- 1 file changed, 49 insertions(+), 22 deletions(-) New commits: commit 420bedaadca9658559d415ab1689f92bc7fba4d6 Author: Tor Lillqvist AuthorDate: Thu May 16 02:14:23 2019 +0300 Commit: Tor Lillqvist CommitDate: Thu May 16 02:17:54 2019 +0300 Edit ios/README Point out that in my way, you will (sadly) need GNU libtool for the running of the autogen.sh script, even if not actually at all otherwise. (We should really try to get rid of the need for libtool. A minor amount of hacking to loleaflet/Makefile.am should be enough.) diff --git a/ios/README b/ios/README index 4ca3b3a48..be2f1062f 100644 --- a/ios/README +++ b/ios/README @@ -18,24 +18,51 @@ there in instdir and workdir, but no app that can be run as such. (You can see a list of them in workdir/CustomTarget/ios/ios-all-static-libs.list) -2) Do a separate clone of the online repo on macOS, but don't run any -make or open the Mobile project there yet. +2) Do a separate clone of the online repo on macOS, but don't do any +autogen.sh, configure, or make, or open the Mobile Xcode project there +yet. We call this the app folder. -3) Either: do a separate clone of the online repo on Linux, run autogen.sh, -and configure it with the --enable-iosapp option: +3) 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: + +3a) 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-iosapp-name="My Own Mobile LibreOffice" Then run make. That will produce files in loleaflet/dist, nothing -else. Copy those to the corresponding folder in the online clone -from step 2. This is what I do: +else. Copy those to the corresponding folder in the app folder from +step 2. This is how I do it: + +make clean && make && tar cf - loleaflet/dist | ssh misan.local 'cd lo/online-ios-device && rm -rf loleaflet/dist && tar xvf -' + +where misan.local is the macOS machine where I build the app, and +~/lo/online-ios-device is the app folder from step 2. + +Then back to the Mac: + +As you were able to build LibreOffice in step 1, you must already have +GNU autoconf installed on the Mac. Install also GNU automake and +libtool. Preferrably from sources, to make sure a potential +installation of brew or similar will not pollute your environment with +unknown stuff. + +As GNU libtool will be needed only for a very minimal part of the +build (running the autogen.sh script, but not anything else), it's +safest to install it somewhere that is not in your $PATH. Let's say +/opt/libtool. (Installing Automake in the default /usr/local, which is +in $PATH, is less risky.) -make clean && make && tar cf - loleaflet/dist | ssh misan.local 'cd lo/online-ios-device && tar xvf -' +Run the autogen.sh script in the app folder, with GNU libtool +available: -where misan.local is the macOS machine where I build the app, in the -~/lo/online-ios-device folder. +PATH=/opt/libtool/bin:$PATH ./autogen.sh -3) Or: install brew: https://brew.sh/ +OR: + +3b) Install brew: https://brew.sh/ Then: @@ -45,31 +72,31 @@ sudo python -m ensurepip --default-pip sudo pip install polib lxml make ; make -4) In the online folder form 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 the the -LibreOffice core source directory from step 1. - Then run: ./autogen.sh -and +Now the instructions join again: + +4) 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 +the the LibreOffice core source directory from step 1. + +5) In the app folder, run: ./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice" --with-lo-builddir=$HOME/lo/ios --with-poco-includes=/opt/ios-poco/include --with-poco-libs=/opt/ios-poco/lib The configure script puts the app name as the CFBundleDisplayName -property into the ios/Mobile/Info.plist file, and set up some +property into the ios/Mobile/Info.plist file, and sets up some symbolic links that point to the LibreOffice core source and build -directories (which can be the same, of course). +directories (which typically will be the same, of course). -4) Before opening the Xcode project for the first time +6) Before opening the Xcode project for the first time - seriously consider disabling source code indexing, this spawns a vast number of git processes, and consumes huge amounts of CPU & memory: Xcode -> Preferences, "Source Control", uncheck "Enable Source Control" -5) Now you can open the Mobile Xcode project, build it, and run it. +7) Now you can open the Mobile Xcode project, build
[Libreoffice-commits] online.git: ios/README
ios/README | 11 --- 1 file changed, 11 deletions(-) New commits: commit 949ca42221c5bc18c686823b18be10fee4e2673e Author: Tor Lillqvist AuthorDate: Fri Mar 15 09:48:51 2019 +0200 Commit: Tor Lillqvist CommitDate: Fri Mar 15 09:48:51 2019 +0200 The iOS app now works again (Except that the tunnelled dialogs don't show up, but they don't show up in a browser connected to a normal Online 'make run' either at the moment.) Change-Id: Ic054b415d5d78572338e20da711a4285584ba330 diff --git a/ios/README b/ios/README index 1aeabc457..4ca3b3a48 100644 --- a/ios/README +++ b/ios/README @@ -1,14 +1,3 @@ - - - - - -===> Note that at the moment the iOS app does not work if built from the master branch. <=== - - - - - How to build the iOS app: 1) First you need to build the LibreOffice core code for iOS. Put in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/README
ios/README | 11 +++ 1 file changed, 11 insertions(+) New commits: commit f60618f0ba2feb738c322c4fe6b2ef38346c538f Author: Tor Lillqvist AuthorDate: Fri Mar 8 13:24:54 2019 +0200 Commit: Tor Lillqvist CommitDate: Fri Mar 8 13:24:54 2019 +0200 Add important note Change-Id: I9f4a6c8f01c72ec40a38f44a7ac23d22a46d2d83 diff --git a/ios/README b/ios/README index 4ca3b3a48..1aeabc457 100644 --- a/ios/README +++ b/ios/README @@ -1,3 +1,14 @@ + + + + + +===> Note that at the moment the iOS app does not work if built from the master branch. <=== + + + + + How to build the iOS app: 1) First you need to build the LibreOffice core code for iOS. Put in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/README
ios/README |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a8de971a59a92687d5b29c69e2dcc1533aa5d9f0 Author: Tor Lillqvist AuthorDate: Fri Jan 25 12:02:45 2019 +0200 Commit: Tor Lillqvist CommitDate: Fri Jan 25 12:02:52 2019 +0200 Fix a couple of typos Change-Id: Icfaca47c14ad1c76ed45d2ccb362f5f7405c4ca4 diff --git a/ios/README b/ios/README index d32eb40fd..29f377cba 100644 --- a/ios/README +++ b/ios/README @@ -33,7 +33,7 @@ from step 2. This is what I do: make clean && make && tar cf - loleaflet/dist | ssh misan.local 'cd lo/online-ios-device && tar xvf -' where misan.local is the macOS machine where I build the app, in the -~lo/online-ios-device folder. +~/lo/online-ios-device folder. 4) In the online folder form step 2, edit the ios/Mobile.xcodeproj/project.pbxproj file in your favourite text @@ -52,7 +52,7 @@ and The configure script puts the app name as the CFBundleDisplayName property into the ios/Mobile/Info.plist file, and set up some -symbolic links that point to the LIbreOffice core source and build +symbolic links that point to the LibreOffice core source and build directories (which can be the same, of course). 4) Before opening the Xcode project for the first time ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/README
ios/README |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 3be0fd9621852992bfadd7cbc5f26a26af9cf9a3 Author: Michael Meeks AuthorDate: Thu Jan 24 14:21:28 2019 + Commit: Michael Meeks CommitDate: Thu Jan 24 14:21:52 2019 + Xcode advice. Change-Id: Ic323bb2c640cc811250fb2d28e88d50b3d663a0d diff --git a/ios/README b/ios/README index dbd802339..d32eb40fd 100644 --- a/ios/README +++ b/ios/README @@ -55,4 +55,11 @@ property into the ios/Mobile/Info.plist file, and set up some symbolic links that point to the LIbreOffice core source and build directories (which can be the same, of course). -4) Now you can open the Mobile Xcode project, build it, and run it. +4) Before opening the Xcode project for the first time + - seriously consider disabling source code indexing, this + spawns a vast number of git processes, and consumes huge + amounts of CPU & memory: + + Xcode -> Preferences, "Source Control", uncheck "Enable Source Control" + +5) Now you can open the Mobile Xcode project, build it, and run it. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/README loleaflet/html loleaflet/Makefile.am loleaflet/src
ios/README |2 +-
loleaflet/Makefile.am|1 +
loleaflet/html/loleaflet.html.m4 |3 ++-
loleaflet/src/control/Toolbar.js |7 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit fe3832f3c6a91c1cc28ea522c44cf7fbd95c98f1
Author: Tor Lillqvist
AuthorDate: Tue Nov 27 00:35:57 2018 +0200
Commit: Tor Lillqvist
CommitDate: Tue Nov 27 00:35:57 2018 +0200
Use --with-iosapp-name to set the name displayed in the Help>About dialog
Change-Id: I04b0e7c152ee69b038ec30549c203a54eecf4780
diff --git a/ios/README b/ios/README
index 525d8c9b4..dbd802339 100644
--- a/ios/README
+++ b/ios/README
@@ -24,7 +24,7 @@ make or open the Mobile project there yet.
3) Do a separate clone of the online repo on Linux, run autogen.sh,
and configure it with the --enable-iosapp option:
-./configure --enable-iosapp
+./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice"
Then run make. That will produce files in loleaflet/dist, nothing
else. Copy those to the corresponding folder in the online clone
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1e9d9ca4a..51ff68bc0 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -224,6 +224,7 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
-DIOSAPP=$(ENABLE_IOSAPP) \
-DGTKAPP=$(ENABLE_GTKAPP) \
+ -DMOBILEAPPNAME="$(MOBILE_APP_NAME)" \
-DLOLEAFLET_CSS="$(subst
$(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(GLOBAL_JS)
$(NODE_MODULES_JS) \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 5ac502fcf..a7625742c 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -160,7 +160,8 @@ ifelse(MOBILEAPP,[true],
dnl# For use in conditionals in JS: window.ThisIsAMobileApp,
window.ThisIsTheiOSApp,
dnl# and window.ThisIsTheGtkApp
ifelse(MOBILEAPP,[true],
- [window.ThisIsAMobileApp = true;],
+ [window.ThisIsAMobileApp = true;
+ window.MobileAppName='MOBILEAPPNAME'],
[window.ThisIsAMobileApp = false;]
)
ifelse(IOSAPP,[true],
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index debc090d6..bdbf2a0d5 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -245,7 +245,12 @@ L.Map.include({
// Move the div sitting in 'body' as vex-content and make it
visible
var content = $('#about-dialog').clone().css({display:
'block'});
// fill product-name and product-string
- var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online';
+ var productName;
+ if (window.ThisIsAMobileApp) {
+ productName = window.MobileAppName;
+ } else {
+ productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online';
+ }
content.find('#product-name').text(productName);
var productString = _('This version of %productName is powered
by');
content.find('#product-string').text(productString.replace('%productName',
productName));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
