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.
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>
... 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>
- 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
...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>
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
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
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
This is intended for bundling filelists of multiple Packages together,
to simplify the scp2 configuration.
Change-Id: I6f700f691b37375a09a5400166aac80a8bb2a2b4
Reviewed-on: https://gerrit.libreoffice.org/3230
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
With this in place, we can replace most of our Zips by Packages.
Extensions and Dictionaries are on the radar as well.
To move an installed file from zip to filelist, do:
1. Convert the Zip_foo.mk to Package_foo.mk :
- change destination paths of all files to the same ones they have in
the installation (you can find that in scp2)
- use gb_Package_set_outdir to place the files under $INSTDIR, where
they are expected.
2. Change the scp2 record:
- change filename to <package-name>.filelist
- replace ARCHIVE by FILELIST in Styles
- change Dir to FILELIST_DIR.
Change-Id: Ie17d0765406081b03dcd44a6a23cf517f2067dd3
Reviewed-on: https://gerrit.libreoffice.org/3149
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Removes:
* instsetoo_native/util/update.xml
- gen_update_info.pl can be removed ?
On Windows the binary artifacts are created now in:
workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi
Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49
Reviewed-on: https://gerrit.libreoffice.org/2242
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Removed individual options (intro* and startcenter* + images) in favor of a folder with graceful fallback.
Grouped progress bar intro settings in a text file into the branding folder
Change-Id: Ib56b80e43c474a944ac79c0a842d66487e9f91d5
Reviewed-on: https://gerrit.libreoffice.org/1704
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Currently PRODUCTEXTENSION does not have a value, which is unfortunate
because some places such as the soffice --help output and
utl::DocInfoHelper::GetGeneratorString() which creates the
meta:generator for ODF files (via Setup.xcu Product/ooSetupExtension)
write an incomplete version number.
Since there doesn't appear to be a point in having 2 variables here,
remove SHORT_ one and use PRODUCTEXTENSION consistently.
Change-Id: I5aac25bcedd785a098cba612643ea68fe19c77f0
..I hope :-). URE is part of normal installation.
- removes script from scp2 and unused stuff from instsetoo_native.
- removes also OxygenOffice mentioned in openoffice.lst.
Change-Id: I1673c06aa84ae0eb2adda2df78a50a5c5d0761c1
