Commit Graph
36 Commits
Author SHA1 Message Date
Adolfo Jayme Barrientos 9a01723808 Fix an annoying comma splice
Change-Id: I9b93b981105339b1db176d6031ccf46149a6d27a
2016-12-20 04:48:54 -06:00
Christian Lohmaier 78c7929ac4 tdf#89657 sign Mac languagepack installer and force-start-close LO
starting LO once satisfies Gatekeeper's verification, even when the
langaugepack's content are added afterwards

Change-Id: Ie548df39a7ec07cc485c40148e4ca75101346798
2016-06-20 21:55:08 +02:00
Stephan Bergmann 615fae2f67 Attempt at fixing Mac OS X code signing
...so that LibreOffice.app dmgs built with --enable-macosx-code-signing with an
appstore-enabled identity will hopefully no longer be rejected on Mac OS X >=
10.9.5 as "'soffice' can't be opened because the identity of the developer
cannot be confirmed."  (Which I cannot verify for lack of an appstore-enabled
certificate, though.)

First of all, do not ignore errors from calls to codesign utitlity.  Really.

That reveals that soffice cannot be signed as soon as it is linked, as it
requires all the other stuff in the app to be already signed.  So just don't
sign it after linking, it will be signed last step in macosx-codesign-app-bundle
anyway.

Second, --resource-rules exemptions are no longer allowed per
<https://developer.apple.com/library/mac/technotes/tn2206/_index.html> "OS X
Code Signing In Depth."

Third, the handful of remaining shell scripts in MacOS/ need to be signed too.
(Signing them adds extended attributes to the files.)

Unfortunately, as discussed at
<http://porkrind.org/missives/mac-os-x-codesigning-woes/> "Mac OS X codesigning
woes," "hdiutil makehybrid" drops extended attributes from the generated dmg (so
the dmg's LibreOffice.app would no longer be considered properly signed, as the
shell scripts would no longer be signed).  So switch from "hdiutil makehybrid"
to "hdiutil create."

Change-Id: I4b587f87d504666f7a1d0e3a24a8be76f22014c5
2015-02-10 11:04:15 +01: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
Tor Lillqvist 9835fa87ac Use essentially the same OS X code signing script as in libreoffice-4-2
Change-Id: Ica7dcc823cc7027a00b15d2dcf5b73b0ef322189
2014-06-09 14:57:55 +03:00
Michael Stahl 862b9390b4 setup_native: find all static files in source/packinfo
... and move the OSX specific files there too so we don't need several
include paths.

Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3
2013-10-31 10:42:22 +01:00
Andras Timar 0d57ddfabf fdo#52004 set resolution of .dmg background image to 72DPI
Apparently Mac OS X looks at the DPI value, not to the actual pixel
size of the image.

Change-Id: I9fd43228e4d2e05397f798ed4902d7d80ef2145f
2013-10-08 13:27:48 +02:00
Siqi LIU ba7be1c9ef put back DS_Store
Change-Id: I10d1203cb81ffd96c5447082884e71cb8b9eb2f7
2013-07-30 23:49:03 +02:00
Siqi LIU a024948a5d resolve conflicts
Change-Id: If0a7146f51741e3e8250f0aa671a6902119bb6eb
2013-07-30 23:28:50 +02:00
Stefan Knorr 4e6fd3b2b7 Update Branding for 4.0 (.1)
(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>
2013-02-18 17:08:34 +00:00
Peter Foley 4261757fc6 convert setup_native to gbuild and add to tail_build
Change-Id: Ie12338dada22c59d55d89ed9611bb1a958b04223
Reviewed-on: https://gerrit.libreoffice.org/2063
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-02-09 20:41:19 +00:00
Tor Lillqvist ebdd616580 Add option to set bundle identifier and use it when signing
Sign also all the dylibs and frameworks in the bundle.

Change-Id: I7f67b9d7eda0204b24e2ea2ef44a53fb8db0f8aa
2013-02-01 14:51:20 +02:00
Michael Meeks 2b4fd2c89a re-base on ALv2 code. Includes:
Patches contributed by Pedro Giffuni:
    Avoid some uses of non portable #!/bin/bash in shell scripts.
    http://svn.apache.org/viewvc?view=revision&revision=1235297
    Reduce the dependencies on non standard GNU copy.
    http://svn.apache.org/viewvc?view=revision&revision=1238684
    Correct /usr/bin/env path.
    http://svn.apache.org/viewvc?view=revision&revision=1235619

    Complex Toolbar Controls Extension from the SDK
    Patches contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1190390
    i118615 - make epm more verbose
    http://svn.apache.org/viewvc?view=revision&revision=1204288

    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

    Patches contributed by Juergen Schmidt:
    jsc341: i117327: take care if no dependency node in current
    description exists, create one
    http://svn.apache.org/viewvc?view=revision&revision=1172101
    jsc341: i117327: add extra extension dependency check
    http://svn.apache.org/viewvc?view=revision&revision=1172098
    make initial branding changes
    http://svn.apache.org/viewvc?view=revision&revision=1231878

    Patches contributed by Ingo Schmidt
    native373: #i117733# no linux jre installation on 64 bit systems
    http://svn.apache.org/viewvc?view=revision&revision=1167536
    native373: ##164464# improve debian support
    http://svn.apache.org/viewvc?view=revision&revision=1167537

    Patch contribtued by Armin Le-Grand:
    Changed various aspects concerning usages of old vendor names
    http://svn.apache.org/viewvc?view=revision&revision=1293313

fix for neon webdav, remove coinmp bits, improve odk script,
cleanup & remove OS/2 conditionals, system ucpp fixes,
remove OS/2 conditionals, restore our license filenames.
2012-11-12 11:46:43 +00:00
Stefan Knorr (astron) f2a653134e New Finder background image for Mac OS installation
Change-Id: I7f2d124f8a1d0330c4ab7bc58217e4368ee72cc2
2012-07-10 12:12:48 +02:00
Thorsten Behrens dab7974476 Give Mac master builds a nice background .dmg image, too
Added a new DevVersionCopy action to scp2, that fires if PRODUCTNAME
equals "LibO-dev" - in that case, we use the DS_Store_Dev one.
2011-11-03 19:02:55 +01:00
Thorsten Behrens 95da84dbca Fix .dmg background image some more. 2011-11-01 19:06:57 +01:00
Andras Timar 05293cb04c remove checks for unused BUILD_SPECIAL environment variable 2011-09-28 13:48:10 +02:00
Andras Timar f5c053a6fb remove BrOffice branding 2011-07-17 18:29:53 +02:00
Thorsten Behrens 1ed57b51d3 3rd update to Mac dmg background.
This time, wrong path - now hopefully working everywhere.

Signed-off-by: Christian Lohmaier <lohmaier@googlemail.com>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-05-24 12:08:39 +02:00
Thorsten Behrens fa1795c1d1 Polish branding - fix langpack mac installer icon
Fix for fdo#33229 - the lang pack installer icon on mac was still
showing seagulls.

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
(cherry picked from commit 44c6333a2b6923add66d70be6329a6ad4f3aa66d)

Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Christian Lohmaier <lohmaier@googlemail.com>
2011-05-24 12:05:46 +02:00
Thorstem Behrens b9a3e38b03 Complete revert for native334 #163388#.
The previous revert did not cater for the changed volume name -
the nice libreoffice background image was missing.

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-05-17 14:31:49 +02:00
Thorsten Behrens a0013df9f1 Revert native334 #163388# no more change of DS_Store file
This reverts 96fb1e22387af1cb0888a32fcb267463d64a898a and has
mac .dmg show the nice artwork again.
2011-04-30 13:05:11 +02:00
Norbert Thiebaud cc5db648bc Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (185 commits)
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix: #i10000# INT16 -> sal_Int16
  fixed compile errors after resync to m100, part2
  gridsort: post-rebase fixes
  CWS gnumake3: found another tools integer type
  removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
  native359: #i114398# changing mac langpack icon
  native359: #i115669# fixing package description for solaris packages
  gnumake3: remove comphelper version; fix including extract.hxx
  locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
  sb138: #i116659# timely termination of OnLogRotateThread
  accfixes: removed include of obsolete header file
  accfixes: removed obsolete file
  removetooltypes01: #i112600# Fix build problems on non-pro
  accfixes: moved some shared strings to svx part2
  accfixes: moved some shared strings to svx
  accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
  removetooltypes01: #i112600# Remove tools types for Mac specific parts
  fixed tab order in BasicIDE, Library dialog tab page
  added some accessible names in BasicIDE
  ...

Conflicts:
	UnoControls/source/base/registercontrols.cxx
	accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
	automation/inc/automation/communi.hxx
	automation/inc/automation/simplecm.hxx
	automation/source/communi/communi.cxx
	automation/source/inc/rcontrol.hxx
	automation/source/miniapp/servuid.hxx
	automation/source/server/XMLParser.cxx
	automation/source/server/cmdbasestream.cxx
	automation/source/server/profiler.hxx
	automation/source/server/recorder.cxx
	automation/source/server/retstrm.hxx
	automation/source/server/server.cxx
	automation/source/server/sta_list.cxx
	automation/source/server/statemnt.cxx
	automation/source/server/statemnt.hxx
	automation/source/simplecm/packethandler.cxx
	automation/source/simplecm/simplecm.cxx
	automation/source/simplecm/tcpio.cxx
	automation/source/simplecm/tcpio.hxx
	automation/source/testtool/comm_bas.hxx
	automation/source/testtool/cretstrm.hxx
	automation/source/testtool/httprequest.cxx
	automation/source/testtool/httprequest.hxx
	automation/source/testtool/objtest.cxx
	automation/source/testtool/objtest.hxx
	basctl/source/basicide/baside2.cxx
	basctl/source/basicide/baside2.hxx
	basctl/source/basicide/baside2b.cxx
	basctl/source/basicide/baside3.cxx
	basctl/source/basicide/basides1.cxx
	basctl/source/basicide/basides2.cxx
	basctl/source/basicide/basidesh.cxx
	basctl/source/basicide/basidesh.src
	basctl/source/basicide/basobj3.cxx
	basctl/source/basicide/bastype2.cxx
	basctl/source/basicide/bastype3.cxx
	basctl/source/basicide/bastypes.cxx
	basctl/source/basicide/brkdlg.cxx
	basctl/source/basicide/iderdll.cxx
	basctl/source/basicide/macrodlg.cxx
	basctl/source/basicide/moduldl2.cxx
	basctl/source/basicide/moduldlg.cxx
	basctl/source/basicide/objdlg.cxx
	basctl/source/basicide/scriptdocument.cxx
	basctl/source/basicide/tbxctl.cxx
	basctl/source/basicide/tbxctl.hxx
	basctl/source/basicide/tbxctl.src
	basctl/source/dlged/dlged.cxx
	basctl/source/dlged/dlgedfunc.cxx
	basctl/source/dlged/dlgedobj.cxx
	basctl/source/inc/basidesh.hxx
	basctl/source/inc/bastypes.hxx
	basctl/source/inc/dlgedmod.hxx
	basctl/source/inc/dlgedpage.hxx
	crashrep/prj/build.lst
	cui/inc/pch/precompiled_cui.hxx
	cui/source/customize/acccfg.cxx
	cui/source/customize/acccfg.hrc
	cui/source/customize/acccfg.src
	cui/source/customize/cfg.cxx
	cui/source/customize/cfgutil.cxx
	cui/source/customize/macropg.cxx
	cui/source/customize/macropg.src
	cui/source/customize/selector.cxx
	cui/source/dialogs/SpellDialog.cxx
	cui/source/dialogs/commonlingui.cxx
	cui/source/dialogs/cuicharmap.cxx
	cui/source/dialogs/cuifmsearch.cxx
	cui/source/dialogs/cuigaldlg.cxx
	cui/source/dialogs/cuigrfflt.cxx
	cui/source/dialogs/hldocntp.cxx
	cui/source/dialogs/hldoctp.cxx
	cui/source/dialogs/hlinettp.cxx
	cui/source/dialogs/hlmailtp.cxx
	cui/source/dialogs/hlmarkwn.cxx
	cui/source/dialogs/hlmarkwn.src
	cui/source/dialogs/hltpbase.cxx
	cui/source/dialogs/iconcdlg.cxx
	cui/source/dialogs/passwdomdlg.cxx
	cui/source/dialogs/pastedlg.cxx
	cui/source/dialogs/scriptdlg.cxx
	cui/source/dialogs/thesdlg.cxx
	cui/source/dialogs/zoom.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/SpellDialog.hxx
	cui/source/inc/autocdlg.hxx
	cui/source/inc/backgrnd.hxx
	cui/source/inc/bbdlg.hxx
	cui/source/inc/cfg.hxx
	cui/source/inc/cfgutil.hxx
	cui/source/inc/cuigaldlg.hxx
	cui/source/inc/cuigrfflt.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/inc/cuitabline.hxx
	cui/source/inc/hldocntp.hxx
	cui/source/inc/hltpbase.hxx
	cui/source/inc/iconcdlg.hxx
	cui/source/inc/numpages.hxx
	cui/source/inc/page.hxx
	cui/source/inc/postdlg.hxx
	cui/source/inc/scriptdlg.hxx
	cui/source/inc/transfrm.hxx
	cui/source/inc/zoom.hxx
	cui/source/options/cfgchart.cxx
	cui/source/options/cuisrchdlg.cxx
	cui/source/options/dbregister.cxx
	cui/source/options/dbregister.src
	cui/source/options/fontsubs.cxx
	cui/source/options/internationaloptions.cxx
	cui/source/options/optasian.cxx
	cui/source/options/optchart.cxx
	cui/source/options/optcolor.cxx
	cui/source/options/optcolor.src
	cui/source/options/optfltr.cxx
	cui/source/options/optfltr.src
	cui/source/options/optgdlg.cxx
	cui/source/options/optgdlg.src
	cui/source/options/optgenrl.cxx
	cui/source/options/opthtml.cxx
	cui/source/options/optimprove.cxx
	cui/source/options/optinet2.cxx
	cui/source/options/optinet2.hxx
	cui/source/options/optjava.cxx
	cui/source/options/optlingu.cxx
	cui/source/options/optsave.cxx
	cui/source/options/optsave.hxx
	cui/source/options/treeopt.cxx
	cui/source/options/webconninfo.cxx
	cui/source/tabpages/autocdlg.cxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/border.cxx
	cui/source/tabpages/chardlg.cxx
	cui/source/tabpages/dstribut.cxx
	cui/source/tabpages/grfpage.cxx
	cui/source/tabpages/macroass.cxx
	cui/source/tabpages/measure.cxx
	cui/source/tabpages/numfmt.cxx
	cui/source/tabpages/numpages.cxx
	cui/source/tabpages/page.cxx
	cui/source/tabpages/paragrph.cxx
	cui/source/tabpages/swpossizetabpage.cxx
	cui/source/tabpages/tabarea.src
	cui/source/tabpages/textanim.cxx
	cui/source/tabpages/textattr.cxx
	cui/source/tabpages/tparea.cxx
	cui/source/tabpages/tpbitmap.cxx
	cui/source/tabpages/tpcolor.cxx
	cui/source/tabpages/tpgradnt.cxx
	cui/source/tabpages/tphatch.cxx
	cui/source/tabpages/tpline.cxx
	cui/source/tabpages/tplnedef.cxx
	cui/source/tabpages/tplneend.cxx
	cui/source/tabpages/tpshadow.cxx
	cui/source/tabpages/transfrm.cxx
	embedserv/source/embed/register.cxx
	extensions/inc/pch/precompiled_extensions.hxx
	extensions/inc/propctrlr.hrc
	extensions/source/abpilot/abpservices.cxx
	extensions/source/bibliography/bibload.cxx
	extensions/source/bibliography/datman.cxx
	extensions/source/bibliography/general.cxx
	extensions/source/dbpilots/dbpservices.cxx
	extensions/source/inc/componentmodule.cxx
	extensions/source/nsplugin/source/so_env.cxx
	extensions/source/ole/oleobjw.cxx
	extensions/source/ole/oleobjw.hxx
	extensions/source/oooimprovement/invite_job.cxx
	extensions/source/oooimprovement/onlogrotate_job.cxx
	extensions/source/plugin/base/service.cxx
	extensions/source/plugin/inc/plugin/unx/mediator.hxx
	extensions/source/plugin/inc/plugin/unx/plugcon.hxx
	extensions/source/plugin/unx/mediator.cxx
	extensions/source/plugin/unx/nppapi.cxx
	extensions/source/plugin/unx/plugcon.cxx
	extensions/source/preload/services.cxx
	extensions/source/propctrlr/formmetadata.cxx
	extensions/source/propctrlr/pcrservices.cxx
	extensions/source/resource/resource.cxx
	extensions/source/scanner/sane.hxx
	extensions/source/scanner/sanedlg.cxx
	extensions/source/scanner/scanunx.cxx
	extensions/source/scanner/scanwin.cxx
	extensions/source/scanner/twain.cxx
	extensions/source/scanner/twain.hxx
	extensions/source/update/check/updatecheckconfig.cxx
	extensions/test/stm/datatest.cxx
	extensions/test/stm/marktest.cxx
	extensions/test/stm/pipetest.cxx
	extensions/test/stm/testfactreg.cxx
	extensions/workben/testpgp.cxx
	forms/qa/complex/forms/CheckOGroupBoxModel.java
	forms/qa/makefile.mk
	forms/source/component/Button.cxx
	forms/source/component/Button.hxx
	forms/source/component/ListBox.cxx
	forms/source/inc/forms_module_impl.hxx
	forms/source/misc/services.cxx
	forms/source/solar/control/navtoolbar.cxx
	javainstaller2/prj/build.lst
	javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
	lingucomponent/prj/build.lst
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sreg.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	package/source/manifest/ManifestExport.cxx
	package/source/manifest/UnoRegister.cxx
	package/source/xstor/owriteablestream.cxx
	package/source/xstor/owriteablestream.hxx
	package/source/xstor/xstorage.hxx
	package/source/zippackage/ZipPackageFolder.cxx
	package/source/zippackage/ZipPackageStream.cxx
	setup_native/source/mac/ooo/DS_Store
	setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
	xmlsecurity/prj/build.lst
	xmlsecurity/source/component/registerservices.cxx
	xmlsecurity/source/dialogs/stbcontrl.cxx
	xmlsecurity/source/framework/xsec_framework.cxx
	xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
	xmlsecurity/tools/demo/util.hxx
	xmlsecurity/workben/signaturetest.cxx
2011-03-09 16:20:50 -06:00
Ingo Schmidt 689d5936b2 native359: #i114398# changing mac langpack icon 2011-02-01 16:44:20 +01:00
Thorsten Behrens dabf01ce4e Updated artwork for rc 2010-11-30 00:21:58 +01:00
Thorsten Behrens a060fe5731 Use org.libreoffice.script for Mac preferences
This fixes fdo#30568
(cherry picked from commit 78a103ca881d0175d0a3a1bbca2df64cbe63ea77)
2010-11-05 13:25:56 +01:00
Petr Mladek 81e9c78a16 Update BROffice branding for Windows and MAC installer (fdo#31089) 2010-11-03 12:32:05 +01:00
Ingo Schmidt 21d56ddc57 native334 #163388# no more change of DS_Store file 2010-10-19 17:42:55 +02:00
Thorsten Behrens 84faef6871 Update Mac installer image and icon config 2010-09-28 08:44:11 +02:00
Ingo Schmidt 16a1d4bfcc native321 #i111115# mac background images 2010-07-14 17:22:59 +02:00
Ingo Schmidt d0520c036f native307 #i111766# new mac background image for non oracle builds 2010-05-25 17:12:56 +02:00
Ivo Hinkelmann 8a7f8ca1a4 #i10000# fixed transplanted nativeb 2010-05-18 12:05:52 +02:00
Ivo Hinkelmann 60c0e59fd4 CWS-TOOLING: integrate CWS native278 2010-03-03 13:22:40 +01:00
Jens-Heiner Rechtien 36de66bdf0 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Ingo Schmidt 47b07b31e8 native278: #i105537# correct string for mac language packs 2010-01-13 12:49:28 +01:00
Release Engineers b84d6fb52b CWS-TOOLING: integrate CWS native262
2009-08-18 16:35:06 +0200 is  r275118 : #i102939# differ between ok-label and install-label
2009-08-13 17:24:47 +0200 is  r274960 : #i102939# mac languagepacks
2009-08-13 17:22:22 +0200 is  r274959 : #i102939# mac languagepacks
2009-08-13 17:15:01 +0200 is  r274958 : #i102939# mac languagepacks
2009-08-13 17:13:36 +0200 is  r274957 : #i102939# mac languagepacks
2009-08-13 17:12:57 +0200 is  r274956 : #i102939# mac languagepacks
2009-08-13 17:12:20 +0200 is  r274955 : #i102939# mac languagepacks
2009-08-13 17:11:41 +0200 is  r274954 : #i102939# mac languagepacks
2009-08-13 17:10:52 +0200 is  r274953 : #i102939# mac languagepacks
2009-08-26 06:41:14 +00:00