Commit Graph

136 Commits

Author SHA1 Message Date
Noel Grandin
45acf26775 remove some unused macro definitions
Change-Id: I253e5108161b932e3dc588b656e550bb9dc022b0
Reviewed-on: https://gerrit.libreoffice.org/41672
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-08-29 15:19:17 +02:00
Caolán McNamara
00657aef09 migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
  MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
  goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
  to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
  mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
  results in inserting the english original so something can be found, now the
  standard fallback of using the english original from the source key is used, so
  partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
   xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
   xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
   content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
      com::sun::resource::OfficeResourceLoader
      com::sun::resource::XResourceBundleLoader
      com::sun::resource::XResourceBundle
    when translating strings via uno apis
      com.sun.star.resource.StringResourceWithLocation
    can continue to be used

Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
2017-07-21 08:20:50 +01:00
Michael Stahl
9b50c4f63c scp2: package 64-bit MSVC runtimes for explorer extensions
... and add BUILD_X64 conditional.

Change-Id: Id512368dfd9dece583ead5aae1924db96f8a2a40
Reviewed-on: https://gerrit.libreoffice.org/38366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-06 13:05:42 +02:00
Michael Stahl
4f56da239d scp2: remove all ComponentConditions that test Windows versions
Windows 7 (6.01) has all the features we want.

Change-Id: I96356b2decb26af526bceda8081875d418f17274
2017-06-02 16:34:54 +02:00
Michael Stahl
f8de1df4be scp2: move fonts to AutoInstall
Add new PACKAGE_FILELIST_FONT

The DONT_DELETE style has no effect for files.

The FONT_WARN_IF_EXISTS style has no effect.

Change-Id: Id062ada0a680341c01827e457b1166d625afe8cc
2017-06-02 16:34:53 +02:00
Michael Stahl
fbed35762a scp2: replace PACKAGE_FILELIST_DIR macro with SDK_PACKAGE_FILELIST
Change-Id: I3632c618e385d3f9963637c26d94b8395d5b8cb5
2017-06-02 16:34:53 +02:00
Mike Kaganski
ccd7f45d1f tdf#100837: advertise app URL capabilities
This is required to be able to use handlers when invoked from
Office Web Apps (on Win7+)

Change-Id: I242111ad365f5cb350b78b75300ddbe8b708b357
Reviewed-on: https://gerrit.libreoffice.org/37624
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-05-15 11:07:30 +02:00
Mike Kaganski
aebdeb6541 tdf#106359: missing leading dot
Change-Id: Ibfcbeb0778d9000dad8097384d7f5c7d75be2252
Reviewed-on: https://gerrit.libreoffice.org/37152
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-05-02 14:03:35 +02:00
Mike Kaganski
82fbc71471 tdf#106359: register text/x-ms-iqy MediaType default extension
Change-Id: I63be77c4e148befa8f41086163ea2919b1e8baac
Reviewed-on: https://gerrit.libreoffice.org/36942
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
2017-04-25 17:45:26 +02:00
Mike Kaganski
0c54777634 tdf#106359: register .iqy in MSI and treat them as templates
Change-Id: I7ae94c7717fbea03d96c539e05eeb565bafefd9f
Reviewed-on: https://gerrit.libreoffice.org/36188
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-04-06 11:25:43 +00:00
Matúš Kukan
fd7c94f0b2 tdf#90753: Autoinstall sdk packages
Change-Id: I54de722335d443813cb4526716c0101a049db03f
Reviewed-on: https://gerrit.libreoffice.org/31370
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-11-30 21:36:56 +00:00
Mike Kaganski
fdd8686987 tdf#100837: Register new URI handlers with installer
This patch registers vnd.libreoffice.command unconditionally,
and also registerd ms-word, ms-excel, ms-visio and ms-powerpoint
handlers according to SELECT_WORD, SELECT_EXCEL, SELECT_VISIO, and
SELECT_POWERPOINT properties (that are set in FileTypeDialog).

This allows to use these URIs in e.g. SharePoint WebDAV integration

Change-Id: I3231a15196858da77f1784a47f86f1729a6044bb
Reviewed-on: https://gerrit.libreoffice.org/29988
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2016-10-18 08:39:53 +00:00
skswales
8ab7db320f tdf#97872 File association in Windows registry
Fix for double backslashes in paths to programs in shell/open etc.
registry entries for all non-native file types such as .doc that are
mapped by installer to use scalc.exe/swriter.exe etc.

Change-Id: Ice8033d4fee079c0fb6d8f84e00ebd784e85d135
Reviewed-on: https://gerrit.libreoffice.org/25849
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-06-23 09:56:15 +00:00
Andrea Gelmini
b2e86d2e26 Fix typos
Change-Id: Iea11112a1bf1ff934de0e355b9e81979aa1966a3
Reviewed-on: https://gerrit.libreoffice.org/24286
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-04-22 06:47:06 +00:00
Noel Grandin
38ecca9b30 inline a bunch of use-once macros
no point in having a macro unless it's actually going to reduce the
number of lines of code

Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
2015-07-27 08:18:16 +02:00
Noel Grandin
efac5fa06e remove some unused defines
Change-Id: Ib2d50e8c29ccbc5ffcb52cdff4ae3eaae9a62188
Reviewed-on: https://gerrit.libreoffice.org/17332
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-07-27 06:12:01 +00:00
Michael Stahl
70cba374f6 scp2: add AutoInstall support for executables with COMPONENTCONDITION
Change-Id: I36f14d9ba08ab2473a555681b934b8b35cfa06b2
2015-06-22 21:02:05 +02:00
Stephan Bergmann
827430c8c0 Fold URE: Windows
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.

Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-03 15:19:55 +01:00
Stephan Bergmann
982f199a98 Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-12-01 15:10:32 +01:00
Stephan Bergmann
8fdb239735 Fold URE: Linux ure/share/java/* -> program/classes/
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28 15:32:26 +01:00
Stephan Bergmann
45ca1bfc22 Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).

Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-11-28 11:57:28 +01:00
Stephan Bergmann
eef94c1655 Fold URE: Linux ure/bin/* -> program/
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
2014-11-28 11:57:28 +01:00
Michael Stahl
25bfdffdac scp2: remove EXENAME
Change-Id: I045a65d4efbaf8fcb55318ffce4f8929e2fbbe15
2014-10-29 11:37:51 +01:00
Chris Sherlock
cadc2cbed1 Fix 64914e407c - #endif/#else mixup
Change-Id: Ia99ae45e66984ac0d88b6e9b6ca4514cd68f9634
2014-09-28 20:51:27 +10:00
Norbert Thiebaud
64914e407c vs2012 express support.
vs2012 express does not have atl so one need to
--disable-atl and --disable-activex

but then the packaging still try to include a few _x64.dll
that are not built.

Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6
2014-09-27 14:05:28 -05:00
Michael Stahl
cce464488d scp2: remove some very SPECIAL unused macros
Change-Id: I28f2f4bc3c43aac1faf8be35cf7ce89480487102
2014-09-25 20:56:06 +02:00
Tor Lillqvist
6492c8576e Make the "Mac-like" or "canonical" app bundle structure always used on OS X
In other words, only executable files go in the MacOS folder. Dynamic
libraries and bundled frameworks (i.e., LibreOfficePython), and
nothing else, go in the Frameworks folder, and all other files go in
the Resources folder.

Especially, note that Java class files and rc (.ini) files also go in
Resources.

Such an app bundle structure is what Apple strongly suggests one
should use, and it has been hinted that future versions of code
signing and/or Gatekeeper will require such a structure.

There is still some ugliness thanks to traces of the historical
separation of URE from "the office". Like there are two separate
"unorc" files, one for URE, one for the LibreOffice application. IMHO,
this should be cleaned up, but is probably controversial.

(Eek! I now see there are actually *three* unorc files in the app
bundle. Not intentional. Need to fix that later.)

Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-09-09 13:55:23 +03:00
Thomas Arnhold
e99535df4d remove executable bits
Change-Id: Iec785ae538de81325812b1e6fe33115789b39770
2014-08-17 05:50:13 +02:00
Tor Lillqvist
88be7b54c5 Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a
2014-08-15 08:56:58 +03:00
Michael Stahl
ee24b3b7d8 scp2: remove unused STD_LIB_FILE etc. macros
Change-Id: Ib6cf165019d72ba64b5111186ea3fdba076c69ba
2014-08-02 22:23:51 +02:00
Michael Stahl
b2193386dd scp2: move winexplorerext libs to AutoInstall
Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1
2014-08-02 22:23:50 +02:00
Andras Timar
57bf88d21c fdo#77057 quick fix: do not touch KindMap for alien file types
Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1
2014-07-03 13:35:55 +02:00
Michael Stahl
a3d89c3faf scp: remove unused STD_JAR_FILE, JARFILENAME
Change-Id: I7e78e45b66ea2b74268f4e4479ebb0259eba130c
2014-05-27 23:40:37 +02:00
Michael Stahl
8475eb98be scp2: move bsh to AutoInstall
Change-Id: Ib030d8fc3bd7c3c38f8728c80414fde505b36537
2014-03-18 22:18:10 +01:00
Alexander Wilms
2434ea5930 Remove visual noise from scp2
Change-Id: Id333de870389e8b4a074aa07fb2d0af336c5062a
Reviewed-on: https://gerrit.libreoffice.org/8304
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-26 08:39:14 -06:00
Michael Stahl
7eeac88bdb fdo#75526: argh missing semicolon
Change-Id: I4cabdcd3d4d5e4a446a4784d7a657655a4fbdfdc
2014-02-26 14:57:35 +01:00
Michael Stahl
482ab0d096 fdo#75526: sdk: install URE library symlinks / import libs again
This is a bit involved because since the LinkTarget now creates the
instdir/sdk/lib/* files itself a Package cannot be used; so convert the
URE libraries to AutoInstall and add special handling for them to
gb_Helper_register_libraries_for_install to create the necessary links
in the "sdk" install-module.

(regression from 70c35265f5)

Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1
2014-02-26 14:27:49 +01:00
Michael Stahl
73f4ef48d0 scp2: stop cargo-culting DONT_OVERWRITE around
There appears to be no usage of this Style in the installer Perl code in
the git history.

Change-Id: I137627505af5c7b33006437e83624b34ca2e3583
2014-02-05 20:30:07 +01:00
Michael Stahl
ba26251f4d gbuild: add gb_Helper_register_packages_for_install
Change-Id: I855a7e260a9ad05d655d121dbed97597b21187d2
2014-02-04 21:16:16 +01:00
Michael Stahl
9870a5f73d scp2: move URE jars to AutoInstall
Change-Id: I68c5f5ac015e8c5d8efd60921f38eb31c6f8088d
2014-02-04 21:16:16 +01:00
Michael Stahl
79ab9d7b6e fdo#74495: gbuild: AutoInstall: add support for ComponentCondition
... via new scp2 macro LIBO_LIB_FILE_COMPONENTCONDITION.

(regression from 2feb756dd5)

Change-Id: I6ab30cc1c14c34bd7dc1325e3f98d972544e7eea
2014-02-04 16:50:18 +01:00
Matúš Kukan
c2f5e09900 Zip .ui translations per UIConfig target.
Fix installer / scp2 to not ignore directory prefix in 'Name'.

Change-Id: Ib319363c8be73a72029f1ba3833e518e15c55e29
Reviewed-on: https://gerrit.libreoffice.org/6915
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-12-06 05:43:21 -06:00
Michael Stahl
5e300e9030 odk: remove Package_bin, instead auto-install executables
This is somewhat annoying since it requires re-introducing stupid
directories in scp2, but if the executables should be put in INSTDIR
directly then the Package_bin needs to go.

Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
2013-09-22 11:08:31 +02:00
Michael Stahl
f89cce877c installer: search files in INSTDIR
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-12 00:20:39 +02:00
Stephan Bergmann
e5f580d2db FILELIST_DIR: gb_INSTROOT already cont. LibreOffice.app/Contents on OS X
Change-Id: I2753079ff532642c8fb1b43f02211197cdb2702a
2013-09-11 17:28:26 +02:00
Matúš Kukan
529b1ea6f4 gbuild: install .res files directly from workdir
Change-Id: I95e4f150c21f991f629530eebf19748c2768f856
2013-09-10 22:58:05 +02:00
Andras Timar
a41d72333d kill VERSION_INDEPENDENT_COMP_ID
Version independent ComponentID in Component table of MSI means
that the GUID is calculated from the Component name only, the
PRODUCTVERSION is not concatenated to the name. Providing that
name is constant in all versions, the resulting GUID would be
the same e.g. for 4.0, 4.1, 4.2 etc. But what is it good for?
Faster upgrades maybe? But name can also change, we did not
pay attention to keep it constant. So in order to help scp2
cleanup, VERSION_INDEPENDENT_COMP_ID flag was obsoleted and
removed.

Change-Id: I8e1ee450524b02f07d0b0553f6b82d0321dbddcf
2013-09-10 09:10:32 +02:00
Michael Stahl
b09c5286b8 scp2: convert BINARYTABLE MSI CustomAction dlls to AutoInstall
Second attempt, this time using a new type LIBO_LIB_FILE_BINARYTABLE
in scp2/macros.inc; for the resulting MSI file Orca lists the same
files in "Binary" table now.

Change-Id: I550ede75f16a46da9dd7377594aa28b7c06f0348
2013-08-31 23:46:24 +02:00
Jesús Corrius
1982c3fd67 now really create the key in the right place
sigh...

Change-Id: I6d55da7b6e7fc1c6a9573aa05f9045388edf3684
Reviewed-on: https://gerrit.libreoffice.org/5589
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-23 06:20:18 +00:00
Jesús Corrius
cbb3f73ade I am stupid
It's not actually that I am massively stupid, it's just
that I've got bad luck when it comes to thinking.

This patch makes the installer create the values in the
right location. Where now...? you'd better don't ask.

/me goes for a brown paper bag.

Change-Id: I792ba5e9a78a895d3df7dfc48d1fc7c5303ce28e
Reviewed-on: https://gerrit.libreoffice.org/5587
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-22 20:41:32 +00:00