summaryrefslogtreecommitdiff
path: root/instsetoo_native/CustomTarget_setup.mk
AgeCommit message (Collapse)AuthorFilesLines
2014-09-17BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layoutStephan Bergmann1-1/+1
Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b
2014-09-16Wrong URE_INTERNAL_LIB_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
2014-09-16Wrong URE_INTERNAL_JAVA_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
2014-09-16Wrong UNO_TYPES value for MACOSXStephan Bergmann1-1/+1
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann1-15/+28
...like is done for most other ini-files too, with entries indentical to the ones in scp2/source/ooo/ure.scp. (And sort ini-files lexicographically again in instsetoo_native/*.mk, broken with recent louno rename). Leave ure/source/unorc.in and ure/Pacakge_builddir_install.mk around for the cross-compilation case only. Change-Id: Ic07e036ef126db1aee2c0f6b726c2b86c2536c53
2014-09-16Rename LO-specific uno ini-file (Linux: program/unorc) to "louno"Stephan Bergmann1-14/+14
...to avoid confusion with the URE uno ini-file (Linux: ure/lib/unorc). It might even work to get rid of the louno ini-file altogether and fold its contents into the fundamental ini-file, but at least desktop/source/deployment/misc/dp_misc.cxx accesses the louno ini-file directly, so would need some inspection to avoid potential regressions. Change-Id: Ib49bbc4c814d677c22e68d2dd0f11af6d8423bb6
2014-09-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist1-8/+4
In other words, only executable files go in the MacOS folder. Dynamic libraries and bundled frameworks (i.e., LibreOfficePython), and nothing else, go in the Frameworks folder, and all other files go in the Resources folder. Especially, note that Java class files and rc (.ini) files also go in Resources. Such an app bundle structure is what Apple strongly suggests one should use, and it has been hinted that future versions of code signing and/or Gatekeeper will require such a structure. There is still some ugliness thanks to traces of the historical separation of URE from "the office". Like there are two separate "unorc" files, one for URE, one for the LibreOffice application. IMHO, this should be cleaned up, but is probably controversial. (Eek! I now see there are actually *three* unorc files in the app bundle. Not intentional. Need to fix that later.) Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-08-10Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDERTor Lillqvist1-2/+2
Needed in case of --enable-canonical-installation-tree-structure. Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
2014-04-29set OOo reference version to 4.1 for incompatible MessageBox changesBjoern Michaelsen1-1/+1
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-02-12normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONNMichael Stahl1-2/+2
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
2013-11-26generate setuprc for instdirDavid Tardon1-0/+8
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
2013-11-26generate sofficerc for instdirDavid Tardon1-0/+17
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
2013-10-28Related fdo#70919 Missing instdir redirect ini-fileStephan Bergmann1-0/+9
...makes javaldx re-scan on every start. Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b
2013-09-17goodbye linkoo.. you have served wellMatúš Kukan1-5/+1
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-12make this work also if BUILDDIR != SRCDIRMatúš Kukan1-1/+1
Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49
2013-09-12put appropriate UserInstallation in bootstraprc on !ENABLE_RELEASE_BUILDMichael Stahl1-1/+3
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-11Fix previous fixStephan Bergmann1-1/+1
Change-Id: I2ebee47dca633f6dab511e4dcef42bc799f1864f
2013-09-11Fix pythonloader.uno ini-file contentStephan Bergmann1-6/+18
cf. scp2/source/python/profileitem_python.scp) Change-Id: I49316ae078e56a961128bf59206843d0d616786e
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann1-3/+3
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-09add back HSQLDB_JAR to URE_MORE_JAVA_CLASSPATH_URLSMichael Stahl1-1/+1
Change-Id: Iad3013df716f1dff66813e26c62d3275d5af2999
2013-09-09properly generate rc filesMatúš Kukan1-9/+84
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09ure: install files with filelistsMatúš Kukan1-8/+0
This commit adds gb_Package_add_symbolic_link. Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
2013-05-05copy pyuno files to instdirDavid Tardon1-0/+12
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-04-28generate versionrc for instdirDavid Tardon1-0/+11
Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
2013-04-28gbuild: add ure-link to instdirDavid Tardon1-0/+8
Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
2013-04-28gbuild: generate ooenv for instdirDavid Tardon1-0/+32
Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 00:08:18 +0000