summaryrefslogtreecommitdiff
path: root/instsetoo_native/CustomTarget_setup.mk
AgeCommit message (Collapse)Author
2016-10-14profilesafe: Adapted to UIArmin Le Grand
Adaptions to UI, added more modes what the user can do in SafeMode. Adapted locations to write pack information and added places where to enter SafeMode. Implemented basically all five possible user choices Change-Id: Ic5324a8f77ab434309e840949c3803e65a75c538 Reviewed-on: https://gerrit.libreoffice.org/29785 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2016-10-13profilesafe: extended to three modesArmin Le Grand
Saving configuration is now extended to three basic modes, from just saving registrymodifiications to adding user-defined config stuff to saving all information in the user profile, additionally configuration information for Extensions is saved. Added configuration entries for this and tested saving/restoring. Change-Id: I79b09c37617803bf656826f76a7e3db79cda49ac Reviewed-on: https://gerrit.libreoffice.org/29770 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2016-10-11profilesafe: Add values for SecureUserConfigfeature/profilesafemodeArmin Le Grand
Added default values for SecureUserConfig values to soffice.ini/rc which enable the mechanism, enable by default and set a maximum of three backups file in packed form. Added more handy flag for easy decision to add compressed/uncompressed. Change-Id: I5a624c09fec4e4278314e13fc5f693ac085d5e61
2016-08-05URI-encode spaces in PRODUCTNAME for UserInstallationTor Lillqvist
Failing to do this caused a mysterious uncaught exception in gengal, with no explanation printed. This turned out to be caused by the 'CONFIGURATION_LAYERS: missing ":"' exception thrown in configmgr, which was caused by the unencoded space confusing the parsing of the CONFIGURATION_LAYERS thing. Change-Id: I9c91819906c2e0dd434d9f96a04bc14c0e0408ed
2016-03-11User-Agent: disable reporting of languages.Michael Meeks
Nowadays we have them all, so it is big, non-useful data. Change-Id: Ia08b863852e6a0916f30e2ecdc14eea4fafe2ab0 Reviewed-on: https://gerrit.libreoffice.org/23143 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2015-11-28Revert "gengal: create an ini / rc file - to bootstrap services properly."Michael Stahl
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 Meeks
Change-Id: Ib2042d6419dafcd62aaec95efb844cb09833c266
2015-11-23Update-check, expand to allow reporting of H/W and OS versions.Michael Meeks
Off by default. Expand config options to show the user agent used. Re-use this to show more useful info in Help->About too. Change-Id: I1044116ef9beeb341a537c0f4451dca54e198f67 Reviewed-on: https://gerrit.libreoffice.org/20098 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2015-09-24sync splash-progressbar position for installets with instdirChristian Lohmaier
values for actual installer versions come from openoffice.lst, add a hint to the instdir-makefile Change-Id: I6eea5585dd776d4d6071af7b508a91a9c385cb3a
2015-09-01Support modification write-back to other than registrymodifications.xcuStephan Bergmann
...to eventually support writing to dconf (see TODO). Even when writing somewhere else, it may still be useful to read from the current "user:" location, so a new convention was introduced to CONFIGURATION_LAYERS types that support write-back: - A leading "!" indicates that the layer is indeed used for write-back (probably in addition to reading from it). For backwards compatibility (when users use own settings of CONFIGURATION_LAYERS, instead of depending on the value in the shipped fundamental ini-file), no prefix on the "user:" is now interpreted the same as a "!" prefix. - A leading "*" indicates that the layer is not used for write-back (but only for reading from it). Change-Id: I399cc7bfe927db50586834f9630c184aaa2153f2
2015-08-21Spurious spaceStephan Bergmann
Change-Id: I1ac90d4253230d55e289135da4e1837a3f2d42e9
2015-08-21Generalize CONFIGURATION_LAYERS "winreg:" notationStephan Bergmann
...after 097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER registry integration" added "winuserreg:". Even though changing from the exisiting "winreg:" to "winreg:LOCAL_MACHINE" should be compatible, as it only ends up in fundamental.ini included in the LO inst set, play it safe it keep treating "winreg" the same as "winreg:LOCAL_MACHINE". ("url" is a misnomer now in configmgr's Components ctor, and should eventually be renamed to something more accurate.) Change-Id: Ifbcf3284d904490891642599468470d03547f92a Reviewed-on: https://gerrit.libreoffice.org/17891 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2015-07-30Add missing build dependencies for *rc files.Jan Holesovsky
Change-Id: I0a876e9afa9a90f312d68611a8adf5a962da784d
2015-07-14Add HKEY_CURRENT_USER registry integration.Michael Meeks
It seems rather odd that we dump this to a file and parse again to me. Change-Id: Ia32ba9ff3e7878d40032bd7d10fba2c143d11757 Reviewed-on: https://gerrit.libreoffice.org/17033 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-07-09New branding for the 5.0.Jan Holesovsky
Change-Id: Ic20314a65739d769adf3331a77f36be813da22a3
2015-07-08configmgr: support reading from a dconf layer (WIP)Stephan Bergmann
Work in progress to allow integration of LO with <https://wiki.gnome.org/Projects/FleetCommander>. During configuration, dconf support is implicitly enabled when available on the host (which is presumably only available on Linux). It is explicitly disabled for TDF Linux builds for now, though, to avoid accidental dependencies of the distributed installation sets on system dconf libraries. A dconf layer is represented in the CONFIGURATION_LAYERS bootstrap variable with type "dconf" and an empty URL. See the comment at the top of configmgr/source/readdconflayer.cxx for the encoding of component-data in dconf. All of this is still subject to change. Change-Id: I2d08d81c8ea43ba4a99040a8882ae75b91bcfdb9 Reviewed-on: https://gerrit.libreoffice.org/16848 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2015-07-02Move winreg layer past res layer, and also include it in instdir/ instsetStephan Bergmann
* Looks more logical to keep share/registry/'s xcscxu and res layers together. * Lets the winreg code actually get executed by developers using the instdir/ instset. (Though it doesn't enable it during in-build tests, which typically use their own CONFIGURATION_LAYERS settings.) Change-Id: I49dd3a16773047f7d4dc372c60a58ada1970970a
2015-04-16bump version to 5.0.0.0.alpha0+ - but keep profile at 4Christian Lohmaier
Change-Id: I30536ecd8a03a19a647d247e7c6ece3d6f1695c1
2014-12-03Fold URE: WindowsStephan Bergmann
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is no longer necessary and loading of cppuhelper from the program dir cannot fail regardless in whatever scenario the cli_cppuhelper library itself is loaded. Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-01typoStephan Bergmann
Change-Id: Id4112879e9c8cbb9d900a2f25f5f6114189137d7
2014-12-01Fold URE: Linux ure/share/misc/* -> program/Stephan Bergmann
...and remove now unused ure-link symlink Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-11-28Fold URE: Linux ure/share/java/* -> program/classes/Stephan Bergmann
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-11-26Extract python-only pythonloader.uno ini-file into its own PackageStephan Bergmann
Change-Id: Ifa9d12fa190f929807dc0dc7342e162aeb9a0576
2014-11-26Move instdir-only ooenv into its own PackageStephan Bergmann
Change-Id: I399f4c5c6618dd151bd649f07e1b9d661e224324
2014-11-26Generate consistent buildid values in instdir/ setup and version ini-filesStephan Bergmann
...consistent with the values in the correpsonding ini-files in generated installation sets. Change-Id: I8466cc64d309bbb3fe4bec7833803081d14e1097
2014-11-26version ini-file's ProductMajor/Minor are unusedStephan Bergmann
...and had started to have different values in instdir (ProductMajor=450, ProductMinor=0) vs. installation sets (ProductMajor=50, ProductMinor=) Change-Id: I4db2c07b5f7b011218833fc355a3097eb13d0cd4
2014-11-25Remove unused URE_LIB_DIRStephan Bergmann
(which now had a bogus value on Mac OS X anyway) Change-Id: I5bf233506d6c658560dfadddf79a9ed8605c2a20
2014-09-17BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layoutStephan Bergmann
Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b
2014-09-16Wrong URE_INTERNAL_LIB_DIR value for MACOSXStephan Bergmann
Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
2014-09-16Wrong URE_INTERNAL_JAVA_DIR value for MACOSXStephan Bergmann
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
2014-09-16Wrong UNO_TYPES value for MACOSXStephan Bergmann
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann
...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 Bergmann
...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 Lillqvist
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 Lillqvist
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 Michaelsen
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 Stahl
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
2013-11-26generate setuprc for instdirDavid Tardon
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
2013-11-26generate sofficerc for instdirDavid Tardon
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
2013-10-28Related fdo#70919 Missing instdir redirect ini-fileStephan Bergmann
...makes javaldx re-scan on every start. Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b
2013-09-17goodbye linkoo.. you have served wellMatúš Kukan
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úš Kukan
Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49
2013-09-12put appropriate UserInstallation in bootstraprc on !ENABLE_RELEASE_BUILDMichael Stahl
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 Bergmann
Change-Id: I2ebee47dca633f6dab511e4dcef42bc799f1864f
2013-09-11Fix pythonloader.uno ini-file contentStephan Bergmann
cf. scp2/source/python/profileitem_python.scp) Change-Id: I49316ae078e56a961128bf59206843d0d616786e
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
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 Stahl
Change-Id: Iad3013df716f1dff66813e26c62d3275d5af2999
2013-09-09properly generate rc filesMatúš Kukan
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09ure: install files with filelistsMatúš Kukan
This commit adds gb_Package_add_symbolic_link. Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5