Age | Commit message (Collapse) | Author |
|
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>
|
|
Originally added with 78e8d5f0d62f910b8561a1c4fd7ebd8ae4cfb9f8 "Added option to
hide external link buttons on Start Center".
The use of BackingWindow::mnHideExternalLinks was remove with
74144e53a88d17305469f6b315a01f16fede8878 "startcenter: Tweak Start Center
layout", and then the member and its initialization from the
StartCenterHideExternalLinks configuration property was removed with
d7824bf16898d8cb776420e0c2bff82e6df61b86 "loplugin:unusedfields in sfx2 part2".
(The opportunity to already remove STARTCENTER_HIDE_EXTERNAL_LINKS from
instsetoo_native/util/openoffice.lst.in had been missed in
89ac3c4acae1f0ffe3e96933d3449749ddf86847 "replace variables in main.xcd already
in gbuild".)
Change-Id: I35bbd94db88939d7724616fa22a74e18552a4ad8
Reviewed-on: https://gerrit.libreoffice.org/55379
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Its use has been removed with e161e35f55d0ff73d735fa4dbd578c072c1c3d38
"installer: Remove packager.pl" (and changes to the file itself also stopped in
2013).
Change-Id: I3bf18849a80abd5b774f1a6030c514e5891e0350
Reviewed-on: https://gerrit.libreoffice.org/54769
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
...by extending the hackery in helpcontent2/CustomTarget_html.mk (see comment
there). (Ultimately, the gbuild HelpTarget machinery should probably be adapted
to the needs of this new help format, once the old help format is no longer
supported?)
The Perl packaging code finds source files through the "include" paths specified
in instsetoo_native/util/openoffice.lst.in. To avoid potential name clashes,
put the new .filelist files into
workdir/CustomTarget/helpcontent2/help3xsl/filelists/html-help/ sub-directories.
read_filelist in solenv/bin/modules/installer/filelists.pm does not strip white
space following the last item in a file list, but (with HAVE_GNUMAKE_FILE_FUNC)
the gb_HelpTarget_get_translation_target .filelist files (which are then
transformed with sed into the .html .filelist files read by the Perl packaging
code) may contain such trailing white space. So $(strip ...) their content in
solenv/gbuild/HelpTarget.mk.
This is the core part of a change spanning core and helpcontent2.
Change-Id: I82e0093ea2064725327330c5485f8e581573e1f2
|
|
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>
|
|
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>
|
|
Change-Id: Iad07c19a6f87ea697a499b6075752d9f24ba1cb4
Reviewed-on: https://gerrit.libreoffice.org/40957
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
USERDIRPRODUCTVERSION is stuck at 4 now (as its main use is for the version
number of the UserInstallation directory), so use LIBO_VERSION_MAJOR instead
(like generation of the version ini-file counterpart for instdir/ does in
instsetoo_native/CustomTarget_setup.mk).
Change-Id: Ib87536d335487383940cff2f69c864a33f05bbee
Reviewed-on: https://gerrit.libreoffice.org/35301
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Change-Id: I8a2bbd05ccdf71a59a0c74d5595c37b2308988ea
Reviewed-on: https://gerrit.libreoffice.org/34091
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
|
|
The new option thoroughly replaces the product name mentioned in the
AC_INIT() call. Work in progress.
Also take care of spaces in the product name in a more systematic
fashion.
This should affect mainly OS X where the final app bundle that is
installed should use the product name as such, including spaces, if
any. However, our build system does not cope that well with having an
app bundle with spaces in it in instdir. So in instdir, and also in
test-install, spaces are stripped away from the product name when used
as part of the app bundle name.
Change-Id: Ic16b5039f23c96a4f39387a1869faeb25e05aafb
|
|
Change-Id: Ied46fd0bfaf010fc819e312a49e2fe3aa5656ee4
Reviewed-on: https://gerrit.libreoffice.org/19255
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
values for actual installer versions come from openoffice.lst, add a
hint to the instdir-makefile
Change-Id: I6eea5585dd776d4d6071af7b508a91a9c385cb3a
|
|
... 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
|
|
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>
|
|
Change-Id: I29f7efd065805b12199b8a6a3aadcf62cdcecee7
|
|
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>
|
|
Change-Id: I69d52554b531dab6fc12ffe16e6ca91241fda3a5
Reviewed-on: https://gerrit.libreoffice.org/14283
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
|
|
...and not only for instdir/, as was done in
ab67b79c7469cea7de82b6eb6ca1f690063c069c "set OOo reference version to 4.1 for
incompatible MessageBox changes."
Change-Id: I58931982153e619c678adde6cf01ec461dc0d2f5
|
|
The core package will obsolete the individual ones (of the same
major.minor version)
Change-Id: I30dea2c08ec7eca052db2706b7f9f30f91e37095
|
|
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.
|
|
so don't limit the installer to one single file, but use 2 instead
Change-Id: I6fb22d217e1afe71143f0b3a5999e54eec190ddd
|
|
Change-Id: Ie828de19cc35228cd332ecbb5e11f2edb281bad8
|
|
Change-Id: I8069657d8829a0315c704e884a1cf15b26e02eb8
|
|
get_Source_Directory_For_Files_From_Includepathlist already
has a special hack to find all the files in instdir so ideally it should
not be necessary to put these directories on the include path.
Clean up readlicense_oo to make that possible; also copying license.txt
as-is to LICENSE on Unix but first converting it on WNT is rather silly...
Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c
Reviewed-on: https://gerrit.libreoffice.org/6613
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ic84cdc33f470ce3ed143d86add04a422f8b9e365
Reviewed-on: https://gerrit.libreoffice.org/6614
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I3f2b12534b6d83e4ae2c2a61a6f81ddf8cdad2cc
|
|
... it is an abbreviation of "Solar Version".
Since nobody can remember that:
remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath
and any mention thereof.
Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad
Reviewed-on: https://gerrit.libreoffice.org/6515
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I65ca50ccc512e35a5b95c2482f3a8833d1a7294b
|
|
Change-Id: I741edcabf86801f77ff58bc42a81372053c7901b
|
|
- remove Package_readme, use generated files from WORKDIR via include
path
- Package_license and Package_files deliver to INSTDIR
- split up Package_odk_shared_readme to have extra Package for
generated files
- gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR
Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
|
|
... instead add an include path to the installer.
Change-Id: I5650d5d1d84620a04a9a92825733f3927da2053d
|
|
... and move the OSX specific files there too so we don't need several
include paths.
Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3
|
|
... put the CustomTarget dir on the search path instead.
Change-Id: I2888e10bfa58d3c5b0f39958328efb14c3ce92a9
|
|
Tweak the installer so it reads the included files from SRCDIR.
Change-Id: Ic4d3d2c003c2d0c5aebea6dd32f5989f3d4f04e4
|
|
...as per #libreoffice-dev IRC:
Sep 19 10:32:24 <mst__> sberg, moggi why the hell is that thing named
"cppunit/cppunittester" and inside a subdir? it's obstructing my attempt to
put it in $(INSTDIR)/program
Sep 19 10:33:28 <mst__> (... and if you wonder "wtf does it have to do with
INSTDIR" you have never heard of awesome LibreOffice_Test installset.... not
that i would know who needs it :)
Sep 19 10:36:36 <sberg> mst__, it is in a subdir of solver/*/bin so that on
Windows it would not accidentally have picked DLLs next to itself instead of
the module-local DLLs it was supposed to test (back when we had module-local
output trees)
Sep 19 10:37:02 <mst__> sberg, ahh hysteric reasons then, /me renames it
Sep 19 10:37:55 <tml> mst__, if nobody you know uses LibreOffice_Test, just kill
it?
Sep 19 10:38:59 <sberg> mst__, tml, LibreOffice_Test was conceived by pmladek
and/or kendy, IIRC
Sep 19 10:40:31 * kendy does not remember anything about it :-)
Sep 19 10:42:17 <sberg> wasn't that something so users (or QA people?) could
easily run the smoketest against an installation, to see whether the
installation is any good at all, by installing that LibreOffice_Test alongside
the installation proper?
Sep 19 10:43:26 <sberg> mst__, ...and I'd unscientifically vote to kill it
Sep 19 11:34:23 <pmladek> mst__, sberg: I have created the LibreOffice_Test
package for one QA guy. He does not longer work on LO. I am not sure if anyone
else started to use it. So, I think that it can be killed.
Oct 17 18:18:07 <tml_> sberg: have you ever noticed that when you try to
actually run instdir/unxmacxi/LibreOfficeDev.app , the system actually tries
to run cppunittester inside the app bundle (it says so in the crash report)
(it crashes because cppunittester requires a specialized DYLIB_LIBRARY_PATH
apparently)
Oct 17 18:19:29 <tml_> I suspect that the system when cppunittester as part of
the build process is run from inside instdir (i.e. inside an app bundle) the
system "caches" this false knowledge, and thinks that the executable of the
app bundle is cppunittester...
Oct 17 18:19:36 <sberg> tml_, no, never noticed; with "run
instdir/unxmacxi/LibreOfficeDev.app" you mean calling "open
instdir/unxmacxi/LibreOfficeDev.app"? (I always call
.app/Contenst/MacOS/program explicitly)
Oct 17 18:19:52 <tml_> yes, I mean "open instdir/..."
Oct 17 18:20:53 <tml_> some googling tells me that at least years ago, the
CFBundleExecutable key in the Info.plist is ignored if it is manually changed,
so I guess similar caching of mapping between an app bundle and which
executable to actually run happens in this case
Oct 17 18:23:17 <tml_> and last year somebody even claims "And while on Mountain
Lion, CFBundleExecutable seems to be a no-op", which would be odd, surely
there must be widely used apps that have several executables inside the MacOS
directory; how would the system know which one to run when the app is run?
Oct 17 18:24:38 <tml_> hmm, apparently the code that handles this might be open
source even, http://www.opensource.apple.com/source/CF/CF-744.18/CFBundle.c
Oct 17 18:25:52 <tml_> some mention of "caches" there yes, my guesses might be
right
Oct 17 18:27:05 <tml_> if I cp -R instdir/unxmacxi/LibreOffice.app foo.app and
open foo.app, it works fine
Oct 17 18:28:33 <tml_> anyway, I guess it would be cleaner to have cppunittester
somewhere else even without this problem
Oct 17 18:37:09 <sberg> tml_, yes, IIRC having cppunittester in instdir was a
misguided mst decision, because that odd LibreOffice_Test product (that
pmladek said nobody needs any longer anyway) includes it; I think consensus
was to kill LibreOffice_Test and move cppunittester where all the other NONE
executables are, but looks like nobody executed
Oct 17 18:37:55 <tml_> ah ok, so mst should know what needs to be done? good, no
need for me to try to hack this now then
Oct 17 18:38:19 <sberg> tml_, I'll do the cleanup tomorrow, unless somebody
beats me
This removes smoketest/losmoketest et al along with the *_Test product, as they
seem to not make sense without it anyway. smoketest/Executable_libtest.mk
appears to be a test that could also be run during the build, and only ended up
in the *_Test product by accident, so I left it untouched for now.
Change-Id: I8024472c909fe0a885eb08ef4d3777f8a9e1f7c8
|
|
70c35265f517ef372cb739d4cc64499abf57a838 and
f89cce877cc0480e00ee226780dec887f9d0063a moved most stuff to instdir,
but forgot about epm and deb-builds. libgetuid.so that is needed to
build the debs is in instdir/ure/lib, but that wasn't added to the list
of include paths.
Change-Id: Iaf3f8cb2f6329dd66fe9f3862fd71f2037813d97
Reviewed-on: https://gerrit.libreoffice.org/6142
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Instead hard-code OpenOffice.org 1.1 as the value, since StarOffice and
StarSuite are irrelevant.
Change-Id: I9ab3d1cf38cf64cd4e440b3ae43158f748ead7d2
|
|
After recent instdir changes the SCPZIP_REPLACE thing was not used any
more for Info.plist, so all the ${FOO} things were left in Info.plist
unexpanded with predictably wonky results, a non-working app.
Instead just expand it from the configure script.
While at it, use a correct CFBundleShortVersionString: only three
integers should be in that.
Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION
as 1.0, and drop the "variables", as that is what those "variables"
*means*. They were used to refer to the OOo 1.0 formats. (It would
have been utterly wrong to define them as something else, like another
product name and a newer version number, in openoffice.lst, so
pointless to have them there.)
Drop the meaningless BUILDIDCWS.
Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d
|
|
INSTDIR has everything that will be installed anyway, so ideally the
file search patch should only be INSTDIR + whatever is needed to get the
Package file lists; especially WORKDIR seems inappropriate there.
The exception is extension .oxt files which apparently are not in
INSTDIR; not sure what to do about those.
Change-Id: I2477c25ab9fcf953fae9c219e76c467e14729cda
|
|
Change-Id: Iafadaea87501bc3675eaf2856b5050a7e3ecaa37
|
|
The previous commit changed several nodes in main.xcd from
LibreOfficeDev to LibreOffice; revert that.
Change-Id: Ib1c114a0716a6a930c52c9c9a9144154fcb3934d
|
|
Build Catalan-Valencian as ca-valencia instead of ca-XV private-use.
Introduced LANGUAGE_CATALAN_VALENCIAN 0x0803 mapping to ca-ES-valencia,
preserving old ca-XV and qcv-ES mappings to now
LANGUAGE_CATALAN_VALENCIAN and LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN
0x8003 to ca-ES-valencia.
Removed special !bUserInterfaceSelection treatment from
MsLangId::getReplacementForObsoleteLanguage() and added the usual
obsolete replacement instead.
Change-Id: I2fdd8b0bac55d4b4ae2cbf3c3645f09fefec9b6e
|
|
Apparently causes problems for some people.
Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.
Change-Id: I7a01160369ed8dc401625c06760008341afcee67
|
|
This broke incremental builds on MacOS X in the past, where
Package/python3.filelist was created for some reason, so the installer
did not install the Python framework.
Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae
|
|
Change-Id: Id711489ac631291fc11fe7698e5a0a4719db99d7
|
|
(cherry picked from commit 15bffb385486de2f0fd285e8d81860e85138dce6)
Conflicts:
instsetoo_native/util/openoffice.lst.README
Change-Id: Icdfbab74f437aa1179d24c251ecf74a79e4e522d
|
|
Change-Id: I03524cb562560921ea053ff81d6647664c912079
|
|
This is in preparation for using doxygen to generate IDL docs. Because
the file names generated by doxygen are essentially random, it is not
possible to use a Package to deliver them. And we really do not want to
go back to using Zip, as unpacking slows the installation down.
Change-Id: I5f4aa6bf10c6aab30a5b1870e04dca723c123317
Reviewed-on: https://gerrit.libreoffice.org/3774
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
OLDPRODUCT2 - it was a workaround for OOo 1.9, obsolete
SAMEPRODUCTS - same product have the same ProductCode, so installer detect it
anyway under normal circumstances. It is possible that a tester/developer tries
to install the same version with different ProductCode over an existing installation
(e.g. dailyes or RCs). Then we are in trouble. However, SAMEPRODUCTS was not in use.
Moreover, Windows Installer uses only the first three fields of the product version.
So we cannot make difference between e.g. 4.0.3.1 and 4.0.3.2, and this is the new versioning
scheme.
BETAPRODUCTS - LibreOffice have never used different upgrade code (BETAUPGRADECODE) for betas.
OLDPRODUCTSPATCH, SAMEPRODUCTSPATCH, NEWPRODUCTSPATCH - related to old Star Division patching
mechanism, they were commented out anyway.
STUBPRODUCTS, STUBUPGRADECODE - these look useless
Change-Id: I77d67b72e18fa6b3ba4182b99e198c42f247cea4
|
|
Use gid_File_Lib_Oox instead of auto_File_Lib_vcl which is not defined
in that case.
No idea what the code is about though.
Change-Id: I675268a3490dd1421ecf1a82ede0db527d176744
|