summaryrefslogtreecommitdiff
path: root/instsetoo_native
AgeCommit message (Collapse)AuthorFilesLines
2015-10-16drop gconf integration as per ESC decisionBjoern Michaelsen1-26/+0
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-08OOOVENDOR is redundant here, it is defined by configureAndras Timar1-1/+0
Change-Id: Ied46fd0bfaf010fc819e312a49e2fe3aa5656ee4 Reviewed-on: https://gerrit.libreoffice.org/19255 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-10-02Ignore grep return code for MSI buildsJan-Marek Glogowski1-1/+1
So "grep -v" returns != 0, if your input or output file is empty. which breaks the Jenkins build, because Jenkins runs scripts with -xe per default. The "strip comments" grep currently fails for the empty file instsetoo_native/inc_openoffice/windows/msi_templates/components.txt Change-Id: I53a477702dbcc3c00c4a23263c3b402cb936250a
2015-09-24sync splash-progressbar position for installets with instdirChristian Lohmaier2-5/+6
values for actual installer versions come from openoffice.lst, add a hint to the instdir-makefile Change-Id: I6eea5585dd776d4d6071af7b508a91a9c385cb3a
2015-09-02ditch gnome-vfs2 supportCaolán McNamara1-7/+0
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-1/+1
...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 Bergmann1-1/+1
Change-Id: I1ac90d4253230d55e289135da4e1837a3f2d42e9
2015-08-21Generalize CONFIGURATION_LAYERS "winreg:" notationStephan Bergmann1-1/+1
...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-08-11gbuild/config stop using VERBOSE, use only verbose=tNorbert Thiebaud1-1/+1
configure.ac was setting VERBOSE=YES/NO when really we use verbose=t or verbose= Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299 Reviewed-on: https://gerrit.libreoffice.org/17634 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-07-31tdf#93004 msi banner: avoid overlapping text with grey backgroundChristian Lohmaier1-0/+0
by reducing the width of the graphical element Change-Id: Ie100629e2602f8f9a3f0e4e1ba353178f219c9a0
2015-07-30Add missing build dependencies for *rc files.Jan Holesovsky1-0/+4
Change-Id: I0a876e9afa9a90f312d68611a8adf5a962da784d
2015-07-24update branding for 5.0Christian Lohmaier2-0/+0
about-dialog & windows installer imgs use non TDF-tagline and add Development build variant for splashscreen DS_Store for Mac dnd installer not adjusted yet Change-Id: I4ff449d9564214a80f88c752e54064b599e9948b
2015-07-14Add HKEY_CURRENT_USER registry integration.Michael Meeks1-1/+1
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 Holesovsky1-5/+5
Change-Id: Ic20314a65739d769adf3331a77f36be813da22a3
2015-07-08configmgr: support reading from a dconf layer (WIP)Stephan Bergmann1-1/+1
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-29instsetoo_native: fix building installation setsMichael Stahl2-5/+5
... after 39b04ad7cb2e10f32e92d3c9bec57e35f64a3304 started using PRODUCTNAME but here it was LibreOffice_Dev for mysterious reasons whereas PRODUCTNAME is LibreOfficeDev so rename for consistency. Change-Id: Ia5f5a24f405923a7ea1641de65709fbf842df79c
2015-06-29Remove some hard coded references to "LibreOffice" as Productname.Martin Hollmichel1-1/+1
Change-Id: Ibd0a500d7ba31ec4c25bad64b39311d45e94dca3 Reviewed-on: https://gerrit.libreoffice.org/16590 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-06-15alternative solution to avoid adding a gnome-vfs dependency if disabledCaolán McNamara3-30/+9
i.e. "don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled" seeing as setup_native/source/packinfo/packinfo_office.txt references find-requires-gnome.sh and doesn't have conditional support revert the split and put the the conditional into find-requires-gnome.sh Change-Id: I34bd37c4fd252f2175ff055024293dea946b4881
2015-06-10don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabledCaolán McNamara3-4/+30
Change-Id: I689783e176921ea03475d3e113426563bf20b9d7
2015-05-23tdf#91469: convert links in help/about to httpsJulien Nabet1-4/+4
Change-Id: I1274f75a49a999285488e99713782956e2287249 Reviewed-on: https://gerrit.libreoffice.org/15870 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-04-17instsetoo_native: also keep profile at 4 hereMiklos Vajna1-2/+2
Change-Id: I29f7efd065805b12199b8a6a3aadcf62cdcecee7
2015-04-16bump version to 5.0.0.0.alpha0+ - but keep profile at 4Christian Lohmaier1-1/+1
Change-Id: I30536ecd8a03a19a647d247e7c6ece3d6f1695c1
2015-04-10Windows installer: remove unused stringAndras Timar1-3/+0
Change-Id: I0a1163b54601932957b0217894173aeadbf34e6e Reviewed-on: https://gerrit.libreoffice.org/15223 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-04-10Don't try to install LibreOffice on XP, if it was built with SDK 8.x or higherAndras Timar6-5/+8
Change-Id: I79a357a51a3d98774745001d5f99b045ef964255 Reviewed-on: https://gerrit.libreoffice.org/15218 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-03-10libGLU actually is not required anymore for masterChristian Lohmaier1-1/+0
Change-Id: I543a561fc7fa1213c8e319f227b761f6328a6eaa
2015-03-10tdf#53861 - add libGLU.so.1 and libXinerama.so.1 to rpm/deb requirementsChristian Lohmaier1-0/+2
only used for upstream packages/when epm is used (any auto-dependency creation is disabled for those). Add two that might be missing in barebone installations Change-Id: I97c3af8cc8622c63ac831701e509097711822098
2015-02-03MSI packaging tweaks for Windows 64-bitAndras Timar1-0/+1
Change-Id: I69d52554b531dab6fc12ffe16e6ca91241fda3a5 Reviewed-on: https://gerrit.libreoffice.org/14283 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2014-12-09Allow comments is .idt files, and comment that "Excecution" is _necessary_.Jan Holesovsky2-1/+2
Change-Id: I10d0f32fedd842023bf94b252bcb48bfc2264dd4
2014-12-09Revert "Fix common typos. No automatic tools. Handmade…"Stephan Bergmann1-1/+1
This reverts commit 759c4d18d57b06dcc26fb82759599a29c61ef853, every part of it is wrong.
2014-12-09Fix common typos. No automatic tools. Handmade…Andrea Gelmini1-1/+1
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-12-03Fold URE: WindowsStephan Bergmann1-4/+4
...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 Bergmann1-2/+2
Change-Id: Id4112879e9c8cbb9d900a2f25f5f6114189137d7
2014-12-01Fold URE: Linux ure/share/misc/* -> program/Stephan Bergmann1-2/+2
...and remove now unused ure-link symlink Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-11-28Fold URE: Linux ure/share/java/* -> program/classes/Stephan Bergmann1-1/+1
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann1-3/+3
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 Bergmann2-22/+0
Change-Id: Ifa9d12fa190f929807dc0dc7342e162aeb9a0576
2014-11-26Move instdir-only ooenv into its own PackageStephan Bergmann5-15/+40
Change-Id: I399f4c5c6618dd151bd649f07e1b9d661e224324
2014-11-26Generate consistent buildid values in instdir/ setup and version ini-filesStephan Bergmann1-1/+1
...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 Bergmann1-2/+0
...and had started to have different values in instdir (ProductMajor=450, ProductMinor=0) vs. installation sets (ProductMajor=50, ProductMinor=) Change-Id: I4db2c07b5f7b011218833fc355a3097eb13d0cd4
2014-11-25Update ReferenceOOoMajorMinor to 4.1 for installation sets, tooStephan Bergmann1-1/+1
...and not only for instdir/, as was done in ab67b79c7469cea7de82b6eb6ca1f690063c069c "set OOo reference version to 4.1 for incompatible MessageBox changes." Change-Id: I58931982153e619c678adde6cf01ec461dc0d2f5
2014-11-25Remove unused URE_LIB_DIRStephan Bergmann1-1/+0
(which now had a bogus value on Mac OS X anyway) Change-Id: I5bf233506d6c658560dfadddf79a9ed8605c2a20
2014-11-20fix "Could not merge msm file into database"Christian Lohmaier1-1/+1
no idea why it fails with the typo-fix (or any change in that line for that matter)... Change-Id: I74c74e2080813ab60d4fcd48c62bb7f455046936
2014-11-18Hide instsetoo_native outputStephan Bergmann1-1/+2
Change-Id: Ifd3fca29325dc18166d041badd5664d2ad8ba7c9
2014-11-12Fix common typos. No automatic tools. Handmade…Andrea Gelmini3-3/+3
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-23kill OUTPATHNorbert Thiebaud2-4/+4
Change-Id: I91806c3a55905dfd1ae90a10bc890cc526ff3270 Reviewed-on: https://gerrit.libreoffice.org/11908 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-08fdo#82288 merge core01-core07 packages into just oneChristian Lohmaier1-2/+2
The core package will obsolete the individual ones (of the same major.minor version) Change-Id: I30dea2c08ec7eca052db2706b7f9f30f91e37095
2014-09-18Use instsetoo_native-generated uno ini-file for both instdir and instsetsStephan Bergmann3-4/+17
Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 18:43:36 +0000