summaryrefslogtreecommitdiff
path: root/instsetoo_native
AgeCommit message (Collapse)AuthorFilesLines
2016-04-10enable MSP patchingAndras Timar1-1/+1
Change-Id: I6dc6435fa48d8feec261da800a5101c259d70571
2015-11-04STARTCENTER_INFO_URL = https://collaboraoffice.com/Andras Timar1-1/+1
Change-Id: Id84259ff8bf27475d63c0ab31c4312bc78cb55d8
2015-10-28Collabora Office brandingAndras Timar4-16/+16
Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
2015-10-26sync 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 (cherry picked from commit f38683a114c1c36284a795c052e8708bc65438c3) (cherry picked from commit f73c3b7d7dc68bd1b44749fdc755a9bca1bb6ce8)
2015-10-17Ignore 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 (cherry picked from commit d526f5d739bbf923a6c882cb9a92a15f590a3388) Reviewed-on: https://gerrit.libreoffice.org/19098 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e0b2971d93e0c64d1ab57b66d6f590dd1bb6a797)
2015-10-15Multilingual Mac OS X DMG for CollaboraAndras Timar1-2/+2
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2 (cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3)
2015-10-15Collabora Office EULAAndras Timar1-1/+1
Conflicts: readlicense_oo/Package_files.mk Change-Id: Ia380db465f5094216cb36526f6cc178043376356
2015-10-15Collabora Office ARP dataAndras Timar3-15/+15
Change-Id: I83d28b9bc7985f34303d3c3343f976b5a87009e1
2015-08-31Generalize 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.) Reviewed-on: https://gerrit.libreoffice.org/17891 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 53e3fb1d9337e450e926e163221fecaca13ea957, including fixes for the apparently inadvertent differences between 097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER registry integration" and its unfaithful backport 1b8812e7ad17957d8982095a37e489b8455a9bda "tdf#93546 -Add HKEY_CURRENT_USER registry integration") Conflicts: configmgr/source/components.cxx instsetoo_native/CustomTarget_setup.mk scp2/source/ooo/common_brand.scp Change-Id: Ifbcf3284d904490891642599468470d03547f92a Reviewed-on: https://gerrit.libreoffice.org/17905 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-21LibreOffice-from-Collabora versioningAndras Timar1-6/+6
Conflicts: configure.ac Conflicts: configure.ac instsetoo_native/util/openoffice.lst.in Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
2015-08-06tdf#93004 msi banner: avoid overlapping text with grey backgroundChristian Lohmaier1-0/+0
by reducing the width of the graphical element Change-Id: Ie100629e2602f8f9a3f0e4e1ba353178f219c9a0 (cherry picked from commit 303b7758e90e11aedef95e4ab51b74398cd2ce0a)
2015-08-06tdf#93007: Add missing build dependencies for *rc files.Jan Holesovsky1-0/+4
(cherry picked from commit 86d2cddad3d4529cd877debaf258256cb07f5631) Change-Id: I0a876e9afa9a90f312d68611a8adf5a962da784d Reviewed-on: https://gerrit.libreoffice.org/17413 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06update 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 (cherry picked from commit 8cfdd81b70ef37927b40497ffd10034f28335034)
2015-08-06New branding for the 5.0.Jan Holesovsky1-5/+5
Change-Id: Ifc9c0db1763f89fb7e3865f80021f57b29f47705 Reviewed-on: https://gerrit.libreoffice.org/16897 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-05-25tdf#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> (cherry picked from commit ffa560e0dec34d71f4593b7bf23ad50321548c60) Reviewed-on: https://gerrit.libreoffice.org/15877 Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org> Tested-by: Joren De Cuyper <jorendc@libreoffice.org>
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
2014-09-16Wrong URE_INTERNAL_JAVA_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
2014-09-16Wrong UNO_TYPES value for MACOSXStephan Bergmann1-1/+1
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann2-15/+32
...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 Bergmann2-15/+15
...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 Lillqvist1-8/+4
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-23Revert "--with-lang=ALL build exceeds maximum # of files in CAB"Andras Timar1-2/+0
This reverts commit 3bfac473a1b1dfb2210ec07245e649697679bd83. With Matus Kukan's work, which packs .ui files into .zip archives, file count is reduced dramatically. Multiple .cab files won't be a problem in theory, but unfortunately both .cab files had the same disk id 'DISK1' and it caused problems with MSP patch generation.
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 00:38:08 +0000