summaryrefslogtreecommitdiff
path: root/instsetoo_native
AgeCommit message (Collapse)AuthorFilesLines
2014-10-23kill OUTPATHNorbert Thiebaud2-4/+4
Change-Id: I91806c3a55905dfd1ae90a10bc890cc526ff3270 Reviewed-on: https://gerrit.libreoffice.org/11908 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-08fdo#82288 merge core01-core07 packages into just oneChristian Lohmaier1-2/+2
The core package will obsolete the individual ones (of the same major.minor version) Change-Id: I30dea2c08ec7eca052db2706b7f9f30f91e37095
2014-09-18Use instsetoo_native-generated uno ini-file for both instdir and instsetsStephan Bergmann3-4/+17
Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
2014-09-17BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layoutStephan Bergmann1-1/+1
Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b
2014-09-16Wrong URE_INTERNAL_LIB_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
2014-09-16Wrong URE_INTERNAL_JAVA_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
2014-09-16Wrong UNO_TYPES value for MACOSXStephan Bergmann1-1/+1
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann2-15/+32
...like is done for most other ini-files too, with entries indentical to the ones in scp2/source/ooo/ure.scp. (And sort ini-files lexicographically again in instsetoo_native/*.mk, broken with recent louno rename). Leave ure/source/unorc.in and ure/Pacakge_builddir_install.mk around for the cross-compilation case only. Change-Id: Ic07e036ef126db1aee2c0f6b726c2b86c2536c53
2014-09-16Rename LO-specific uno ini-file (Linux: program/unorc) to "louno"Stephan Bergmann2-15/+15
...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-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist1-8/+4
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-08-23Revert "--with-lang=ALL build exceeds maximum # of files in CAB"Andras Timar1-2/+0
This reverts commit 3bfac473a1b1dfb2210ec07245e649697679bd83. With Matus Kukan's work, which packs .ui files into .zip archives, file count is reduced dramatically. Multiple .cab files won't be a problem in theory, but unfortunately both .cab files had the same disk id 'DISK1' and it caused problems with MSP patch generation.
2014-08-10Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDERTor Lillqvist1-2/+2
Needed in case of --enable-canonical-installation-tree-structure. Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
2014-06-25fdo#80527 fix tab order on ReadyToInstall dialogAndras Timar1-1/+1
regression from 674db242c037020626050c8de06367808d94eaaa Change-Id: Ia02321b7450b3f19ba02fa681a50430f78f12cfd
2014-06-23fdo#80332 followup fixAndras Timar1-1/+1
Change-Id: If44dd2ab33128c0432e6db655dfbc07f9be4ca51
2014-06-22fdo#80332 remove "Support assistive technology tools" checkbox from installerAndras Timar3-7/+2
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-02don't limit the 0 → 1 replacement in release to debChristian Lohmaier1-1/+1
since there are rpm-frontends that do their own version comparison that is different from rpm itself. Change-Id: Iddf38c14e7f48eec5d043de57e3404fcd9da24f7
2014-05-21fdo#70596 dependency problem with debian packages for master/dev buildsChristian Lohmaier1-1/+1
debian packages don't cope with release number of 0, so use release 1 for debian master/dev-packages Change-Id: Id91926322d13bddad3a39faccfee4e131d8956b0
2014-05-04fix windows packagingMarkus Mohrhard3-3/+3
Change-Id: I97b1d2432dadf7239a8500544f7e54b667ca4dfc
2014-04-30Many spelling fixes: directories h* - p*.Pedro Giffuni3-3/+3
Attempt to clean up most but certainly not all the spelling mistakes that found home in OpenOffice through decades. We could probably blame the international nature of the code but it is somewhat shameful that this wasn't done before. (cherry picked from commit 11a1ff6144521aeabb0c6db25c89a2ac31bedee0) Conflicts: external/libxmlsec/xmlsec1-customkeymanage.patch hwpfilter/source/hwpeq.cxx icc/README icu/createmak.pl idl/source/objects/object.cxx idlc/inc/idlc/errorhandler.hxx include/jvmfwk/framework.h include/oox/helper/propertyset.hxx instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.java javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java jurt/com/sun/star/comp/servicemanager/ServiceManager.java jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx jvmfwk/source/elements.cxx jvmfwk/source/elements.hxx l10ntools/inc/wtranode.hxx l10ntools/inc/wtratree.hxx l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java l10ntools/scripts/localize.pl l10ntools/scripts/localize_old.pl l10ntools/source/cfgmerge.cxx l10ntools/source/export.cxx l10ntools/source/filter/merge/FCFGMerge.java l10ntools/source/filter/merge/Merger.java l10ntools/source/filter/utils/Cache.java l10ntools/source/filter/utils/ConfigHelper.java l10ntools/source/filter/utils/FileHelper.java l10ntools/source/filter/utils/XMLHelper.java l10ntools/source/merge.cxx l10ntools/source/tagtest.cxx l10ntools/source/xmlparse.cxx l10ntools/source/xrmmerge.cxx libtextcat/libtextcat-2.2.patch libxml2/libxml2-long-path.patch linguistic/inc/linguistic/misc.hxx linguistic/source/lngsvcmgr.cxx migrationanalysis/src/driver_docs/allstrings.ulf migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls migrationanalysis/src/msokill/msokill.cpp migrationanalysis/src/wizard/Wizard.frm odk/examples/DevelopersGuide/Accessibility/EventHandler.java odk/examples/DevelopersGuide/Accessibility/EventListenerProxy.java odk/examples/DevelopersGuide/Accessibility/GraphicalDisplay.java odk/examples/DevelopersGuide/Forms/DataAwareness.java odk/examples/DevelopersGuide/Forms/KeyGenerator.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java odk/examples/cpp/complextoolbarcontrols/Makefile odk/setsdkenv_windows.template offapi/com/sun/star/accessibility/AccessibleEventId.idl offapi/com/sun/star/accessibility/AccessibleEventObject.idl offapi/com/sun/star/accessibility/AccessibleRelationType.idl offapi/com/sun/star/accessibility/XAccessible.idl offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl offapi/com/sun/star/accessibility/XAccessibleStateSet.idl offapi/com/sun/star/animations/Event.idl offapi/com/sun/star/animations/XAnimationNode.idl offapi/com/sun/star/awt/AccessibleListBoxList.idl offapi/com/sun/star/awt/XLayoutFlow.idl offapi/com/sun/star/awt/XMessageBoxFactory.idl offapi/com/sun/star/awt/XPopupMenu.idl offapi/com/sun/star/awt/grid/XGridColumn.idl offapi/com/sun/star/chart/ChartAxis.idl offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl offapi/com/sun/star/configuration/AdministrationProvider.idl offapi/com/sun/star/configuration/ConfigurationRegistry.idl offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl offapi/com/sun/star/document/DocumentInfo.idl offapi/com/sun/star/document/EmptyUndoStackException.idl offapi/com/sun/star/document/EventObject.idl offapi/com/sun/star/document/ExtendedTypeDetection.idl offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl offapi/com/sun/star/document/FilterFactory.idl offapi/com/sun/star/document/MediaDescriptor.idl offapi/com/sun/star/document/NoSuchFilterRequest.idl offapi/com/sun/star/document/OfficeDocument.idl offapi/com/sun/star/document/TypeDetection.idl offapi/com/sun/star/document/UndoContextNotClosedException.idl offapi/com/sun/star/document/XExtendedFilterDetection.idl offapi/com/sun/star/document/XFilter.idl offapi/com/sun/star/document/XInteractionFilterSelect.idl offapi/com/sun/star/document/XTypeDetection.idl offapi/com/sun/star/drawing/Hatch.idl offapi/com/sun/star/drawing/XDrawPages.idl offapi/com/sun/star/drawing/XShapeBinder.idl offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl offapi/com/sun/star/drawing/framework/XRelocatableResource.idl offapi/com/sun/star/embed/ElementModes.idl offapi/com/sun/star/embed/EntryInitModes.idl offapi/com/sun/star/embed/Storage.idl offapi/com/sun/star/embed/StorageFactory.idl offapi/com/sun/star/embed/StorageStream.idl offapi/com/sun/star/embed/XCommonEmbedPersist.idl offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl offapi/com/sun/star/embed/XEmbeddedClient.idl offapi/com/sun/star/embed/XInplaceClient.idl offapi/com/sun/star/embed/XInplaceObject.idl offapi/com/sun/star/embed/XInsertObjectDialog.idl offapi/com/sun/star/embed/XPersistanceHolder.idl offapi/com/sun/star/embed/XStorage.idl offapi/com/sun/star/embed/XTransactionBroadcaster.idl offapi/com/sun/star/embed/XTransactionListener.idl offapi/com/sun/star/form/FormComponents.idl offapi/com/sun/star/form/XSubmitListener.idl offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl offapi/com/sun/star/form/component/DatabaseComboBox.idl offapi/com/sun/star/form/component/DatabaseFormattedField.idl offapi/com/sun/star/form/component/DatabasePatternField.idl offapi/com/sun/star/form/component/DatabaseTextField.idl offapi/com/sun/star/form/component/GridControl.idl offapi/com/sun/star/frame/Components.idl offapi/com/sun/star/frame/ContentHandler.idl offapi/com/sun/star/frame/ContentHandlerFactory.idl offapi/com/sun/star/frame/Desktop.idl offapi/com/sun/star/frame/DispatchDescriptor.idl offapi/com/sun/star/frame/DispatchProvider.idl offapi/com/sun/star/frame/DispatchRecorder.idl offapi/com/sun/star/frame/Frame.idl offapi/com/sun/star/frame/FrameActionEvent.idl offapi/com/sun/star/frame/FrameLoaderFactory.idl offapi/com/sun/star/frame/ProtocolHandler.idl offapi/com/sun/star/frame/XControlNotificationListener.idl offapi/com/sun/star/frame/XDesktop.idl offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl offapi/com/sun/star/frame/XDocumentTemplates.idl offapi/com/sun/star/frame/XFrame.idl offapi/com/sun/star/frame/XFrameLoader.idl offapi/com/sun/star/frame/XInterceptorInfo.idl offapi/com/sun/star/frame/XRecordableDispatch.idl offapi/com/sun/star/frame/XStatusbarController.idl offapi/com/sun/star/frame/XStorable2.idl offapi/com/sun/star/frame/XSynchronousDispatch.idl offapi/com/sun/star/frame/XTerminateListener2.idl offapi/com/sun/star/graphic/GraphicObject.idl offapi/com/sun/star/graphic/XGraphicObject.idl offapi/com/sun/star/inspection/XNumericControl.idl offapi/com/sun/star/inspection/XObjectInspectorModel.idl offapi/com/sun/star/inspection/XPropertyHandler.idl offapi/com/sun/star/installation/XProtocolHandlerCheck.idl offapi/com/sun/star/installation/protocols.idl offapi/com/sun/star/linguistic2/SpellFailure.idl offapi/com/sun/star/linguistic2/XLinguServiceManager.idl offapi/com/sun/star/mail/XMailServer.idl offapi/com/sun/star/mozilla/XPluginInstance.idl offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl offapi/com/sun/star/packages/zip/ZipIOException.idl offapi/com/sun/star/presentation/OutlineView.idl offapi/com/sun/star/presentation/XPresentation2.idl offapi/com/sun/star/presentation/XSlideShow.idl offapi/com/sun/star/presentation/XSlideShowController.idl offapi/com/sun/star/report/XFunction.idl offapi/com/sun/star/report/XFunctionsSupplier.idl offapi/com/sun/star/report/XReportComponent.idl offapi/com/sun/star/report/XReportDefinition.idl offapi/com/sun/star/report/meta/XFunctionManager.idl offapi/com/sun/star/resource/XStringResourcePersistence.idl offapi/com/sun/star/resource/XStringResourceWithLocation.idl offapi/com/sun/star/resource/XStringResourceWithStorage.idl offapi/com/sun/star/sdb/DataSettings.idl offapi/com/sun/star/sdb/ErrorCondition.idl offapi/com/sun/star/sdb/SQLContext.idl offapi/com/sun/star/sdb/Table.idl offapi/com/sun/star/sdb/XRowSetApproveListener.idl offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl offapi/com/sun/star/sdb/tools/XConnectionTools.idl offapi/com/sun/star/sdbc/DataType.idl offapi/com/sun/star/sdbc/XDatabaseMetaData.idl offapi/com/sun/star/sdbcx/Descriptor.idl offapi/com/sun/star/security/DocumentSignatureInformation.idl offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl offapi/com/sun/star/sheet/DatabaseRange.idl offapi/com/sun/star/smarttags/XSmartTagAction.idl offapi/com/sun/star/table/AccessibleTableView.idl offapi/com/sun/star/table/CellProperties.idl offapi/com/sun/star/table/CellRangeListSource.idl offapi/com/sun/star/table/CellValueBinding.idl offapi/com/sun/star/table/XMergeableCellRange.idl offapi/com/sun/star/task/DocumentPasswordRequest.idl offapi/com/sun/star/task/JobExecutor.idl offapi/com/sun/star/task/MasterPasswordRequest.idl offapi/com/sun/star/task/PasswordRequest.idl offapi/com/sun/star/task/XJob.idl offapi/com/sun/star/text/AccessiblePageView.idl offapi/com/sun/star/text/AccessibleTextDocumentView.idl offapi/com/sun/star/text/LineNumberingProperties.idl offapi/com/sun/star/text/NumberingRules.idl offapi/com/sun/star/text/XRelativeTextContentRemove.idl offapi/com/sun/star/text/textfield/Database.idl offapi/com/sun/star/text/textfield/SetExpression.idl offapi/com/sun/star/text/textfield/docinfo/Description.idl offapi/com/sun/star/text/textfield/docinfo/Info0.idl offapi/com/sun/star/text/textfield/docinfo/Info1.idl offapi/com/sun/star/text/textfield/docinfo/Info2.idl offapi/com/sun/star/text/textfield/docinfo/Info3.idl offapi/com/sun/star/text/textfield/docinfo/Keywords.idl offapi/com/sun/star/text/textfield/docinfo/Revision.idl offapi/com/sun/star/text/textfield/docinfo/Subject.idl offapi/com/sun/star/text/textfield/docinfo/Title.idl offapi/com/sun/star/ucb/CommandFailedException.idl offapi/com/sun/star/ucb/Content.idl offapi/com/sun/star/ucb/ContentAction.idl offapi/com/sun/star/ucb/FetchError.idl offapi/com/sun/star/ucb/FetchResult.idl offapi/com/sun/star/ucb/HierarchyDataSource.idl offapi/com/sun/star/ucb/InteractiveFileIOException.idl offapi/com/sun/star/ucb/SearchRecursion.idl offapi/com/sun/star/ucb/UniversalContentBroker.idl offapi/com/sun/star/ucb/XAnyCompare.idl offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl offapi/com/sun/star/ucb/XContentIdentifierMapping.idl offapi/com/sun/star/ui/UIElementType.idl offapi/com/sun/star/ui/dialogs/FilePicker.idl offapi/com/sun/star/ui/dialogs/FolderPicker.idl offapi/com/sun/star/util/PathSubstitution.idl offapi/com/sun/star/util/XChangesNotifier.idl offapi/com/sun/star/util/XCloseBroadcaster.idl offapi/com/sun/star/util/XCloseListener.idl offapi/com/sun/star/util/XCloseable.idl offapi/com/sun/star/util/XStringSubstitution.idl offapi/com/sun/star/util/XTextSearch.idl offapi/com/sun/star/util/XURLTransformer.idl offapi/com/sun/star/xforms/XModel.idl offapi/com/sun/star/xml/sax/XFastAttributeList.idl offapi/com/sun/star/xml/sax/XFastParser.idl officecfg/registry/data/org/openoffice/Office/Labels.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Embedding.xcs officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs officecfg/registry/schema/org/openoffice/Office/Histories.xcs officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs officecfg/registry/schema/org/openoffice/Office/Paths.xcs officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs officecfg/registry/schema/org/openoffice/Office/UI.xcs officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Setup.xcs officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs oox/source/xls/sheetdatabuffer.cxx package/source/xstor/xstorage.cxx padmin/source/padialog.src postprocess/signing/signing.pl pyuno/source/module/pyuno_module.cxx Change-Id: I60c7b6d661ff803b5e9214ac7fefb32772ef19a7
2014-04-29set OOo reference version to 4.1 for incompatible MessageBox changesBjoern Michaelsen1-1/+1
This commit: http://cgit.freedesktop.org/libreoffice/core/commit/?id=805c6101b3427cc98b53f1c48f22f705206c384d make LibreOffice 4.2 (and AOO 4.1) widely incompatible to previous versions. We should thus update the reference version to 4.1 as that is the version we are least incompatible with. Extension developers are encouraged to use LibreOffice-minimal-version instead anyway, instead of the obsolete OOo versioning. see: https://wiki.documentfoundation.org/Development/Extension_Development https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=commitdiff;h=61f9ca7b18de1adc58cf5d7cb295ba81eb3e5d92;hp=20b8edc74b846db6d143a9e327fb7f7eb2c1fb77 Change-Id: I8275a8244d642100d7b3bc17aa0b12ae7d63e583 Reviewed-on: https://gerrit.libreoffice.org/8852 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-02-12normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONNMichael Stahl1-2/+2
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
2013-11-26generate setuprc for instdirDavid Tardon2-0/+9
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
2013-11-26generate sofficerc for instdirDavid Tardon2-0/+18
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
2013-11-25--with-lang=ALL build exceeds maximum # of files in CABChristian Lohmaier1-0/+2
so don't limit the installer to one single file, but use 2 instead Change-Id: I6fb22d217e1afe71143f0b3a5999e54eec190ddd
2013-11-22define module, not fileDavid Tardon1-2/+2
Change-Id: Ie828de19cc35228cd332ecbb5e11f2edb281bad8
2013-11-18renamed ku* to kmr-Latn*, fdo#63460Eike Rathke1-1/+1
Change-Id: I8069657d8829a0315c704e884a1cf15b26e02eb8
2013-11-08instsetoo_native: shouldn't need instdir in include pathMichael Stahl1-4/+4
get_Source_Directory_For_Files_From_Includepathlist already has a special hack to find all the files in instdir so ideally it should not be necessary to put these directories on the include path. Clean up readlicense_oo to make that possible; also copying license.txt as-is to LICENSE on Unix but first converting it on WNT is rather silly... Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c Reviewed-on: https://gerrit.libreoffice.org/6613 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-08installer: remove (now unnecessary) shlxthdlpathMichael Stahl1-2/+2
Change-Id: Ic84cdc33f470ce3ed143d86add04a422f8b9e365 Reviewed-on: https://gerrit.libreoffice.org/6614 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-02remove SOLARENV variableMichael Stahl1-1/+1
It is constant and can just be replaced by $(SRCDIR)/solenv. Use BUILD_TYPE where it was used to check if config_*.mk is sourced. Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
2013-10-31Hack to find instdir/*/LibreOffice.app/Contents/LICENSE.html on Mac OS XStephan Bergmann1-2/+2
Change-Id: I3f2b12534b6d83e4ae2c2a61a6f81ddf8cdad2cc
2013-10-31solver doesn't solve anything...Michael Stahl1-4/+4
... it is an abbreviation of "Solar Version". Since nobody can remember that: remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath and any mention thereof. Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad Reviewed-on: https://gerrit.libreoffice.org/6515 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-10-31gbuild: add ExtensionPackage classMichael Stahl1-2/+2
Change-Id: I65ca50ccc512e35a5b95c2482f3a8833d1a7294b
2013-10-31gbuild: InstallScript: use scripts from WORKDIRMichael Stahl1-4/+4
Change-Id: I741edcabf86801f77ff58bc42a81372053c7901b
2013-10-31readlicense_oo: stop delivering files to OUTDIRMichael Stahl1-2/+2
- remove Package_readme, use generated files from WORKDIR via include path - Package_license and Package_files deliver to INSTDIR - split up Package_odk_shared_readme to have extra Package for generated files - gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
2013-10-31setup_native: remove Package_scripts_generatedMichael Stahl1-2/+2
... instead add an include path to the installer. Change-Id: I5650d5d1d84620a04a9a92825733f3927da2053d
2013-10-31setup_native: find all static files in source/packinfoMichael Stahl1-4/+4
... and move the OSX specific files there too so we don't need several include paths. Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3
2013-10-31sysui: remove Package_desktopMichael Stahl1-2/+2
... put the CustomTarget dir on the search path instead. Change-Id: I2888e10bfa58d3c5b0f39958328efb14c3ce92a9
2013-10-30cli_ure: remove CLI version PackagesMichael Stahl1-2/+2
Tweak the installer so it reads the included files from SRCDIR. Change-Id: Ic4d3d2c003c2d0c5aebea6dd32f5989f3d4f04e4
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl1-2/+0
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-28Related fdo#70919 Missing instdir redirect ini-fileStephan Bergmann2-0/+11
...makes javaldx re-scan on every start. Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b
2013-10-18Remove *_Test product, so cppunittester can be NONE againStephan Bergmann3-89/+0
...as per #libreoffice-dev IRC: Sep 19 10:32:24 <mst__> sberg, moggi why the hell is that thing named "cppunit/cppunittester" and inside a subdir? it's obstructing my attempt to put it in $(INSTDIR)/program Sep 19 10:33:28 <mst__> (... and if you wonder "wtf does it have to do with INSTDIR" you have never heard of awesome LibreOffice_Test installset.... not that i would know who needs it :) Sep 19 10:36:36 <sberg> mst__, it is in a subdir of solver/*/bin so that on Windows it would not accidentally have picked DLLs next to itself instead of the module-local DLLs it was supposed to test (back when we had module-local output trees) Sep 19 10:37:02 <mst__> sberg, ahh hysteric reasons then, /me renames it Sep 19 10:37:55 <tml> mst__, if nobody you know uses LibreOffice_Test, just kill it? Sep 19 10:38:59 <sberg> mst__, tml, LibreOffice_Test was conceived by pmladek and/or kendy, IIRC Sep 19 10:40:31 * kendy does not remember anything about it :-) Sep 19 10:42:17 <sberg> wasn't that something so users (or QA people?) could easily run the smoketest against an installation, to see whether the installation is any good at all, by installing that LibreOffice_Test alongside the installation proper? Sep 19 10:43:26 <sberg> mst__, ...and I'd unscientifically vote to kill it Sep 19 11:34:23 <pmladek> mst__, sberg: I have created the LibreOffice_Test package for one QA guy. He does not longer work on LO. I am not sure if anyone else started to use it. So, I think that it can be killed. Oct 17 18:18:07 <tml_> sberg: have you ever noticed that when you try to actually run instdir/unxmacxi/LibreOfficeDev.app , the system actually tries to run cppunittester inside the app bundle (it says so in the crash report) (it crashes because cppunittester requires a specialized DYLIB_LIBRARY_PATH apparently) Oct 17 18:19:29 <tml_> I suspect that the system when cppunittester as part of the build process is run from inside instdir (i.e. inside an app bundle) the system "caches" this false knowledge, and thinks that the executable of the app bundle is cppunittester... Oct 17 18:19:36 <sberg> tml_, no, never noticed; with "run instdir/unxmacxi/LibreOfficeDev.app" you mean calling "open instdir/unxmacxi/LibreOfficeDev.app"? (I always call .app/Contenst/MacOS/program explicitly) Oct 17 18:19:52 <tml_> yes, I mean "open instdir/..." Oct 17 18:20:53 <tml_> some googling tells me that at least years ago, the CFBundleExecutable key in the Info.plist is ignored if it is manually changed, so I guess similar caching of mapping between an app bundle and which executable to actually run happens in this case Oct 17 18:23:17 <tml_> and last year somebody even claims "And while on Mountain Lion, CFBundleExecutable seems to be a no-op", which would be odd, surely there must be widely used apps that have several executables inside the MacOS directory; how would the system know which one to run when the app is run? Oct 17 18:24:38 <tml_> hmm, apparently the code that handles this might be open source even, http://www.opensource.apple.com/source/CF/CF-744.18/CFBundle.c Oct 17 18:25:52 <tml_> some mention of "caches" there yes, my guesses might be right Oct 17 18:27:05 <tml_> if I cp -R instdir/unxmacxi/LibreOffice.app foo.app and open foo.app, it works fine Oct 17 18:28:33 <tml_> anyway, I guess it would be cleaner to have cppunittester somewhere else even without this problem Oct 17 18:37:09 <sberg> tml_, yes, IIRC having cppunittester in instdir was a misguided mst decision, because that odd LibreOffice_Test product (that pmladek said nobody needs any longer anyway) includes it; I think consensus was to kill LibreOffice_Test and move cppunittester where all the other NONE executables are, but looks like nobody executed Oct 17 18:37:55 <tml_> ah ok, so mst should know what needs to be done? good, no need for me to try to hack this now then Oct 17 18:38:19 <sberg> tml_, I'll do the cleanup tomorrow, unless somebody beats me This removes smoketest/losmoketest et al along with the *_Test product, as they seem to not make sense without it anyway. smoketest/Executable_libtest.mk appears to be a test that could also be run during the build, and only ended up in the *_Test product by accident, so I left it untouched for now. Change-Id: I8024472c909fe0a885eb08ef4d3777f8a9e1f7c8
2013-10-15Make building installation sets depend on --with-package-format=...Stephan Bergmann1-1/+1
...instead of inconsitently having it depend on --enable-epm for some platforms and having it always enabled on Windows. Only Android and iOS are presumably still special and build any installation sets in their specific modules and outside instsetoo_native. One consequence is that for a non-Windows --enable-online-update --without-package-format build, instdir's version ini-file contains an UpdateURL that ends in just "?pkgfmt=" without an actual format identifier. However, checking whether the update feature would actually work is difficult for most such developer builds, anyway. Change-Id: If14fcf0b2e612499811e8a6e067a854bda612c42
2013-10-09fix building debs with epm (find libgetuid.so in instdir)Christian Lohmaier1-6/+6
70c35265f517ef372cb739d4cc64499abf57a838 and f89cce877cc0480e00ee226780dec887f9d0063a moved most stuff to instdir, but forgot about epm and deb-builds. libgetuid.so that is needed to build the debs is in instdir/ure/lib, but that wasn't added to the list of include paths. Change-Id: Iaf3f8cb2f6329dd66fe9f3862fd71f2037813d97 Reviewed-on: https://gerrit.libreoffice.org/6142 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02Media/LastSequence is i4, so it has to be 32767->65535 in _Validation tableAndras Timar3-3/+3
Change-Id: Icfcd8c70da350e5b431d6ac802a34b35adf8035b
2013-10-02fix make test-install on WNTMichael Stahl1-1/+2
Change-Id: I681f2c4989b88943fe57e6173554a019539a18cc
2013-10-01remove run-time replacement of %WRITERCOMPATIBILITYVERSIONOOO11Michael Stahl1-2/+0
Instead hard-code OpenOffice.org 1.1 as the value, since StarOffice and StarSuite are irrelevant. Change-Id: I9ab3d1cf38cf64cd4e440b3ae43158f748ead7d2
2013-10-01test-install: get rid of opt/Michael Stahl1-2/+2
Change-Id: Ie390749c0b28e47848c361d874bb447f39cfeb12
2013-10-01put result of make test-install into top-level test-install dirMichael Stahl1-11/+11
... and rename all DEVINSTALL variables to TESTINSTALL. Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
2013-09-25Start hacking --enable-canonical-installation-tree-structure back into shapeTor Lillqvist1-1/+1
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 Lillqvist1-5/+0
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