summaryrefslogtreecommitdiff
path: root/instsetoo_native/util
AgeCommit message (Collapse)AuthorFilesLines
2013-06-27fdo#65975: do not put MSVC 64bit runtimes in solver/binMichael Stahl1-2/+2
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. (cherry picked from commit 9a6d5f15afa16e68d38e4a0cfd5ef904be481a17) Conflicts: instsetoo_native/util/openoffice.lst.in Change-Id: I7a01160369ed8dc401625c06760008341afcee67 Reviewed-on: https://gerrit.libreoffice.org/4576 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-18prefer filelist from GeneratedPackage over PackageDavid Tardon1-4/+4
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. (cherry picked from commit d72e170d6a956cf2cc7da1c0b5917bca3e79f5ce) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: instsetoo_native/util/openoffice.lst.in Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae
2013-05-05clean up include paths for installerDavid Tardon1-6/+6
Change-Id: I03524cb562560921ea053ff81d6647664c912079
2013-05-04gbuild: add Package equiv. for copying whole dirsDavid Tardon1-4/+4
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>
2013-04-30remove unused product variables from Windows installerAndras Timar1-4/+0
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
2013-04-16fix installing for --enable-mergelibsMatúš Kukan1-2/+2
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
2013-04-15instsetoo_native: gid_File_Lib_Vcl is now auto_File_Lib_vclMichael Stahl1-2/+2
Change-Id: Ie5404a378cc3bffdc3ba7a858814f3490fb82e3e
2013-04-11use only major version for the system installation path on Windows (fdo#62303)tinderbox1-0/+4
It means the LO-4.1.x will get installed into "LibreOffice 4" instead of "LibreOffice 4.1" Change-Id: Ideae670437fda9847d4ee3a86c4cab079d8da07a
2013-04-11add gbuild class PackageSetDavid Tardon1-4/+4
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>
2013-04-05use filelist install method for udkapi and offapiDavid Tardon1-2/+2
... so we can drop ZipUnoApi again. Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa Reviewed-on: https://gerrit.libreoffice.org/3152 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-05allow to put files listed in file into installationDavid Tardon1-2/+2
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>
2013-03-31add $OUTDIR/pck to search path for SDK productDavid Tardon1-2/+2
... so it is possible to drop the copying-to-bin hack in ZipPackage.mk and ZipUnoApi.mk . Change-Id: Ic506e25a21003fca491d0902b5d8f282775da229
2013-03-03fixes for renaming LOdev builds to LibreOfficeDevLuboš Luňák1-9/+9
Follow-up to 16826147188bd78d67b97863226f903cc24add71 .
2013-03-01rename LOdev builds to LibreOfficeDevPetr Mladek1-9/+9
It is similar change that we did for the release builds. Also fixes make-dev install on Windows. Change-Id: I7d9a4bc2e7b14e79516acdfb90c709dbde1378ab
2013-02-24instsetoo_native: convert to gbuildPeter Foley2-388/+0
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>
2013-02-18Update Branding for 4.0 (.1)Stefan Knorr1-5/+5
(c) Maxim Darak, Mirek Mazel 2013 Change-Id: I30fdb3234152e746e8a2a565310ab1b22115315c Reviewed-on: https://gerrit.libreoffice.org/2236 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-01use correct default values for the splash progressbarPetr Mladek1-4/+4
they are not longer forced from configure Change-Id: I8ea37b7233138de2900caf231762eefec0ba6563
2013-02-01Add option to set bundle identifier and use it when signingTor Lillqvist1-0/+6
Sign also all the dylibs and frameworks in the bundle. Change-Id: I7f67b9d7eda0204b24e2ea2ef44a53fb8db0f8aa
2013-01-30we don't build language packs on WindowsAndras Timar1-10/+2
Change-Id: I672886764e9451a983b823ec3666f126b758bd1e
2013-01-30Consolidated branding in configureMathias Michel1-0/+2
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>
2013-01-18installer: remove SHORT_PRODUCTEXTENSIONMichael Stahl1-12/+6
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
2013-01-18installer: remove SERVICETAG remnants of product registrationMichael Stahl1-6/+0
Change-Id: Ic87bb4666bcc4b28476dbfe2193a8330413547cf
2013-01-16there is no standalone URE installationMatúš Kukan3-113/+0
..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
2013-01-16Generate also the ABOUTBOXPRODUCTVERSIONSUFFIX from the AC_INITTor Lillqvist1-3/+3
Change-Id: I9b7ce03daac7ae223cba1b8741042431aabe7f59
2013-01-16Remove unused variablesTor Lillqvist1-15/+0
POSTVERSIONEXTENSIONUNIX and LONG_PRODUCTEXTENSION are not used anywhere Change-Id: Id1f2db293fff134075b6658b738dc3be8d17a279
2013-01-14Ignore and distclean generated filesStephan Bergmann1-0/+1
(Modelling .gitignore-per-directory instead of a single one in the root dir after exisiting config/.gitignore. No idea which approach is better.) Change-Id: I0ae90103ada4bfff48e90afcf3903bd3ba909314
2013-01-12Expand also openoffice.lst for version numbers from configuryTor Lillqvist1-49/+49
Change-Id: I7bad1639488616db3823e25d6508e8e57f2212ef
2013-01-07use "LibreOffice" instead of "LibO" for final download file namesPetr Mladek1-4/+4
"LibreOffice" is the name of the product and we should promote it. This change has been proposed on the ESC call. Change-Id: I755ea5b2ec7b6357a7fd2c86ec8479737696042b
2012-12-26Fix the MSVC build with --without-helpTor Lillqvist1-1/+4
It tried to build helppack installer(s) anyway as it looked for "HELP" in BUILD_TYPE and was fooled by the "DBGHELP". Change-Id: I9a271a464a776f4f4dad8ea1bef662966b88f944
2012-12-25Get rid of (most uses of) GUITor Lillqvist1-11/+11
GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-14Make KeyID (qtz) work againAndras Timar1-2/+2
Conflicts: configure.ac Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
2012-12-04bump product version to 4.1.0.0.alpha0+, build id to 0Petr Mladek1-46/+46
Change-Id: I0a8e86dc862b05e8c92738a565ae1513ea9e60b0
2012-11-21remove qtz temporarily, until it works again reliablyAndras Timar1-1/+1
Change-Id: I66b117a56d8d545e6d09bfacb897ade383818895
2012-11-20bump product version to 4.0.0.0.alpha1+, release number to 1Petr Mladek1-20/+20
Change-Id: Iaf5af009ac86909bb293be4ab8ae3902215b3bfd
2012-11-15re-base on ALv2 code. Includes:Michael Meeks1-0/+17
Patches contributed by: Armin Le Grand. #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task. http://svn.apache.org/viewvc?view=revision&revision=1195906 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles http://svn.apache.org/viewvc?view=revision&revision=1293316 #119337# Solves the wrong get/setPropertyValue calls in SvxShapeText (and thus in SvxOle2Shape) http://svn.apache.org/viewvc?view=revision&revision=1344156 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117717#: remove wrong assertion http://svn.apache.org/viewvc?view=revision&revision=1172349 Patch contributed by Herbert Duerr goodbye Registration and License dialogs, don't let the door hit you http://svn.apache.org/viewvc?view=revision&revision=1172613 help gcc 4.6.0 on 32bit ubuntu 11.10" http://svn.apache.org/viewvc?view=revision&revision=1245357 Do not add targets for junit tests when junit is disabled. Patch contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1241508 Revert "sb140: #i117082# avoid unncessary static class data members commit 21d97438e2944861e26e4984195f959a0cce1e41. remove obsolete FreeBSD visibility special case. retain consolidated BSD bridge code, remove OS/2 pieces.
2012-11-12bump version to 4.0.0.0.alpha0+Petr Mladek1-45/+45
Change-Id: I04cb89d04ebebcaef2276813864f79365f6899fd
2012-08-16Fix Windows dev-install for --enable-release-build, --with-lang=... etc.Stephan Bergmann1-5/+4
Introduced special token LIBO_DEV_INSTALL=TRUE to communicate what install set to build from Makefile.top's dev-install target to instsetoo_native/util/makefile.mk. Somewhat arbitrarily, always use a "release" install set regardless of --enable-release-build (the dev-install set is used for "make check," and it is safer to test "release" install sets in --disable-release-build builds than the other way around, should those builds ever start to deviate significantly). The "always build a defaul-laguage openoffice product" logic had been obsoleted a long time ago already. Change-Id: I64ec87a0b8dc6fe81cab5531c43e29db3f5128af
2012-07-24Kill FORCE2ARCHIVE.Jan Holesovsky1-9/+0
Change-Id: Ie72dcc8ef9e82da1f0aa328648f20f9ed4a20482
2012-07-16fdo#51890: Display themed progress meter instead of the native oneStefan Knorr (astron)1-1/+1
Change-Id: Ia72f46763de40205b1a8a9bb94839bb420933443
2012-06-19No need to strip archive setsStephan Bergmann1-1/+1
...and we are not stripping other PKGFORMATs, either. Change-Id: I0d0bc3620a15a35bc08de89260420032074791d2
2012-06-19switch to the new version schemePetr Mladek1-23/+23
use 3.7.0.0.alpha0 where possible; use the suffix "+" in the about dialog to signalize non-release builds Change-Id: If09c78cd30b10e54c46f737a695e0194039c7efc
2012-06-05bump product version to 3.7.0-alpha0+Petr Mladek1-49/+49
keep the package version on 3.6.98, so we could restart release number from 0 for Betas and RCs Change-Id: I7a862a202d2080dcc924362e4deb0e026c940a34
2012-05-31bump product version to 3.6.0-alpha1+Petr Mladek1-11/+11
Change-Id: I94bc00f8a1e646b476f20b3ad954eaae19fef6cb
2012-05-24fdo#50162 merge rtlbootstrap.mk into configure.inDavid Ostrovsky1-1/+0
Change-Id: I241be2704a069ec1f6be5861084039569673cc12
2012-05-09partially revert 6d1f7fadc06bb57b175d5f4b94147373fc07f8a8Andras Timar1-0/+1
Change-Id: I I I0bfc367a3b2c551509b383fc4f6dcaa3cb8661f8
2012-04-27fdo#48087 get real version numbers from executables for the File table of MSIAndras Timar1-8/+0
This is only a partial fix to the bug, the second part will be the creation and population of MsiFileHash table.
2012-04-26fdo#39643: Remove --disable-strip-solver configure optionDavid Ostrovsky1-5/+5
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-03-23old products are unconditionally removed, clean up unused codeAndras Timar1-2/+0
2012-03-20remove unused License Agreement dialog from MSIAndras Timar1-1/+0
2012-03-20remove unused xpdinstaller moduleAndras Timar1-6/+3