summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)AuthorFilesLines
2016-07-07scp2: move scp2 classification package to AutoInstallMiklos Vajna2-36/+0
(cherry picked from commit f09bcddfa9bd5b2944d70014efe9bc95cfa65047) Conflicts: Repository.mk scp2/InstallModule_ooo.mk Change-Id: I59afb2302b7fe891a83ca5ce7b12eca322bb7ed7
2016-07-07sfx2 classification: include example XML in the instsetMiklos Vajna2-0/+36
(cherry picked from commit e5202379e3ffa65e916e1d3dc14959d53d65acd7) Conflicts: scp2/InstallModule_ooo.mk Change-Id: I23c0227ee304a6b756ff3d474866609d95e6a071
2016-06-11scp2: EULA to Resources on OS XAndras Timar1-3/+1
Change-Id: I87bbb61884d77729832e4d3f36aca29d6dada277 (cherry picked from commit d701823363236c1976f22dc46116a9b49bf68b24)
2016-06-11Don't package unoinfo in case of Mac OS X like app structureAndras Timar1-1/+1
Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948 (cherry picked from commit d745e1dfd09a32efaea815ea4ac00059b956849f)
2016-06-11Don't package gengal script in App Store caseAndras Timar1-1/+1
Conflicts: scp2/source/ooo/file_ooo.scp Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c (cherry picked from commit 7680527415f89e6c76101bdb257c27fe9b607b07)
2016-06-11shell script in Contents/MacOS is not acceptedAndras Timar1-1/+1
(cherry picked from commit 4ecd2dd60d1685255fdf947a7bdfea20eac68e65)
2016-06-11don't package 'install' script because it's not for end usersAndras Timar1-8/+0
Change-Id: I64ea8d8722c9da252c6142a862e9363759d38ba3 (cherry picked from commit 74d90488662c55fd5f31b203e02b228137b42076)
2016-06-11Collabora Office OS X packagingAndras Timar1-0/+7
- added EULA (sla.r) in special OS X resource fork format - added volume icon which does not work ATM, TODO later - new dmg background image and adjusted .DS_Store - fixes to tolerate space in app bundle name Change-Id: I3f341bfcd5bea88681e57b314f6069be107c5c2b (cherry picked from commit 26d77ceefcb59a95fff71c730d798d6b59021fc0)
2016-06-11OS X: remove LibreOffice readme+license from Collabora Office DMGAndras Timar1-9/+1
Change-Id: Ie62c6a98563261e3601be70ff5eff6603b625445 (cherry picked from commit 08f328e20e85d41793413df6ed653d033b499517)
2016-06-11OSX issues with space in product nameAndras Timar1-1/+1
(cherry picked from commit 79f3a7bfefb8decd2d18df21d799f2d9241a44c3) Change-Id: I0155372c8e5cd0eb91bfbea304190502cbf32e3c
2016-06-11Collabora Office EULAAndras Timar1-0/+13
Conflicts: readlicense_oo/Package_files.mk Change-Id: Ia380db465f5094216cb36526f6cc178043376356 (cherry picked from commit 2e8f1c8598c34a5cf0779f23fe66091115fa0fc6)
2016-06-11Bundle Karla fontAndras Timar2-0/+4
Change-Id: I666665c801367ff760b14b9f474952e9894b4791 (cherry picked from commit 21dc27ab7834fe4d5783a9f4bd412c08cacc26b4)
2016-06-11disable Liberation fonts on WindowsAndras Timar1-0/+2
Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef (cherry picked from commit 88e971fe680b5509e749f5ff74e0d51111098769)
2016-04-11don't install qstart.desktop if it's disabled (--disable-systray)Rene Engelhard2-1/+2
Conflicts: scp2/InstallModule_ooo.mk Change-Id: I21a53381ad4018034de3833e8e244d0d7a7d28b8
2016-03-15Update-check: optional reporting of H/W and OS info also for installsetsChristian Lohmaier1-1/+1
expands 56a9594649872f4076b6891f917138d2b1e8d028 to also apply to installation sets, not only instdir Change-Id: I962b63feac02ac6dd06c77be660dd74d876c985e (cherry picked from commit ce08a8e24edb9a9371642d666ae9a983b16d02bd) Reviewed-on: https://gerrit.libreoffice.org/23270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-03-15User-Agent: disable reporting of languages.Michael Meeks1-1/+1
Nowadays we have them all, so it is big, non-useful data. Reviewed-on: https://gerrit.libreoffice.org/23143 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 2a9095570a2430568f5c5e1c91edd6a717e099a6) User-Agent: disable reporting of languages - also for installsets extends 2a9095570a2430568f5c5e1c91edd6a717e099a6 to not only apply to instdir, but also to packaged installers (that use data from scp2) (cherry picked from commit 6c47de46613b531bd975d073cf31c3fda6f8b8da) Change-Id: Ia08b863852e6a0916f30e2ecdc14eea4fafe2ab0 Reviewed-on: https://gerrit.libreoffice.org/23151 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-02-18scp2: fix typo in InstallModule_quickstart.mkMichael Stahl1-1/+1
(cherry picked from commit 02ca4997d5a313c0679d7929f1f83f10f42f0510) scp2: argh, fix the *other* typo on that line too (cherry picked from commit 72720ac9b934af6f84111ec694fa46555d10a7bd) Change-Id: I21f309e6cb53c129035d2985642a0e96c485cc56 Reviewed-on: https://gerrit.libreoffice.org/22435 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-01-23Register LibreOffice as able to open MS Write filesSean Young1-0/+9
Change-Id: I9d2962214e048e489c063b9a364dbfa207740949 Reviewed-on: https://gerrit.libreoffice.org/20643 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-10-27add MSVC 14.0 runtime merge modulesAndras Timar1-0/+19
Change-Id: Ib32a4f2484466802ac6c9152e8dd41fc8c67aa46 Reviewed-on: https://gerrit.libreoffice.org/18560 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2015-10-25Remove Seamonkey based address book driverDavid Ostrovsky2-25/+0
Seamonkey based address book driver is based on pre-compiled libraries and is only used on Windows 32 bit. Remove it in favor of mork driver. Given that Seamonkey based mozab driver also provides Outlook and Outlook Express address book integration, that Windows-32-bit--only feature is lost for now. If necessary, support for that feature could be rewritten from scratch, in a way that would also work for Windows 64 bit. Change-Id: Ie1c125e692598bda999767c328c9e2262a2b82af Reviewed-on: https://gerrit.libreoffice.org/19560 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2015-10-16drop gconf integration as per ESC decisionBjoern Michaelsen4-4/+3
Conflicts: shell/source/backends/gconfbe/gconfbackend.cxx Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87 Reviewed-on: https://gerrit.libreoffice.org/19408 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-10-13remove some useless commentsNoel Grandin1-2/+1
found with git grep '// /' Change-Id: I948cf9ae61bbbf2ec706ca5b0572c4f27c58c745
2015-10-12TDE: move stuff into the tde-integration packageJan-Marek Glogowski3-2/+11
Currently the package just contains the TDE shell backend library. This moves the URL handler tde-url-open and the vcl plugin into the integration package, like the KDE3 based kde-integration. The TDE address book driver is left in the core package. Change-Id: I2687b313d7f106bb344c65c50ae0a07b0140def0
2015-10-12KDE4: add kde4-open-url to the integration packageJan-Marek Glogowski1-1/+3
Currently kde4-open-url is just installed, but not included in the kde-integration package. Change-Id: Ic114a463b97aaaf4cc7ff3062143698daf93513c
2015-09-28One more GUIBASE -> USING_X11Samuel Mehrbrodt2-2/+2
Change-Id: I383b83b3778b11a012a931c19a2be85445af29c5 Reviewed-on: https://gerrit.libreoffice.org/18900 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2015-09-25Replace GUIBASE with USING_X11Samuel Mehrbrodt1-1/+1
That's what it actually means. Also make it a boolean Change-Id: I249e18351253b34b5dada28e2a9c6bc0c06b730c Reviewed-on: https://gerrit.libreoffice.org/18688 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2015-09-03remove KDE3 support, --enable-kde and --enable-kdeabMichael Stahl3-3/+2
With the new RHEL6-era baseline TDF can finally ship KDE4 support. Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3 Reviewed-on: https://gerrit.libreoffice.org/18267 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-02ditch gnome-vfs2 supportCaolán McNamara4-8/+4
Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db Reviewed-on: https://gerrit.libreoffice.org/18262 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-01Support modification write-back to other than registrymodifications.xcuStephan Bergmann1-2/+2
...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-21Missing #undefStephan Bergmann1-0/+1
Change-Id: Ifd546c3dbc383fd6234c5a1b9ddce7701038823f
2015-08-21Use CONFIGURATION_LAYERS_DCONFStephan Bergmann1-1/+1
...missing from ecc617e797aa5ed329668114e54ec7ffa5c0e87b "configmgr: support reading from a dconf layer (WIP)" Change-Id: I4e9f2fd216a3ef49d0cadb6d5fa6b2517a6bcdb6
2015-08-21Generalize CONFIGURATION_LAYERS "winreg:" notationStephan Bergmann1-2/+2
...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-27inline a bunch of use-once macrosNoel Grandin1-8/+0
no point in having a macro unless it's actually going to reduce the number of lines of code Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
2015-07-27remove some unused definesNoel Grandin1-31/+0
Change-Id: Ib2d50e8c29ccbc5ffcb52cdff4ae3eaae9a62188 Reviewed-on: https://gerrit.libreoffice.org/17332 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-07-24Add "styles" template folder + content to installationTomaž Vajngerl3-0/+13
Change-Id: Ibb674e17eedfc325d3e335aa074391ad7b2b2aa2
2015-07-14Add HKEY_CURRENT_USER registry integration.Michael Meeks1-1/+3
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-08configmgr: support reading from a dconf layer (WIP)Stephan Bergmann1-5/+14
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 Bergmann1-1/+1
* 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-06-25Avoid errors with stuff not build on --without-xRiccardo Magliocchetti1-1/+1
Reported by by Abhimanyu Singh Change-Id: I02bd2a2b85b9d55f0b237d3a1141801245473cd2 Reviewed-on: https://gerrit.libreoffice.org/16453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-06-22scp2: add AutoInstall support for executables with COMPONENTCONDITIONMichael Stahl2-1/+10
Change-Id: I36f14d9ba08ab2473a555681b934b8b35cfa06b2
2015-06-06Remove WITH_AGFA_MONOTYPE_FONTSAdolfo Jayme Barrientos1-28/+0
Undefined since 62bf424fa84b0ccd0828a474a1351b0134f27eab and 0789ee23ae6a417d141098c411224a8af9f626d0. We’ve never bundled these proprietary fonts. Change-Id: I6ad6e7294504093cd0d64755ec72decf2bacc3f0 Reviewed-on: https://gerrit.libreoffice.org/16125 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-06-03Build time option --disable-extension-updateKatarina Behrens1-1/+5
to disable the possibility to update installed extensions Change-Id: Ifdee0f3b13ee3e2bcb288c8ded98cb9805a6e55a
2015-05-19upload libwps 0.4.0osnola2-0/+2
Change-Id: I9da61333b7c46d20cf7010553929b141ec011d84
2015-05-18scp2: fix --disable-pythonAndras Timar1-2/+2
Change-Id: Iec27f9d9efb506d67de6bc20eb0a8eef46a58ebf Reviewed-on: https://gerrit.libreoffice.org/15778 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-05-14do not set unix executable bit for CREDITS.fodt, LICENSE.fodt and NOTICEAndras Timar1-3/+3
Change-Id: Iab15ca1479d39e480369a18a7b043675d319f2ca
2015-05-01scp2: add scanner ui files to language pack templateAndras Timar1-0/+1
Change-Id: I10105770a119db8a21a3d09642f99b556440a57d
2015-04-30tdf#89152 add missing .ui localizations to install scriptAndras Timar1-0/+1
Change-Id: I32368329edfff18ea2a73de9a4cf60b2f734a54d
2015-04-20scp2: remove unused gidsMatúš Kukan2-20/+1
Change-Id: I723e752ff4bab9e36b3f3a08fc1fe8d10511d774
2015-03-05add country to strings refering to Brazilian PortugueseStanislav Horacek3-3/+3
Change-Id: If4487d7157adb949aca9ed0ca0739a00152e6955 Reviewed-on: https://gerrit.libreoffice.org/14747 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-28scp2: remove now unused variableMichael Stahl1-1/+0
Change-Id: I85c0db36709f545bf2d4eaba9b458e4741b7879b