Commit Graph

3866 Commits

Author SHA1 Message Date
6759a98f7b fdo#82288 merge core01-core07 packages into just one
The core package will obsolete the individual ones (of the same
major.minor version)

Change-Id: I30dea2c08ec7eca052db2706b7f9f30f91e37095
2014-10-08 03:25:36 +02:00
cc335e4a72 scp2: define BUILD_X64 for winexplorerext.
Change-Id: I06c253cc53121559730f23906fd3ff34a4593d27
2014-09-29 14:48:08 +01:00
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
7d5b30b419 Use instsetoo_native-generated uno ini-file for both instdir and instsets
Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
2014-09-18 23:18:46 +02:00
5e648ef800 Fix incorrect pathname in comment
Change-Id: Icd5bbba4e20fb5fbd24fede1318a2dd21a673601
2014-09-17 17:41:28 +03:00
21c1e55cd4 Correct the location of the URE unorc in scp2 for OS X
The URE unorc should be in Resources/ure/etc also when constructing an
app bundle from scp2 data.

Change-Id: Id33d20bda0175018b8340c686ae9cd47525cd401
2014-09-17 15:51:18 +03:00
27d5b5c6dd BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layout
Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b
2014-09-17 11:45:14 +02:00
aa888a8869 Wrong URE_INTERNAL_LIB_DIR value for MACOSX
Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
2014-09-16 20:37:56 +02:00
e26a0ea8bf Wrong URE_INTERNAL_JAVA_DIR value for MACOSX
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
2014-09-16 20:13:01 +02:00
851b5a973e Wrong UNO_TYPES value for MACOSX
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
2014-09-16 17:53:16 +02:00
76e04aef4b Rename LO-specific uno ini-file (Linux: program/unorc) to "louno"
...to avoid confusion with the URE uno ini-file (Linux: ure/lib/unorc).

It might even work to get rid of the louno ini-file altogether and fold its
contents into the fundamental ini-file, but at least
desktop/source/deployment/misc/dp_misc.cxx accesses the louno ini-file directly,
so would need some inspection to avoid potential regressions.

Change-Id: Ib49bbc4c814d677c22e68d2dd0f11af6d8423bb6
2014-09-16 16:08:05 +02:00
ed00d0ddd6 create a master document template type
of application/vnd.oasis.opendocument.text-master-template with
suffic otm

https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html

desktop/icons/oasis-master-document-template.icns is just a copy
of
desktop/icons/oasis-master-document.icns
because I can't draw

Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1
Reviewed-on: https://gerrit.libreoffice.org/11350
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-11 09:38:21 +00:00
d968c28287 fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-overs
...from previous commit

Change-Id: I945faa6215f971ce817c6450fe0786da0696091f
2014-09-09 15:20:35 +02:00
496bc3cd6c fdo#45071 Remove Libreoffice browser plugin
This removes ENABLE_NPAPI_INTO_BROWSER while it should keep
ENABLE_NPAPI_FROM_BROWSER (embed flash in LO) intact.

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Conflicts:
	extensions/source/nsplugin/source/npshell.cxx

Change-Id: I80a9159a75653c74423d8fdc7c188568d3188e04
2014-09-09 15:20:35 +02:00
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
1bb161ece5 these strings should be translatable
so bring back scn.res and add them in there

Change-Id: I378d64f524c64295d26223f54fe17950b475cd80
2014-08-18 11:13:55 +01:00
2c75925a80 Another blind fix attempt for WNT
Change-Id: I369f3db3d72c93531e753b16fbd97abce4e1c0ed
2014-08-15 10:01:09 +03:00
8605fcbf8e Blind fix attempt for WNT
Change-Id: Iee1c5a5a1c9db5114b2b31cfac66d1a2d673a585
2014-08-15 09:41:23 +03:00
5794fcad10 Typo
Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76
2014-08-15 09:01:00 +03:00
26cfc797fa When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE put only binaries in the MacOS dir
The new code signing is more strict and enforces bundle structure
harder, it seems.

When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE bypass the unoinfo and python
shell scripts. If they actually are needed, will have to put them
somewhere under Resources.

Change-Id: I14a34936b78195746d2b88d25603952ce5309380
2014-08-15 08:56:59 +03:00
88be7b54c5 Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a
2014-08-15 08:56:58 +03:00
b73ee73da5 fdo#78845 Packaging of fpicker ui files
Change-Id: I5edb560dc511f6f0e47984303ce41488806e9e20
2014-08-10 12:12:45 +03:00
5e5aa9b08a Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDER
Needed in case of --enable-canonical-installation-tree-structure.

Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
2014-08-10 10:08:38 +03:00
b2193386dd scp2: move winexplorerext libs to AutoInstall
Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1
2014-08-02 22:23:50 +02:00
677670e467 setup_native, scp2: remove "regpatchactivex" MSI custom-action and lib
This was effectively omitted from the installation set since commit
26c142ca5f2b405b02ab5701dfaeab7bf281a727, and is apparently related to
the obsolete StarOffice patch mechanism.

Change-Id: I9a4c113e19e5b2b751e3da64b4dde53320132a35
2014-08-02 22:23:50 +02:00
4bab1f2dea scp2: move activex libs to AutoInstall
Change-Id: I08fac26859d97e3d7a60d3ba443c2d2ca039789b
2014-08-02 22:23:49 +02:00
140ec1e0dd scp2: move xsec_xmlsec lib to AutoInstall
Change-Id: Iff2bb51047d6b8698b65b83ff79a99f6f125b53c
2014-07-20 20:59:17 +02:00
f01aa96eab scp2: move python libraries to AutoInstall
Change-Id: Ib89daf3e608fd995845062eae2a7a33149964844
2014-07-20 20:59:17 +02:00
5ac6c4818a scp2: move postgresqlsdbc libraries to AutoInstall
Change-Id: Ia96e85191d877ebfd7621f7aa572f29e6482716c
2014-07-20 20:59:17 +02:00
53fd7e8690 scp2: move OGLTrans library to AutoInstall
Change-Id: I5140f4053fbb1add4bc0b1b8cb6cd9772f3ffa28
2014-07-20 20:59:16 +02:00
d52985d814 scp2: stupid typos
Change-Id: I94b3f39ce3dc642c97dfd515b026e4470724b06c
2014-07-18 18:04:49 +02:00
8e44fb80f7 fix build
Change-Id: Ic370d7a2443543b83677280394bfd796365392c6
2014-07-18 18:04:06 +02:00
80583d1c6d scp2: move pdfimport library to AutoInstall
Change-Id: Iac7d30ea181edbc479034e7b6f8eea285d7f6fbb
2014-07-18 17:50:39 +02:00
b875362cd5 fdo#81111 Package formula ui files
Change-Id: Ie73f3ea4eff4dc8400d2ba3736c162d728c277d3
Reviewed-on: https://gerrit.libreoffice.org/10365
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-17 10:06:20 +00:00
97f63c17f7 add Carlito/Caladea fonts to install script
They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a

Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
2014-07-04 14:29:01 +02:00
e52b3a2be0 typo: dreport -> dbreport
Change-Id: I7d6208a4ac170adb815ec02364076c5b49cfab9a
2014-07-03 11:40:22 -07:00
1f90cae1de fdo#80535 add missing .ui localizations to install script
Change-Id: I248838633e99ac0ce51950db9049dd451394b558
2014-07-03 20:11:03 +02:00
e09931ce4d fdo#80535 add missing .ui localizations to install script
Change-Id: Ie7e60522df6aff8fc68b36daddd1c84d0a97cd59
2014-07-03 18:17:24 +02:00
674db242c0 fdo#80332 remove "Support assistive technology tools" checkbox from installer
Revert "fdo#39833 add "Support assistive technology tools" option to Windows installer"

This reverts commit 98fd8f345504e98e9ed16f4845d55f5b88b77a5e.

Conflicts:

	instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
	instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
	instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt

Change-Id: I04cafd063bd06db37eadd13b58f7b7adfad2ca42
2014-06-22 11:00:07 +02:00
ea9f2c7ce7 scp2: move reportbuilder libraries to AutoInstall
Change-Id: I3369b4c5c412741e82279db95cb517a8ae69b25c
2014-06-13 19:26:02 +02:00
0b49cc5b03 scp2: move basebmp, avmediaQuickTime, avmediaMacAVF libs to AutoInstall
Change-Id: I1b7a8fd5272cb56b2a45c89de79165cfd71711c4
2014-06-13 19:26:02 +02:00
5c53bb8a99 scn resource file is empty now post ui-ification
Change-Id: Id8a6d6c4faf3101b13d84de180f8db7cab2cb16f
2014-06-12 13:54:15 +01:00
8ff029893e do no try to install bsh/js when not building them
Change-Id: Ic1521ad9a67c9930e2e4561eacb1e78905310613
2014-06-11 23:07:24 +02:00
f188c982d5 Convert RID_SANE_DIALOG to .ui
Change-Id: I1f08493cdc18f4c0691a8436368432fe4e94dec3
Reviewed-on: https://gerrit.libreoffice.org/9696
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-11 13:27:30 +00:00
be4b837ed2 move UOF and Office 2003 filters to xsltfilter module
Change-Id: I6e5ac310567bb7bd12fbba444e4e1deb9fea30d5
2014-06-09 14:07:44 +02:00
f73a8785bd We build no avmediaQuickTime library in the sandboxed (i.e. App Store) case
Change-Id: I373e435037279d14bde819ffaa38e510ced9a029
2014-06-09 12:07:35 +03:00
534015ad4f kdefilepicker is autoinstalled now
Change-Id: Ief3d602b81c0c8ea3ea931077141856199ac47bd
2014-06-09 09:45:43 +02:00
2f531243f3 fix pyuno.so install to correctly end up in gid_Module_Pyuno
... as the (empty in this case) auto_python_ALL makes the second entry
ignored

Change-Id: I1b39595b3ab8da429f45f49098d6fc7bdc4c1cba
2014-05-31 20:31:17 +02:00
7822b5535c Make the MacAVF code build also as 32-bit
When compiling 32-bit OS X code, the code will use the "legacy
Objective-C runtime", which means that instance variables of an
Objective-C class must be declared in the @interface block, not in the
@implementation.

CGRect and NSRect are not the same for 32-bit code.

Also, use boost::unordered_map.

Change-Id: Icc56ff298203565a7568714b0e9f42c7c6b89737
2014-05-16 12:43:03 +03:00
9986f236d6 Don't reference the avmediaMacAVF library if not built
Change-Id: If4f5c51e986b51f5795012b9535ab7a7ea51337b
2014-05-15 19:53:07 +03:00