summaryrefslogtreecommitdiff
path: root/instsetoo_native/Package_setup.mk
AgeCommit message (Collapse)AuthorFilesLines
2015-11-28Revert "gengal: create an ini / rc file - to bootstrap services properly."Michael Stahl1-1/+0
This reverts commit 795c61e052671d4de6a3b9cf77f9c0ad117e064d. <sberg_> but what is 795c61e052671d4de6a3b9cf77f9c0ad117e064d supposed to help anyway? on all platforms, gengal should already get URE_BOOTSTRAP set, either via redirectrc, or via extendApplicationEnvironment() <mst_> sberg_: so ... you mean that gengal.rc is actually unnecessary, and that the problem was caused by a missing dep on Package_instsetoo_native_setup ? <sberg_> I'm pretty sure a missing gengal ini-file was a red herring Change-Id: I50ebc360e0e5c75c16f8407cbac6a54753fca272 Reviewed-on: https://gerrit.libreoffice.org/20226 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-11-26gengal: create an ini / rc file - to bootstrap services properly.Michael Meeks1-0/+1
Change-Id: Ib2042d6419dafcd62aaec95efb844cb09833c266
2014-11-26Extract python-only pythonloader.uno ini-file into its own PackageStephan Bergmann1-1/+0
Change-Id: Ifa9d12fa190f929807dc0dc7342e162aeb9a0576
2014-11-26Move instdir-only ooenv into its own PackageStephan Bergmann1-1/+0
Change-Id: I399f4c5c6618dd151bd649f07e1b9d661e224324
2014-09-18Use instsetoo_native-generated uno ini-file for both instdir and instsetsStephan Bergmann1-4/+0
Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann1-0/+4
...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-1/+1
...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
2013-11-26generate setuprc for instdirDavid Tardon1-0/+1
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
2013-11-26generate sofficerc for instdirDavid Tardon1-0/+1
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl1-2/+0
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-28Related fdo#70919 Missing instdir redirect ini-fileStephan Bergmann1-0/+2
...makes javaldx re-scan on every start. Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b
2013-09-25Start hacking --enable-canonical-installation-tree-structure back into shapeTor Lillqvist1-1/+1
Had been totaly broken by the recent changes. (Which is fine, it is just an experimental hack anyway, I am not sure whether it will ever be used in anger. Just a pet peeve of mine, I dislike seeing libraries, configuration files, resources etc mixed together in one "program" folder, especially on OS X, where the convention is to have app-specific dylibs and frameworks in "Frameworks", and resource files in "Resources". But this is not any requirement as such; there are apps in the Mac App Store that blatantly "break" this convention.) Basically, replace uses of gb_PROGRAMDIRNAME and gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which for normal builds all expand to the same "program" anyway. Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
2013-09-23Try to fix cross-compilationTor Lillqvist1-1/+1
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
2013-09-17goodbye linkoo.. you have served wellMatúš Kukan1-1/+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-11Towards a working instdir for Mac OS XStephan Bergmann1-1/+1
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-09properly generate rc filesMatúš Kukan1-2/+5
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09ure: install files with filelistsMatúš Kukan1-2/+0
This commit adds gb_Package_add_symbolic_link. Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
2013-05-10More gb_PROGRAMDIRNAME clean upStephan Bergmann1-1/+1
Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
2013-05-05copy pyuno files to instdirDavid Tardon1-0/+1
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-04-28generate versionrc for instdirDavid Tardon1-1/+5
Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
2013-04-28gbuild: add ure-link to instdirDavid Tardon1-0/+1
Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
2013-04-28gbuild: generate ooenv for instdirDavid Tardon1-0/+16
Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 15:19:34 +0000