Commit Graph
49 Commits
Author SHA1 Message Date
Tor Lillqvist 3d495a867a Fix editing mistake for iOS build
Spelling dictionaries go into a separate directory.

Change-Id: Ia8bc14d8e3320533c35a70884f7b4cf190e19fe4
2021-03-25 15:30:12 +02:00
Tor Lillqvist 89af24074e tdf#124173: Enable thesauruses in the iOS app
Build our lnth library and the external mythes library. Install
thesauruses for the app's Xcode project to pick up and include in the
app bundle. Look for them in the place where they will end up.

To get thesauruses you need to configure with --with-myspell-dicts.

Change-Id: I2d850ca3c821c5c764cb061340a265440d04e41b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113066
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113073
Tested-by: Tor Lillqvist <tml@collabora.com>
2021-03-25 09:06:39 +01:00
Tor Lillqvist cb6ba06d28 tdf#124909: Use the myspell dictionary for Swiss German on iOS
The iOS system German dictionary is not good for Swiss German. (And it
doesn't even claim to be, it says it is for de_DE.) The system German
dictionary accepts 'ß' but that is not used in Swiss German, 'ss' is
always used instead.

Build the spell library for iOS, too, and don't assume that the system
de_DE dictionary would be usable for de_CH and de_LI. Copy those
dictionaries for inclusion in the iOS app bundle.

Change-Id: I0f8020812221024756c792bddc16a707de35b827
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112635
2021-03-17 13:56:50 +01:00
Stephan Bergmann e30b049197 Remove BuildVersion also from Android and iOS version ini files
...after 5fdf2009d2 "tdf#134522 remove
--with-build-version ./configure flag", 00fa759dc9
"tdf#135133: Don't try to read BuildVersion", and
6ee46adb44 "Remove BuildVersion from installation
set version ini files" already removed it from anywhere else

Change-Id: I42ccf35d6952ad0a826517ecadfe0ebb3bb704a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101003
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19 21:42:59 +02:00
Tor Lillqvist b31d936944 Use xcrun python3 to find the python3 also on Macs with older Xcode
There is no /usr/bin/python3 on those. With a current Xcode, it is the
python3 that comes with Xcode that /usr/bin/python3 runs anyway.

Change-Id: Iaee3d030337d6dfc37b67852a492b054fb4b9fee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96062
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96858
Tested-by: Jenkins
2020-06-22 17:57:51 +02:00
Tor Lillqvist 0063e7b676 Add share/fingerprint to the iOS app
I once noticed a message "Failed to open config file
'/private/var/containers/.../Mobile.app/share/fingerprint/fpdb.conf'",
so clearly it is needed in some situations.

Change-Id: Ie5af6152f7955f6b439ea53d75b4c603bf82c5df
2020-03-26 15:03:31 +02:00
Tor Lillqvist 086be36614 Move the "registry" directory to be under "share" on iOS, too
Necessary in order to be more like on other platforms. There is an
upcoming change in the online repo that hardcodes that. (There was no
specific reason why we had "registry" directly in the app bundle on
iOS, just some historical randomness.)

Change-Id: Iafcd54598805cb5adaec09b30d32dc51a3f4554e
2020-02-17 15:56:02 +02:00
Luboš Luňák 0adc9b615f GBUILD_TRACE, support for finding out where the build time is spent
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.

Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-16 14:49:45 +01:00
Tor Lillqvist dd49483be3 Use correct directory for some data files on iOS: share/filter, not filter
Change-Id: Idd7d675872b73454d78576ed231fe90644dbe4c5
Reviewed-on: https://gerrit.libreoffice.org/78142
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/78999
2019-10-07 15:02:01 +03:00
Tor Lillqvist d418eaed30 tdf#126966: The share/palette folder was missing from the iOS app
Maybe it would be good to simply include all of share as such, without
trying to pick only what is actually needed? Must investigate.

Change-Id: Ide991334fe4bbe2b1e9807b8dba2b1e635e4f469
Reviewed-on: https://gerrit.libreoffice.org/78292
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-08-30 13:28:13 +02:00
Tor Lillqvist 7811a0e581 tdf#124449: We need also share/gallery for the iOS app
I wonder wheter we should just include all of instdir/share. Seems
that I have to add more and more of it all the time anyway. I don't
remember why I thought (many years ago) that an app would need just a
subset. (Maybe I thought that an app would not, at least not
initially, have functionality that would use most of the stuff in
shre. But that has changed now.)

Change-Id: I62f935e3ab9c4709373fad11ed120ecca033b4aa
2019-04-12 15:36:19 +03:00
Tor Lillqvist fd2f43e05b Just include all fonts from instdir/share/fonts in the iOS app
That is apparently what we want.

Change-Id: I900c26873de02495cac7918b0c453f4fdcb6c3e6
2019-03-25 19:07:59 +02:00
Tor Lillqvist 6edbf6015e tdf#124168: The share/template folder is needed in the iOS app
Otherwise we get a warning dialog about a missing
internal/idxexample.odt when inserting a table of contents.

Change-Id: Id30be100906ea3292b9acd9e983ef7ae39ef63a2
2019-03-20 23:46:41 +02:00
Tor Lillqvist 6088eeb6ea We need share/theme_definitions in the iOS app
Change-Id: I460a71f363eb3b7f89786b8bd02f4b8f9521f4c7
2019-03-11 23:33:33 +02:00
Tor Lillqvist 9f8373817e Current ICU version is 63
Change-Id: I126dbbec9fb6cbb19f848d8317002c69b407a36b
2019-02-28 20:08:06 +02:00
Tor Lillqvist 6fcf55e293 Prepare to bundle the Liberation fonts with the iOS app
The way the iOS app is built (over in the online repo), any
"resources" to be included need to be copied into the
workdir/CustomTarget/ios folder.

Change-Id: Ibac15b03dc447d6649e03404fe9a68ef3b4881b9
2018-11-27 16:07:27 +02:00
Tor Lillqvist 27e517b2e5 Fill buildid in versionrc for iOS with the git HEAD hash
Previously it tried to use a BUILDID Make variable that did not exist.

Change-Id: Ie31eb3928c69dc52fcb17a9a5593cbe166d95307
2018-11-27 00:09:26 +02:00
Tor Lillqvist 4122e02986 We need share/liblangtag, too
Otherwise i18nlantag works weirdly.

Change-Id: Ic5bf2007e586e6bb53a9e89782c2b05f73e348e3
2018-11-12 20:20:52 +02:00
Tor Lillqvist 0f68e45e2e Do put a BRAND_SHARE_RESOURCE_SUBDIR setting into fundamentalrc for iOS
Not sure wht it was commented out. For now use
$(LIBO_SHARE_RESOURCE_FOLDER) which is the same "program/resource" as
on Unix.

Change-Id: I81b8dd4868e68c3a8c38f9b4f84de7bfc8383d28
2018-11-09 12:52:02 +02:00
Tor Lillqvist b0bcd15b39 Alignment (whitespace) cleanup
Change-Id: Ie46906d5aa84d91efcb88ca795797883e883939f
2018-11-09 12:52:02 +02:00
Tor Lillqvist 1a6caadcfb The image zipfiles should be in share/config, it seems
Change-Id: I6f4cf36509c2fedf7bed346a07080fe0c67716a2
2018-11-06 10:37:47 +02:00
Tor Lillqvist 944ef72a1e Avoid superfluous directory level
Don't bother with a 'userinstallation' subdirectory. It is a
subdirectory called "user" of the UserInstallation value that will be
used for our stuff anyway.

Change-Id: Idb6b5992bfda73ed7af80274b0de8ad7b43c241c
2018-10-12 03:56:05 +03:00
Tor Lillqvist 68de102135 Start on the iOS unit test app
Change-Id: Idef0b375d5c7d6d4542aee1f8abecaf9f834189c
Reviewed-on: https://gerrit.libreoffice.org/61058
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2018-09-28 14:03:05 +02:00
Tor Lillqvist 14a58a5e55 Return share/config/soffice.cfg as it was, as I think the code expects
Not sure how it worked in LibreOfficeLight.

Change-Id: I0991b13a7538581642f530bf45a1bba1b1b644d5
Reviewed-on: https://gerrit.libreoffice.org/60505
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2018-09-14 18:53:21 +02:00
Tor Lillqvist 60569747d5 Don't copy files into the source directory, use workdir
(The LibreOfficeLight Xcode project still needs to be adapted
correspondingly.)

Change-Id: I0b17c595fc0d169f6393ab8734a1eecb241f59be
2018-09-05 21:57:59 +03:00
Tor Lillqvist 59b9fc4776 Put the lib names one per line to match what ld's -filelist expects
Change-Id: I7454c10a1547db796554f45f2d630af81a916c55
2018-09-05 13:55:24 +03:00
Tor Lillqvist e3bac83bec Run bin/ios-all-static-libs and put its output in a file
(To be used from Xcode projects elsewhere building iOS apps that want
to link to iOS code built here.)

Change-Id: I39bf2a4ed059930fcfc30c4d2016dfbc698da353
2018-09-05 11:21:26 +03:00
Eike Rathke 1d3de59ac2 Use $(ICU_MAJOR) instead of hard coded (Upgrade to ICU 62.1)
Change-Id: Ifea7072922388b2c0b7631fb809b23e2a5524a3c
2018-07-17 17:41:10 +02:00
Tor Lillqvist b9dde4a74c We use ICU 61 now
Change-Id: I7faf23de08db680599658206faaf3028888563f6
2018-06-07 21:51:36 +03:00
jan Iversen 652749a32b iOS, moved resources from share to direct.
Change-Id: I266fe71a6c58d8b80fa917198e8d84b356dfe296
2018-03-03 22:37:18 +01:00
jan Iversen 97d03a1209 iOS, updated resource paths.
changed name of example.odt to welcome.odt

Change-Id: I59625949f4aaad3b3f75bfa243f1a4186d563822
2018-03-03 22:30:25 +01:00
jan Iversen 6b08a0c363 iOS, made example.odt local to ios
Have a local copy instead of referencing the android dir, allows us to
make modifications local to iOS.

Change-Id: Ifb6292cff5dcfce0a45c210176f8597d0091ee20
2018-03-03 22:30:25 +01:00
jan Iversen 2db0c3e043 iOS, add tango theme to avoid vcl problem.
Change-Id: I73bee8ce04ec6234187224d03f0e081f09037e72
2018-02-05 19:42:44 +01:00
jan Iversen 8258b425e8 iOS, allow x86 release builds
Added dir for x86_64 release builds

Change-Id: If8c5e775ecd1283d9386a764441019c2423170f9
2018-02-05 11:11:53 +01:00
jan Iversen 1bd8cd252c iOS, simplified lib ref and copy to device
Named libKit directories so they can be referenced simple within xCode

Change-Id: Ic05fa4e87b6cc87e2823177474c3ed9ac3433dd3
2018-02-04 17:57:58 +01:00
jan Iversen 376ba90ee2 iOS, corrected directory creation.
the setup mk did not always create the needed directories.
and corrected typo

Change-Id: I58a40a67d91101504b7802a1fc73105df68a4ca4
2018-01-25 17:29:55 +01:00
jan Iversen cc2b9a257b iOS, remove double [bootstrap]
two bootstrap sections in one rc file seems wrong.

Change-Id: Ic7f8eac2d3d07b35736d11ad1fbe705135cb1785
2018-01-20 18:54:29 +01:00
jan Iversen e2ef73648a iOS, directory creation as part of setup
Corrected sequence for creating directories

Change-Id: I7a148b5568694c67e382e75a2e1629d3e23bf197
2018-01-18 12:03:14 +01:00
jan Iversen bccb5c54cd iOS, avoid racing conflict in dependencies
WORDIR might be deleted, but generated kept, situation solved

Change-Id: I5847d590affa7f80ef734bf314dbee9a6fc81669
2018-01-18 11:39:29 +01:00
jan Iversen e16668e164 iOS, typo
Change-Id: I59db4b822a7d0f697f887f99805893e9adb54667
2018-01-14 12:27:57 +01:00
jan Iversen 35020496e2 iOS, static library depeneds on setup
added dependency to static library

Change-Id: Ib0d7f7eec1f34ff275600cc9e825fa606f1ef40d
2018-01-14 12:25:53 +01:00
jan Iversen b61791533e iOS, Correct BRAND_* in rc
Wrong BRAND_BASE_DIR and BRAND_INI_DIR reference.

Change-Id: I85295a9de3807a60d0afb05c160be9acae2e4aec
2018-01-13 05:43:42 +01:00
jan Iversen a5eea68072 iOS, add .py dependency to native-code.h
Change-Id: I165d59228c2b273d758d1222dce8e653bdca0039
2018-01-12 17:21:27 +01:00
jan Iversen d9bde4c6af iOS, corrected path in LO
Patch thanks to Jon Nermut.

LO looked in the wrong directories on iOS

Change-Id: I8a9c019f7443445b780bc2ce1c77c998f74239e8
2018-01-10 14:23:02 +01:00
jan Iversen ffd994298d iOS, catch library changes in make
Updated makefiles to be dependent on the static libs, ensuring
that iOS is rebuild when a core library changed.

Change-Id: I5ebd1d703eb9a3af0e284910cdc307dd62f4d3fc
2018-01-10 14:23:02 +01:00
jan Iversen 61ab976bff iOS added BRAND_* to fundamentalrc
Updated the content of fundamentalrc

Change-Id: I0e7ce7ffc8e61f572ad96f8c07872e41677cc421
2018-01-04 20:16:49 +01:00
jan Iversen 64c3840197 iOS, remove app xcconfig
This is now handled directly in the project

Change-Id: I1a57521ff8fe733d56154d186c98f68556128ebd
2017-11-25 17:04:00 +01:00
jan Iversen 944da4b735 iOS .mk naming conventions.
Updated target names, to allow cross references.

Change-Id: Ie0959876df58657a2303ca2b0865e91a7f5a0eea
2017-11-24 09:10:22 +01:00
jan Iversen ed885a3cdb iOS, do not use different C compilers
LibreOfficeKit.c was compiled with an xcode project and not like
all other sources. Changed to use clang with same switches as
rest of LO.

Separated resource generation in own makefile

Removed project LibreOfficeKit which was responsible for prelink.

Change-Id: Iaf9fbb4b652501af0b7f3643ed3efcc2ed93b611
2017-11-23 08:53:39 +01:00