summaryrefslogtreecommitdiff
path: root/instsetoo_native
AgeCommit message (Collapse)Author
2013-09-25Start hacking --enable-canonical-installation-tree-structure back into shapeTor Lillqvist
Had been totaly broken by the recent changes. (Which is fine, it is just an experimental hack anyway, I am not sure whether it will ever be used in anger. Just a pet peeve of mine, I dislike seeing libraries, configuration files, resources etc mixed together in one "program" folder, especially on OS X, where the convention is to have app-specific dylibs and frameworks in "Frameworks", and resource files in "Resources". But this is not any requirement as such; there are apps in the Mac App Store that blatantly "break" this convention.) Basically, replace uses of gb_PROGRAMDIRNAME and gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which for normal builds all expand to the same "program" anyway. Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
2013-09-24Create a proper Info.plist for the OS X app bundle already in configureTor Lillqvist
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
2013-09-23Try to fix cross-compilationTor Lillqvist
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
2013-09-21fdo#58144 - disable the ARP 'Remove' button on Windows XPAndras Timar
Windows installer on Windows XP cannot display messages, when the installer database is encoded in UTF-8 and support for CTL languages is not installed. This patch is a workaround, it disables the 'Remove' button in Control Panel's Add or Remove Programs applet, so the user has to choose 'Change', and has to uninstall LibreOffice with the Wizard, which does not exhibit the problem. Initially this bug was not expected, when we changed the enconding from legacy codepages to UTF-8 - I would say irreversibly. Then the severity of the bug was underestimated, because usually uninstallation needs no user interaction, so it does not matter, if the text is unreadable. However, in some circumstances uninstallation needs to reboot the computer, and the user needs to understand the question, whether to reboot now or later. Change-Id: I7d6b4e82cbe4142d23c29313e43a90fa43944b2f
2013-09-17goodbye linkoo.. you have served wellMatúš Kukan
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
2013-09-12make this work also if BUILDDIR != SRCDIRMatúš Kukan
Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49
2013-09-12put appropriate UserInstallation in bootstraprc on !ENABLE_RELEASE_BUILDMichael Stahl
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
2013-09-12installer: search files in INSTDIRMichael Stahl
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
2013-09-11Fix previous fixStephan Bergmann
Change-Id: I2ebee47dca633f6dab511e4dcef42bc799f1864f
2013-09-11Fix pythonloader.uno ini-file contentStephan Bergmann
cf. scp2/source/python/profileitem_python.scp) Change-Id: I49316ae078e56a961128bf59206843d0d616786e
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
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
2013-09-10changed all 'sh' language to 'sr-Latn'Eike Rathke
Change-Id: Iafadaea87501bc3675eaf2856b5050a7e3ecaa37
2013-09-09start to use instdir for subsequentcheck tests; avoid make dev-installMatúš Kukan
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
2013-09-09add back HSQLDB_JAR to URE_MORE_JAVA_CLASSPATH_URLSMichael Stahl
Change-Id: Iad3013df716f1dff66813e26c62d3275d5af2999
2013-09-09properly generate rc filesMatúš Kukan
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09gbuild: install rdb files directly in module they come fromMatúš Kukan
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
2013-09-09change PRODUCTNAME for --enable-dbgutil buildMichael Stahl
The previous commit changed several nodes in main.xcd from LibreOfficeDev to LibreOffice; revert that. Change-Id: Ib1c114a0716a6a930c52c9c9a9144154fcb3934d
2013-09-09ure: install files with filelistsMatúš Kukan
This commit adds gb_Package_add_symbolic_link. Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
2013-09-04renamed ca-XV to ca-valencia and activated ca-ES-valencia, fdo#59867 relatedEike Rathke
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
2013-08-30ENABLE_RELEASE_BUILD Harmonize ENABLE_* variable to TRUE/<nothing>Norbert Thiebaud
Change-Id: I7387ff3d3adf9a4e7c15466076e9d84d4892bb3e Reviewed-on: https://gerrit.libreoffice.org/5703 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-08-30ENABLE_SCRIPTING_* Harmonize ENABLE_* variable to TRUE/<nothing>Norbert Thiebaud
Change-Id: I937967889da75062c792cf377ce4e13c67526162 Reviewed-on: https://gerrit.libreoffice.org/5702 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-08-22fdo#65129 Windows Installer checks OS version before proceedingAndras Timar
Change-Id: I827ecafe1a22c5ef860dea590799693525cec849
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
2013-08-08Simplify check for verbosityTor Lillqvist
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
2013-07-24Some more fixups towards the MsiShortcutProperty tableFridrich Štrba
Change-Id: I961a2c05c175512ee1fb4b0f11d0da1d5eae1c71
2013-07-24look for find-requires-gnome.sh in the right pathDavid Tardon
... and make sure it exists as well. Change-Id: Ia895d93d2755a2b0b9d87601ace54ee47b5c1b80
2013-07-16gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_ruleMichael Stahl
Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7
2013-06-27fdo#65975: do not put MSVC 64bit runtimes in solver/binMichael Stahl
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
2013-06-20do not try to install helppacks that were not builtDavid Tardon
Change-Id: I0156c38e71fe46ea599a8366b953d429dfa424bb
2013-06-18prefer filelist from GeneratedPackage over PackageDavid Tardon
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
2013-06-07allow to install files from workdirMatúš Kukan
Change-Id: Id711489ac631291fc11fe7698e5a0a4719db99d7
2013-05-23added some more documentationOliver-Rainer Wittmann
(cherry picked from commit 15bffb385486de2f0fd285e8d81860e85138dce6) Conflicts: instsetoo_native/util/openoffice.lst.README Change-Id: Icdfbab74f437aa1179d24c251ecf74a79e4e522d
2013-05-17Check for ODK in BUILD_TYPETor Lillqvist
Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9
2013-05-13only create all-langs installer for windowsDavid Tardon
We produce standalone -langpack packages elsewhere. This should get the size of the main dmg for MacOS X back to normal. Change-Id: Ifd0cb1f9e31fe211c15636ddb6653e3672570819
2013-05-10More gb_PROGRAMDIRNAME clean upStephan Bergmann
Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
2013-05-05copy pyuno files to instdirDavid Tardon
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-05-05copy more rc files to instdirDavid Tardon
Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32
2013-05-05copy more rdb files into instdirDavid Tardon
Change-Id: I92fe5833fb7e4c869d1bf1b14b257394ce1b820b
2013-05-05clean up include paths for installerDavid Tardon
Change-Id: I03524cb562560921ea053ff81d6647664c912079
2013-05-04gbuild: add Package equiv. for copying whole dirsDavid Tardon
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 Timar
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-28generate versionrc for instdirDavid Tardon
Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
2013-04-28copy rc files to instdirDavid Tardon
Change-Id: I5a4433595ac19930a40132c5749a8c0150c90aae
2013-04-28copy rdbs to instdirDavid Tardon
Change-Id: I1855e72efc1a034d28ca2326ad8b239e2671cea7
2013-04-28gbuild: add ure-link to instdirDavid Tardon
Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
2013-04-28gbuild: generate ooenv for instdirDavid Tardon
Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
2013-04-16fix installing for --enable-mergelibsMatúš Kukan
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 Stahl
Change-Id: Ie5404a378cc3bffdc3ba7a858814f3490fb82e3e
2013-04-15Fix for LibreOfficeDev naming schemeStephan Bergmann
Change-Id: I77dd5b38e729310d58c92aa4aaf82228d2fe781b
2013-04-12Install SDK in Windows dev-install, tooStephan Bergmann
Change-Id: Ic26237c2ecdc0728be6acb6d15e2d258bf093c74
generated by cgit (git 2.34.1) at 2025-01-29 21:03:05 +0000