Commit Graph

19 Commits

Author SHA1 Message Date
5e5aa9b08a Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDER
Needed in case of --enable-canonical-installation-tree-structure.

Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
2014-08-10 10:08:38 +03:00
ab67b79c74 set OOo reference version to 4.1 for incompatible MessageBox changes
This commit:

 http://cgit.freedesktop.org/libreoffice/core/commit/?id=805c6101b3427cc98b53f1c48f22f705206c384d

make LibreOffice 4.2 (and AOO 4.1) widely incompatible to previous
versions. We should thus update the reference version to 4.1 as that is
the version we are least incompatible with. Extension developers are
encouraged to use LibreOffice-minimal-version instead anyway, instead of
the obsolete OOo versioning. see:

 https://wiki.documentfoundation.org/Development/Extension_Development
 https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=commitdiff;h=61f9ca7b18de1adc58cf5d7cb295ba81eb3e5d92;hp=20b8edc74b846db6d143a9e327fb7f7eb2c1fb77

Change-Id: I8275a8244d642100d7b3bc17aa0b12ae7d63e583
Reviewed-on: https://gerrit.libreoffice.org/8852
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-04-29 16:53:40 +00:00
0443d0a90e normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
2014-02-12 09:53:09 +01:00
3cac074a55 generate setuprc for instdir
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
2013-11-26 19:40:32 +01:00
9ce3e2ae14 generate sofficerc for instdir
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
2013-11-26 19:40:32 +01:00
f924cf3c22 Related fdo#70919 Missing instdir redirect ini-file
...makes javaldx re-scan on every start.

Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b
2013-10-28 16:09:06 +01:00
f5b840a3ee goodbye linkoo.. you have served well
This commit:
- removes linkoo and --disable-linkoo option
- removes 'dev-update' make target
- creates --disable-ooenv option
- removes LD_LIBRARY_PATH and PATH settings in ooenv

Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
2013-09-17 19:37:42 +02:00
5fd86fb2a3 make this work also if BUILDDIR != SRCDIR
Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49
2013-09-12 10:26:47 +02:00
5bab11089f put appropriate UserInstallation in bootstraprc on !ENABLE_RELEASE_BUILD
This used to be handled by the  "LOCALUSERDIR $ORIGIN/.." line for
LibreOffice_Dev in openoffice.lst.in but that won't affect INSTDIR.

Change-Id: I1acd1ee7c08c98443e1cc425e1a6bb872d7c81f7
2013-09-12 00:44:23 +02:00
756895f06b Fix previous fix
Change-Id: I2ebee47dca633f6dab511e4dcef42bc799f1864f
2013-09-11 11:51:55 +02:00
6a61f4d587 Fix pythonloader.uno ini-file content
cf. scp2/source/python/profileitem_python.scp)

Change-Id: I49316ae078e56a961128bf59206843d0d616786e
2013-09-11 11:48:05 +02:00
5397b49f4d Towards a working instdir for Mac OS X
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents.  Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME).  (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)

For Android and iOS, gb_INSTROOT probably still needs to be set.

The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.

Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-11 00:50:54 +02:00
25dc151c2b add back HSQLDB_JAR to URE_MORE_JAVA_CLASSPATH_URLS
Change-Id: Iad3013df716f1dff66813e26c62d3275d5af2999
2013-09-09 22:09:11 +02:00
2e5af9dc4f properly generate rc files
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09 22:09:10 +02:00
b45d2e7d14 ure: install files with filelists
This commit adds gb_Package_add_symbolic_link.

Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
2013-09-09 22:09:01 +02:00
ed665f24ff copy pyuno files to instdir
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-05-05 15:47:54 +02:00
88a943b051 generate versionrc for instdir
Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
2013-04-28 16:34:25 +02:00
0346f008e7 gbuild: add ure-link to instdir
Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
2013-04-28 16:34:24 +02:00
6ae02e9c61 gbuild: generate ooenv for instdir
Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
2013-04-28 16:34:24 +02:00