summaryrefslogtreecommitdiffstats
path: root/instsetoo_native
Commit message (Collapse)AuthorAgeFilesLines
* goodbye linkoo.. you have served wellMatúš Kukan2013-09-172-6/+2
| | | | | | | | | | This commit: - removes linkoo and --disable-linkoo option - removes 'dev-update' make target - creates --disable-ooenv option - removes LD_LIBRARY_PATH and PATH settings in ooenv Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
* make this work also if BUILDDIR != SRCDIRMatúš Kukan2013-09-121-1/+1
| | | | Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49
* put appropriate UserInstallation in bootstraprc on !ENABLE_RELEASE_BUILDMichael Stahl2013-09-121-1/+3
| | | | | | | This used to be handled by the "LOCALUSERDIR $ORIGIN/.." line for LibreOffice_Dev in openoffice.lst.in but that won't affect INSTDIR. Change-Id: I1acd1ee7c08c98443e1cc425e1a6bb872d7c81f7
* 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
* Fix previous fixStephan Bergmann2013-09-111-1/+1
| | | | Change-Id: I2ebee47dca633f6dab511e4dcef42bc799f1864f
* Fix pythonloader.uno ini-file contentStephan Bergmann2013-09-111-6/+18
| | | | | | cf. scp2/source/python/profileitem_python.scp) Change-Id: I49316ae078e56a961128bf59206843d0d616786e
* Towards a working instdir for Mac OS XStephan Bergmann2013-09-112-4/+4
| | | | | | | | | | | | | | | | | Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
* changed all 'sh' language to 'sr-Latn'Eike Rathke2013-09-101-3/+3
| | | | Change-Id: Iafadaea87501bc3675eaf2856b5050a7e3ecaa37
* start to use instdir for subsequentcheck tests; avoid make dev-installMatúš Kukan2013-09-091-2/+0
| | | | | | | | | | | This commit breaks linkoo. make dev-install continues to work as before but it's not necessary to use it anymore. make check now uses files copied into instdir by gbuild. TODO: fix remaining issues so that instdir is the same as install/. Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98
* add back HSQLDB_JAR to URE_MORE_JAVA_CLASSPATH_URLSMichael Stahl2013-09-091-1/+1
| | | | Change-Id: Iad3013df716f1dff66813e26c62d3275d5af2999
* properly generate rc filesMatúš Kukan2013-09-097-93/+89
| | | | Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
* gbuild: install rdb files directly in module they come fromMatúš Kukan2013-09-092-34/+0
| | | | Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
* 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
* ure: install files with filelistsMatúš Kukan2013-09-092-10/+0
| | | | | | This commit adds gb_Package_add_symbolic_link. Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
* 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
* ENABLE_RELEASE_BUILD Harmonize ENABLE_* variable to TRUE/<nothing>Norbert Thiebaud2013-08-301-3/+3
| | | | | | | Change-Id: I7387ff3d3adf9a4e7c15466076e9d84d4892bb3e Reviewed-on: https://gerrit.libreoffice.org/5703 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
* ENABLE_SCRIPTING_* Harmonize ENABLE_* variable to TRUE/<nothing>Norbert Thiebaud2013-08-301-2/+2
| | | | | | | Change-Id: I937967889da75062c792cf377ce4e13c67526162 Reviewed-on: https://gerrit.libreoffice.org/5702 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
* fdo#65129 Windows Installer checks OS version before proceedingAndras Timar2013-08-224-6/+10
| | | | Change-Id: I827ecafe1a22c5ef860dea590799693525cec849
* Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist2013-08-191-1/+1
| | | | Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
* Simplify check for verbosityTor Lillqvist2013-08-081-2/+1
| | | | | | | | Just check for $(VERBOSE) or $(verbose) being non-empty instead of checking for $(VERBOSE) equalling "TRUE". Isn't our normal way to do a verbose make to pass verbose=t? Change-Id: Ic4ddc1fe025fed55ca56fd21b615640c389c0454
* Some more fixups towards the MsiShortcutProperty tableFridrich Štrba2013-07-241-0/+4
| | | | Change-Id: I961a2c05c175512ee1fb4b0f11d0da1d5eae1c71
* look for find-requires-gnome.sh in the right pathDavid Tardon2013-07-241-0/+5
| | | | | | ... and make sure it exists as well. Change-Id: Ia895d93d2755a2b0b9d87601ace54ee47b5c1b80
* gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_ruleMichael Stahl2013-07-161-16/+7
| | | | Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7
* 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
* do not try to install helppacks that were not builtDavid Tardon2013-06-201-1/+1
| | | | Change-Id: I0156c38e71fe46ea599a8366b953d429dfa424bb
* 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
* Check for ODK in BUILD_TYPETor Lillqvist2013-05-171-0/+2
| | | | Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9
* only create all-langs installer for windowsDavid Tardon2013-05-131-1/+1
| | | | | | | We produce standalone -langpack packages elsewhere. This should get the size of the main dmg for MacOS X back to normal. Change-Id: Ifd0cb1f9e31fe211c15636ddb6653e3672570819
* More gb_PROGRAMDIRNAME clean upStephan Bergmann2013-05-103-4/+4
| | | | Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
* copy pyuno files to instdirDavid Tardon2013-05-052-0/+13
| | | | Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
* copy more rc files to instdirDavid Tardon2013-05-052-15/+0
| | | | Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32
* copy more rdb files into instdirDavid Tardon2013-05-051-2/+16
| | | | Change-Id: I92fe5833fb7e4c869d1bf1b14b257394ce1b820b
* 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-304-7/+3
| | | | | | | | | | | | | | | | | 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
* generate versionrc for instdirDavid Tardon2013-04-282-1/+16
| | | | Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
* copy rc files to instdirDavid Tardon2013-04-286-0/+97
| | | | Change-Id: I5a4433595ac19930a40132c5749a8c0150c90aae
* copy rdbs to instdirDavid Tardon2013-04-282-0/+20
| | | | Change-Id: I1855e72efc1a034d28ca2326ad8b239e2671cea7
* gbuild: add ure-link to instdirDavid Tardon2013-04-282-0/+9
| | | | Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
* gbuild: generate ooenv for instdirDavid Tardon2013-04-283-0/+55
| | | | Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
* 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
* Fix for LibreOfficeDev naming schemeStephan Bergmann2013-04-151-7/+7
| | | | Change-Id: I77dd5b38e729310d58c92aa4aaf82228d2fe781b
* Install SDK in Windows dev-install, tooStephan Bergmann2013-04-121-2/+9
| | | | Change-Id: Ic26237c2ecdc0728be6acb6d15e2d258bf093c74
* 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>