summaryrefslogtreecommitdiff
path: root/instsetoo_native/CustomTarget_setup.mk
AgeCommit message (Collapse)Author
2020-06-05Move all public Java classes to libreoffice.jarSamuel Mehrbrodt
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 35518c92365cc183ba6cce2a4d284a130c0ca13f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95048 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-05tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt
jurt.jar and unoil.jar are kept as effectively empty jars, each with a Class-Path: ridl.jar in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or without also loading ridl.jar) will still have access to their content. Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi) are not part of the URE, but are now made available by URE's ridl.jar. This should probably not cause problems in practice. At least for now, we seal exactly those packages in ridl.jar that were originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now, but that would be mildly incompatible, as it would prevent 3rd-party code from introducing additional UNOIDL entities in the relevant namespaces (even if that is something we do not want 3rd-party code to do anyway). However, some JunitTest_jurt_* define classes in those sealed packages. In the past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt. Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets leave that for a follow-up clean up.) As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/. Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a Co-authored-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit ae855bf48163ff64d94cfc34aff8e37abdb5518d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88005 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-10-02tdf#127711 - A runtime-switch for the MiniCrashDumpJuergen Funk
- in soffice.ini (sofficerc) the entry "CrashDumpEnable" default is "true" - when false then the Dump.ini and the dump-file are not written - when the switch --disable-crashdump is set, then the switch "CrashDumpEnable" set to "false" - when the entry "CrashDumpEnable" is missing, in this case is the default true, too - the checkbox under Options-General "Send crash reports to ..." is deactive and shows off (only view, not change the config) - when set the environment variable "CRASH_DUMP_ENABLE" to any char then the switch "CrashDumpEnable=false" are overrules with true and the Dump.ini and dump-file are write Change-Id: I34e7795640eb95d111e18b0ad46ec67b2c126b19 Reviewed-on: https://gerrit.libreoffice.org/79273 Tested-by: Jenkins Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
2018-10-22tdf#120176 - Text appears as white on first launchheiko tietze
Splash screen text should be black now Change-Id: I963ffc89c48fdc1de148586cd6f0fb4bf35d44bd Reviewed-on: https://gerrit.libreoffice.org/61924 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
2018-08-29sal: use correct settings path for HaikuKacper Kasper
* Don't lowercase the name. Change-Id: I8addd735bf8ee48256ec53f01063e96e7a4b41cd Reviewed-on: https://gerrit.libreoffice.org/58632 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-06-25tdf#118303 - Wrong converting of the Vendor-StringJuergen Funk
Using the make-file function, in this case no converting this problem was introduced by switching to native Win32 make: * Makefiles don't have any metadata to specify the encoding * all of the Cygwin tools in the build system assume everything is UTF-8 encoded * Win32 make calls CreateProcessA(), which converts the arguments from some so-called "ANSI" codepage to UCS-2 hence in commands invoked from make, the UTF-8 string is erroneously interpreted as latin1 and converted to UCS-2. Change-Id: Ibf3e573b07e7e2d9119e0ff7b4972d8065d84bea Reviewed-on: https://gerrit.libreoffice.org/56272 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-15Upgrade update check and extension URLs to httpsGuilhem Moulin
Change-Id: I697458fb3deba508e61e414c43fcfc85aff76f9b Signed-off-by: Olivier Hallot <olivier.hallot@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/49237 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2017-11-23tdf#90794 Position of progress bar on high res screensheiko tietze
Introduced two new consts Change-Id: I15e01eabe9fd3225c36d06cbb59310a07a30f2c1 Reviewed-on: https://gerrit.libreoffice.org/45105 Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com> Tested-by: Heiko Tietze <tietze.heiko@googlemail.com>
2017-08-31Check ENABLE_ONLINE_UPDATE_MAR in one more placeMarkus Mohrhard
Change-Id: I76f5702aad9b57f3031bc35b5271a5dde8ed4f28
2017-08-20updater: move the update channel info from the config to versionrcMarkus Mohrhard
Change-Id: Id19578a889de51cacac869d7ec681c5c18c40cf9 Reviewed-on: https://gerrit.libreoffice.org/41365 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-07-21migrate to boost::gettextCaolán McNamara
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
2017-03-20These files are called unorc on all platformsStephan Bergmann
Change-Id: I49f4f8361dfd93a788faa7c0de88bf954d3d3574 Reviewed-on: https://gerrit.libreoffice.org/35485 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-03-16Sort lines in soffice ini-fileStephan Bergmann
...so that they match the order in the scp2-generated counterpart Change-Id: Id0a77536081872a5feff7f98417462bd7fd057b3
2017-01-27Put crash directory config in soffice.ini, instead of own ini fileSamuel Mehrbrodt
Change-Id: I3a7aa394792c47c6c5a3a553174d177e66ade617 Reviewed-on: https://gerrit.libreoffice.org/33582 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-01-24Crashdump: Make crash directory configurableSamuel Mehrbrodt
Change-Id: I8106ec674080ede7072581dab2e6700040de5828 Reviewed-on: https://gerrit.libreoffice.org/33032 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-01-13Remove unused ini propertiesSamuel Mehrbrodt
Change-Id: Iea95f5975968f73e2e4aea34246c83f384341592 Reviewed-on: https://gerrit.libreoffice.org/33000 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
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