summaryrefslogtreecommitdiffstats
path: root/instsetoo_native/util
Commit message (Collapse)AuthorAgeFilesLines
* cli_ure: remove CLI version PackagesMichael Stahl2013-10-301-2/+2
| | | | | | Tweak the installer so it reads the included files from SRCDIR. Change-Id: Ic4d3d2c003c2d0c5aebea6dd32f5989f3d4f04e4
* Remove *_Test product, so cppunittester can be NONE againStephan Bergmann2013-10-182-86/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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
* fix building debs with epm (find libgetuid.so in instdir)Christian Lohmaier2013-10-091-6/+6
| | | | | | | | | | | | | 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>
* remove run-time replacement of %WRITERCOMPATIBILITYVERSIONOOO11Michael Stahl2013-10-011-2/+0
| | | | | | | Instead hard-code OpenOffice.org 1.1 as the value, since StarOffice and StarSuite are irrelevant. Change-Id: I9ab3d1cf38cf64cd4e440b3ae43158f748ead7d2
* Create a proper Info.plist for the OS X app bundle already in configureTor Lillqvist2013-09-241-5/+0
| | | | | | | | | | | | | | | | | | | | | | 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
* installer: search files in INSTDIRMichael Stahl2013-09-121-6/+6
| | | | | | | | | | | 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
* changed all 'sh' language to 'sr-Latn'Eike Rathke2013-09-101-3/+3
| | | | Change-Id: Iafadaea87501bc3675eaf2856b5050a7e3ecaa37
* change PRODUCTNAME for --enable-dbgutil buildMichael Stahl2013-09-091-0/+3
| | | | | | | The previous commit changed several nodes in main.xcd from LibreOfficeDev to LibreOffice; revert that. Change-Id: Ib1c114a0716a6a930c52c9c9a9144154fcb3934d
* renamed ca-XV to ca-valencia and activated ca-ES-valencia, fdo#59867 relatedEike Rathke2013-09-041-3/+3
| | | | | | | | | | | | | | | 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
* fdo#65975: do not put MSVC 64bit runtimes in solver/binMichael Stahl2013-06-271-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. Change-Id: I7a01160369ed8dc401625c06760008341afcee67
* prefer filelist from GeneratedPackage over PackageDavid Tardon2013-06-181-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. Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae
* allow to install files from workdirMatúš Kukan2013-06-071-6/+6
| | | | Change-Id: Id711489ac631291fc11fe7698e5a0a4719db99d7
* added some more documentationOliver-Rainer Wittmann2013-05-231-0/+40
| | | | | | | | | (cherry picked from commit 15bffb385486de2f0fd285e8d81860e85138dce6) Conflicts: instsetoo_native/util/openoffice.lst.README Change-Id: Icdfbab74f437aa1179d24c251ecf74a79e4e522d
* clean up include paths for installerDavid Tardon2013-05-051-6/+6
| | | | Change-Id: I03524cb562560921ea053ff81d6647664c912079
* gbuild: add Package equiv. for copying whole dirsDavid Tardon2013-05-041-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>
* remove unused product variables from Windows installerAndras Timar2013-04-301-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
* fix installing for --enable-mergelibsMatúš Kukan2013-04-161-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
* instsetoo_native: gid_File_Lib_Vcl is now auto_File_Lib_vclMichael Stahl2013-04-151-2/+2
| | | | Change-Id: Ie5404a378cc3bffdc3ba7a858814f3490fb82e3e
* use only major version for the system installation path on Windows (fdo#62303)tinderbox2013-04-111-0/+4
| | | | | | | It means the LO-4.1.x will get installed into "LibreOffice 4" instead of "LibreOffice 4.1" Change-Id: Ideae670437fda9847d4ee3a86c4cab079d8da07a
* add gbuild class PackageSetDavid Tardon2013-04-111-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>
* use filelist install method for udkapi and offapiDavid Tardon2013-04-051-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>
* allow to put files listed in file into installationDavid Tardon2013-04-051-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>
* add $OUTDIR/pck to search path for SDK productDavid Tardon2013-03-311-2/+2
| | | | | | | ... so it is possible to drop the copying-to-bin hack in ZipPackage.mk and ZipUnoApi.mk . Change-Id: Ic506e25a21003fca491d0902b5d8f282775da229
* fixes for renaming LOdev builds to LibreOfficeDevLuboš Luňák2013-03-031-9/+9
| | | | Follow-up to 16826147188bd78d67b97863226f903cc24add71 .
* rename LOdev builds to LibreOfficeDevPetr Mladek2013-03-011-9/+9
| | | | | | | | It is similar change that we did for the release builds. Also fixes make-dev install on Windows. Change-Id: I7d9a4bc2e7b14e79516acdfb90c709dbde1378ab
* instsetoo_native: convert to gbuildPeter Foley2013-02-242-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>
* Update Branding for 4.0 (.1)Stefan Knorr2013-02-181-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>
* use correct default values for the splash progressbarPetr Mladek2013-02-011-4/+4
| | | | | | they are not longer forced from configure Change-Id: I8ea37b7233138de2900caf231762eefec0ba6563
* Add option to set bundle identifier and use it when signingTor Lillqvist2013-02-011-0/+6
| | | | | | Sign also all the dylibs and frameworks in the bundle. Change-Id: I7f67b9d7eda0204b24e2ea2ef44a53fb8db0f8aa
* we don't build language packs on WindowsAndras Timar2013-01-301-10/+2
| | | | Change-Id: I672886764e9451a983b823ec3666f126b758bd1e
* Consolidated branding in configureMathias Michel2013-01-301-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>
* installer: remove SHORT_PRODUCTEXTENSIONMichael Stahl2013-01-181-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
* installer: remove SERVICETAG remnants of product registrationMichael Stahl2013-01-181-6/+0
| | | | Change-Id: Ic87bb4666bcc4b28476dbfe2193a8330413547cf
* there is no standalone URE installationMatúš Kukan2013-01-163-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
* Generate also the ABOUTBOXPRODUCTVERSIONSUFFIX from the AC_INITTor Lillqvist2013-01-161-3/+3
| | | | Change-Id: I9b7ce03daac7ae223cba1b8741042431aabe7f59
* Remove unused variablesTor Lillqvist2013-01-161-15/+0
| | | | | | POSTVERSIONEXTENSIONUNIX and LONG_PRODUCTEXTENSION are not used anywhere Change-Id: Id1f2db293fff134075b6658b738dc3be8d17a279
* Ignore and distclean generated filesStephan Bergmann2013-01-141-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
* Expand also openoffice.lst for version numbers from configuryTor Lillqvist2013-01-121-49/+49
| | | | Change-Id: I7bad1639488616db3823e25d6508e8e57f2212ef
* use "LibreOffice" instead of "LibO" for final download file namesPetr Mladek2013-01-071-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
* Fix the MSVC build with --without-helpTor Lillqvist2012-12-261-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
* Get rid of (most uses of) GUITor Lillqvist2012-12-251-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>
* Make KeyID (qtz) work againAndras Timar2012-12-141-2/+2
| | | | | | | Conflicts: configure.ac Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
* bump product version to 4.1.0.0.alpha0+, build id to 0Petr Mladek2012-12-041-46/+46
| | | | Change-Id: I0a8e86dc862b05e8c92738a565ae1513ea9e60b0
* remove qtz temporarily, until it works again reliablyAndras Timar2012-11-211-1/+1
| | | | Change-Id: I66b117a56d8d545e6d09bfacb897ade383818895
* bump product version to 4.0.0.0.alpha1+, release number to 1Petr Mladek2012-11-201-20/+20
| | | | Change-Id: Iaf5af009ac86909bb293be4ab8ae3902215b3bfd
* re-base on ALv2 code. Includes:Michael Meeks2012-11-151-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.
* bump version to 4.0.0.0.alpha0+Petr Mladek2012-11-121-45/+45
| | | | Change-Id: I04cb89d04ebebcaef2276813864f79365f6899fd
* Fix Windows dev-install for --enable-release-build, --with-lang=... etc.Stephan Bergmann2012-08-161-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
* Kill FORCE2ARCHIVE.Jan Holesovsky2012-07-241-9/+0
| | | | Change-Id: Ie72dcc8ef9e82da1f0aa328648f20f9ed4a20482
* fdo#51890: Display themed progress meter instead of the native oneStefan Knorr (astron)2012-07-161-1/+1
| | | | Change-Id: Ia72f46763de40205b1a8a9bb94839bb420933443
generated by cgit (git 2.34.1) at 2024-08-09 07:12:51 +0000