${_lang.welWelcome}
@@ -674,65 +674,71 @@
this.dndZone = new DnDFileZone();
this.dndZone.render(this.view.$panel.find("#area-dnd-file"));
- const docGrid = new DocumentCreationGrid({
- documentTypes: [
- {
- id: 'word',
- title: utils.Lang.newDoc,
- langKey: 'newDoc',
- formatLabel: {
- value: 'DOCX',
- gradientColorStart: '#4298C5',
- gradientColorEnd: '#2D84B2',
- bgColorWinXP: '#287ca9',
- },
- icon: '#docx-big',
+ const documentTypes = [
+ {
+ id: 'word',
+ title: utils.Lang.newDoc,
+ langKey: 'newDoc',
+ formatLabel: {
+ value: 'DOCX',
+ gradientColorStart: '#4298C5',
+ gradientColorEnd: '#2D84B2',
+ bgColorWinXP: '#287ca9',
},
- {
- id: 'cell',
- title: utils.Lang.newXlsx,
- langKey: 'newXlsx',
- formatLabel: {
- value: 'XLSX',
- gradientColorStart: '#5BB514',
- gradientColorEnd: '#318C2B',
- bgColorWinXP: '#3aa133',
- },
- icon: '#xlsx-big',
+ icon: '#docx-big',
+ },
+ {
+ id: 'cell',
+ title: utils.Lang.newXlsx,
+ langKey: 'newXlsx',
+ formatLabel: {
+ value: 'XLSX',
+ gradientColorStart: '#5BB514',
+ gradientColorEnd: '#318C2B',
+ bgColorWinXP: '#3aa133',
},
- {
- id: 'slide',
- title: utils.Lang.newPptx,
- langKey: 'newPptx',
- formatLabel: {
- value: 'PPTX',
- gradientColorStart: '#F4893A',
- gradientColorEnd: '#DE7341',
- bgColorWinXP: '#f36700',
- },
- icon: '#pptx-big',
+ icon: '#xlsx-big',
+ },
+ {
+ id: 'slide',
+ title: utils.Lang.newPptx,
+ langKey: 'newPptx',
+ formatLabel: {
+ value: 'PPTX',
+ gradientColorStart: '#F4893A',
+ gradientColorEnd: '#DE7341',
+ bgColorWinXP: '#f36700',
},
- {
- id: 'form',
- title: utils.Lang.newForm,
- langKey: 'newForm',
- formatLabel: {
- value: 'PDF',
- gradientColorStart: '#F36653',
- gradientColorEnd: '#D2402D',
- bgColorWinXP: '#e54d39',
- },
- icon: '#pdf-big',
- }
- ],
- onDocumentSelect: (docType) => {
- window.sdk.command("create:new", docType);
+ icon: '#pptx-big',
+ },
+ {
+ id: 'form',
+ title: utils.Lang.newForm,
+ langKey: 'newForm',
+ formatLabel: {
+ value: 'PDF',
+ gradientColorStart: '#F36653',
+ gradientColorEnd: '#D2402D',
+ bgColorWinXP: '#e54d39',
+ },
+ icon: '#pdf-big',
}
- });
+ ].filter(doc => utils.isProductComponentEnabled(doc.id));
CommonEvents.on('lang:changed', _init_ppmenu.bind(this));
- docGrid.render(this.view.$panel.find("#area-document-creation-grid"));
+ if (documentTypes.length) {
+ const docGrid = new DocumentCreationGrid({
+ documentTypes,
+ onDocumentSelect: (docType) => {
+ window.sdk.command("create:new", docType);
+ }
+ });
+
+ docGrid.render(this.view.$panel.find("#area-document-creation-grid"));
+ } else {
+ this.view.$panel.find("#area-document-creation-grid").hide();
+ }
$('#idx-recent-filter', this.view.$panel).on('input', _on_filter_recents.bind(this));
@@ -755,4 +761,4 @@
// window.CommonEvents.on('main:ready', function(){
// var p = new ControllerRecent({});
// p.init();
-// });
\ No newline at end of file
+// });
diff --git a/common/loginpage/src/paneltemplates.js b/common/loginpage/src/paneltemplates.js
index 1a9cf467c..340955c7f 100644
--- a/common/loginpage/src/paneltemplates.js
+++ b/common/loginpage/src/paneltemplates.js
@@ -57,6 +57,16 @@
const msg = 'Oops! Something went wrong :(
Check internet connection';
this.emptyPanelContent = `
`;
+ const navItems = [
+ { value: 'Documents', editor: 'word', title: _lang.tplDocument },
+ { value: 'Spreadsheets', editor: 'cell', title: _lang.tplSpreadsheet },
+ { value: 'Presentations', editor: 'slide', title: _lang.tplPresentation },
+ { value: 'PDFs', editor: 'pdf', title: _lang.tplPDF },
+ { value: 'Drawings', editor: 'draw', title: _lang.tplDrawing }
+ ].filter(item => utils.isProductComponentEnabled(item.editor));
+ const navItemsHtml = navItems.map((item, index) =>
+ `
${item.title}`
+ ).join('');
const _html = `
@@ -155,7 +162,7 @@
const panel = $item.data('value');
- this.view.$panel.removeClass('Documents Spreadsheets Presentations PDFs').addClass(panel);
+ this.view.$panel.removeClass('Documents Spreadsheets Presentations PDFs Drawings').addClass(panel);
applyFilter(this.view.$panel);
$('.themed-sroll', this.view.$panel).scrollTop(0);
@@ -262,7 +269,7 @@
(this.tmpls || tmpls)
.forEach(item => {
const type = utils.formatToEditor(item.type);
- if (['word', 'cell', 'slide', 'pdf'].includes(type)) {
+ if (['word', 'cell', 'slide', 'pdf', 'draw'].includes(type) && utils.isProductComponentEnabled(type)) {
// this.templates.add(new FileTemplateModel(item));
const m = this.templates.find('path', item.path);
@@ -302,6 +309,8 @@
const file_ext = info['form_exts']['data'][0]['attributes']['ext'],
id = i.id;
+ if (!utils.isProductComponentEnabled(utils.formatToEditor(utils.fileExtensionToFileFormat(file_ext)))) return;
+
if (!this.templates.items.some(t => t.uid === id)) {
const m = new FileTemplateModel({
@@ -331,7 +340,8 @@
'Documents': 'word',
'Spreadsheets': 'cell',
'Presentations': 'slide',
- 'PDFs': 'pdf'
+ 'PDFs': 'pdf',
+ 'Drawings': 'draw'
}[$('.nav-item.selected', $panel).data('value')];
const search = $('#template-search').val() || '';
@@ -350,7 +360,7 @@
});
$('#search-result', $panel).toggle(!!searchСomparison).text(`${utils.Lang.tplSearchResult} "${search}"`);
- $('#idx-nav-templates', $panel).toggle(!searchСomparison);
+ $('#idx-nav-templates', $panel).toggle(!utils.productComponent() && !searchСomparison);
$('#search-no-results', $panel).toggle(matchCount === 0);
};
@@ -422,7 +432,7 @@
_init_collection.call(this);
- if ( window.utils.isWinXp ) {
+ if ( window.utils.isWinXp || utils.productComponent() ) {
$('#idx-nav-templates', this.view.$panel).hide();
}
@@ -474,4 +484,4 @@
}
};
})());
-}();
\ No newline at end of file
+}();
diff --git a/common/loginpage/src/utils.js b/common/loginpage/src/utils.js
index 951141b5d..bf0efff15 100644
--- a/common/loginpage/src/utils.js
+++ b/common/loginpage/src/utils.js
@@ -228,14 +228,15 @@ utils.defines.FileFormat = {
utils.defines.DBLCLICK_LOCK_TIMEOUT = 800;
utils.defines.links = {
- regnew: 'https://www.onlyoffice.com/registration.aspx?app=desktop',
- restorepass: 'https://www.onlyoffice.com/signin.aspx'
+ regnew: 'https://github.com/Euro-Office',
+ restorepass: 'https://github.com/Euro-Office'
};
utils.formatToEditor = function(f) {
+ if ( f > FILE_DRAW ) return 'draw'; else
if ( f > FILE_PRESENTATION && f < FILE_SPREADSHEET ) return 'slide'; else
if ( f > FILE_SPREADSHEET && f < FILE_CROSSPLATFORM ) return 'cell'; else
- if ( f > FILE_CROSSPLATFORM || f === utils.defines.FileFormat.FILE_DOCUMENT_OFORM_PDF ) return 'pdf';
+ if ( (f > FILE_CROSSPLATFORM && f < FILE_DRAW) || f === utils.defines.FileFormat.FILE_DOCUMENT_OFORM_PDF ) return 'pdf';
else return 'word';
}
@@ -356,6 +357,13 @@ utils.fileExtensionToFileFormat = function(extension) {
case 'djvu': return utils.defines.FileFormat.FILE_CROSSPLATFORM_DJVU;
case 'xps': return utils.defines.FileFormat.FILE_CROSSPLATFORM_XPS;
+ case 'vsdx': return utils.defines.FileFormat.FILE_DRAW_VSDX;
+ case 'vssx': return utils.defines.FileFormat.FILE_DRAW_VSSX;
+ case 'vstx': return utils.defines.FileFormat.FILE_DRAW_VSTX;
+ case 'vsdm': return utils.defines.FileFormat.FILE_DRAW_VSDM;
+ case 'vssm': return utils.defines.FileFormat.FILE_DRAW_VSSM;
+ case 'vstm': return utils.defines.FileFormat.FILE_DRAW_VSTM;
+
default: return utils.defines.FileFormat.FILE_UNKNOWN;
}
@@ -398,6 +406,8 @@ utils.fn.parseRecent = function(arr, out = 'files') {
const _is_win = /Win/.test(navigator.platform);
const _re_name = !_is_win ? /([^/]+\.[a-zA-Z0-9]{1,})$/ : /([^\\/]+\.[a-zA-Z0-9]{1,})$/;
for (let _f_ of arr) {
+ if (out == 'files' && !utils.isProductComponentEnabled(utils.formatToEditor(_f_.type))) continue;
+
if ( _is_win && /^\w:[\\\/]/.test(_f_.path) && /(?:\\{2,})+/.test(_f_.path) )
_f_.path = _f_.path.replace(/(?:\\{2,})+/g,"\\");
@@ -543,6 +553,44 @@ function getUrlParams() {
}
utils.inParams = getUrlParams();
+utils.productComponent = function() {
+ const value = (utils.inParams.app_component || utils.inParams.product_component || '').toLowerCase();
+ const aliases = {
+ text: 'text',
+ document: 'text',
+ documents: 'text',
+ word: 'text',
+ spreadsheet: 'spreadsheet',
+ spreadsheets: 'spreadsheet',
+ sheet: 'spreadsheet',
+ cell: 'spreadsheet',
+ presentation: 'presentation',
+ presentations: 'presentation',
+ slide: 'presentation',
+ pdf: 'pdf',
+ form: 'pdf',
+ visio: 'visio',
+ draw: 'visio',
+ drawing: 'visio',
+ drawings: 'visio'
+ };
+
+ return aliases[value] || '';
+};
+utils.isProductComponentEnabled = function(editor) {
+ const component = utils.productComponent();
+ if (!component) return true;
+
+ const editorsByComponent = {
+ text: ['word', 'Documents'],
+ spreadsheet: ['cell', 'Spreadsheets'],
+ presentation: ['slide', 'Presentations'],
+ pdf: ['form', 'pdf', 'PDFs'],
+ visio: ['draw', 'Drawings']
+ };
+
+ return (editorsByComponent[component] || []).indexOf(editor) >= 0;
+};
utils.brandCheck = opts => false;
utils.isWinXp = utils.inParams.osver == 'winxp' || /windows nt 5/i.test(navigator.appVersion);
utils.isMacOS = /mac os/i.test(navigator.userAgent);
diff --git a/macos/ONLYOFFICE.xcodeproj/project.pbxproj b/macos/ONLYOFFICE.xcodeproj/project.pbxproj
index 1467c0bc9..1233feca9 100644
--- a/macos/ONLYOFFICE.xcodeproj/project.pbxproj
+++ b/macos/ONLYOFFICE.xcodeproj/project.pbxproj
@@ -853,7 +853,7 @@
FC035A5B24855E8C00AF820F /* ASCTabViewType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCTabViewType.h; sourceTree = "
"; };
FC09073D1C1855A400D9E881 /* editors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = editors; path = Vendor/ONLYOFFICE/editors; sourceTree = SOURCE_ROOT; };
FC0907401C186A7A00D9E881 /* converter */ = {isa = PBXFileReference; lastKnownFileType = folder; name = converter; path = Vendor/ONLYOFFICE/converter; sourceTree = SOURCE_ROOT; };
- FC0BD6FB258B63F700C47F95 /* ONLYOFFICE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ONLYOFFICE.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ FC0BD6FB258B63F700C47F95 /* Euro-Office.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Euro-Office.app; sourceTree = BUILT_PRODUCTS_DIR; };
FC1127571BBAAC8000AA3648 /* ASCPopoverLightView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASCPopoverLightView.h; sourceTree = ""; };
FC1127581BBAAC8000AA3648 /* ASCPopoverLightView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASCPopoverLightView.m; sourceTree = ""; };
FC13B5272080BBF500524968 /* NSImage+Extensions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSImage+Extensions.h"; sourceTree = ""; };
@@ -1010,7 +1010,7 @@
FCAF3EFC1BA31D3C00B42BAA /* ASCUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASCUserInfoViewController.m; sourceTree = ""; };
FCB454FD1C326A4E00FEACF2 /* PFMoveApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFMoveApplication.h; sourceTree = ""; };
FCB454FE1C326A4E00FEACF2 /* PFMoveApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFMoveApplication.m; sourceTree = ""; };
- FCB4C73726DD018B0012C20D /* ONLYOFFICE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ONLYOFFICE.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ FCB4C73726DD018B0012C20D /* Euro-Office.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Euro-Office.app; sourceTree = BUILT_PRODUCTS_DIR; };
FCB4C73C26DD02630012C20D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; };
FCB4C73D26DD02630012C20D /* ONLYOFFICE.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ONLYOFFICE.entitlements; sourceTree = ""; };
FCB4C73F26DD02630012C20D /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; };
@@ -1043,7 +1043,7 @@
FCB4C77826DD02640012C20D /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = ""; };
FCB4C77A26DD02640012C20D /* zh-Hans-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans-CN"; path = "zh-Hans-CN.lproj/InfoPlist.strings"; sourceTree = ""; };
FCB4C77B26DD02640012C20D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
- FCBC42681B9D650400405301 /* ONLYOFFICE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ONLYOFFICE.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ FCBC42681B9D650400405301 /* Euro-Office.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Euro-Office.app; sourceTree = BUILT_PRODUCTS_DIR; };
FCBC426D1B9D650400405301 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; };
FCBC426E1B9D650400405301 /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = ""; };
FCBC42701B9D650400405301 /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; };
@@ -1555,9 +1555,9 @@
FCBC42691B9D650400405301 /* Products */ = {
isa = PBXGroup;
children = (
- FCBC42681B9D650400405301 /* ONLYOFFICE.app */,
- FC0BD6FB258B63F700C47F95 /* ONLYOFFICE.app */,
- FCB4C73726DD018B0012C20D /* ONLYOFFICE.app */,
+ FCBC42681B9D650400405301 /* Euro-Office.app */,
+ FC0BD6FB258B63F700C47F95 /* Euro-Office.app */,
+ FCB4C73726DD018B0012C20D /* Euro-Office.app */,
);
name = Products;
sourceTree = "";
@@ -1865,8 +1865,8 @@
dependencies = (
);
name = "ONLYOFFICE-v8";
- productName = ONLYOFFICE;
- productReference = FC0BD6FB258B63F700C47F95 /* ONLYOFFICE.app */;
+ productName = "Euro-Office";
+ productReference = FC0BD6FB258B63F700C47F95 /* Euro-Office.app */;
productType = "com.apple.product-type.application";
};
FCB4C6BA26DD018B0012C20D /* ONLYOFFICE-arm */ = {
@@ -1886,8 +1886,8 @@
dependencies = (
);
name = "ONLYOFFICE-arm";
- productName = ONLYOFFICE;
- productReference = FCB4C73726DD018B0012C20D /* ONLYOFFICE.app */;
+ productName = "Euro-Office";
+ productReference = FCB4C73726DD018B0012C20D /* Euro-Office.app */;
productType = "com.apple.product-type.application";
};
FCBC42671B9D650400405301 /* ONLYOFFICE-x86_64 */ = {
@@ -1907,8 +1907,8 @@
dependencies = (
);
name = "ONLYOFFICE-x86_64";
- productName = ONLYOFFICE;
- productReference = FCBC42681B9D650400405301 /* ONLYOFFICE.app */;
+ productName = "Euro-Office";
+ productReference = FCBC42681B9D650400405301 /* Euro-Office.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -1919,7 +1919,7 @@
attributes = {
CLASSPREFIX = ASC;
LastUpgradeCheck = 0730;
- ORGANIZATIONNAME = "Ascensio System SIA";
+ ORGANIZATIONNAME = "Euro-Office contributors";
TargetAttributes = {
FC0BD683258B63F700C47F95 = {
DevelopmentTeam = 2WH24U26GJ;
@@ -2226,7 +2226,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#!/bin/sh\n\n#exit 0\n\nCreateDir() {\nif [ ! -d $1 ]; then\nmkdir -p $1\nelse\nrm -Rf $1\nmkdir -p $1\nfi\n}\n\nBASE_DIR=$(pwd)\nDST_DIR=\"${BASE_DIR}/Vendor/ONLYOFFICE\"\nSRC_BASE_DIR=\"${BASE_DIR}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\n\n# Copy application resources\necho \"Copy application resources\"\nCreateDir \"${DST_DIR}/login\"\ncp -vR \"${SRC_BASE_DIR}/index.html\" \"${DST_DIR}/login/index.html\"\ncp -vR \"${SRC_BASE_DIR}/editors/webext/noconnect.html\" \"${DST_DIR}/login/noconnect.html\"\ncp -vR \"${SRC_BASE_DIR}/fonts\" \"${DST_DIR}/login/fonts\"\ncp -vR \"${BASE_DIR}/ONLYOFFICE/Resources/acknowledgments.html\" \"${DST_DIR}/login/acknowledgments.html\"\ncp -vR \"${SRC_BASE_DIR}/providers\" \"${DST_DIR}\"\n\n[ ! -d \"${DST_DIR}/license\" ] && mkdir -p \"${DST_DIR}/license\"\n\n# Copy editors and convertor\necho \"Copy editors and convertor\"\ncd \"$BASE_DIR\"\ncp -vR \"${SRC_BASE_DIR}/editors\" \"${DST_DIR}\"\ncp -vR \"${SRC_BASE_DIR}/converter\" \"${DST_DIR}\"\n";
+ shellScript = "#!/bin/sh\n\n#exit 0\n\nCreateDir() {\nif [ ! -d $1 ]; then\nmkdir -p $1\nelse\nrm -Rf $1\nmkdir -p $1\nfi\n}\n\nBASE_DIR=$(pwd)\nDST_DIR=\"${BASE_DIR}/Vendor/ONLYOFFICE\"\nSRC_BASE_DIR=\"${BASE_DIR}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\n\n# Copy application resources\necho \"Copy application resources\"\nCreateDir \"${DST_DIR}/login\"\ncp -vR \"${SRC_BASE_DIR}/index.html\" \"${DST_DIR}/login/index.html\"\ncp -vR \"${SRC_BASE_DIR}/editors/webext/noconnect.html\" \"${DST_DIR}/login/noconnect.html\"\ncp -vR \"${SRC_BASE_DIR}/fonts\" \"${DST_DIR}/login/fonts\"\ncp -vR \"${BASE_DIR}/ONLYOFFICE/Resources/acknowledgments.html\" \"${DST_DIR}/login/acknowledgments.html\"\ncp -vR \"${SRC_BASE_DIR}/providers\" \"${DST_DIR}\"\n\n[ ! -d \"${DST_DIR}/license\" ] && mkdir -p \"${DST_DIR}/license\"\n\n# Copy editors and convertor\necho \"Copy editors and convertor\"\ncd \"$BASE_DIR\"\ncp -vR \"${SRC_BASE_DIR}/editors\" \"${DST_DIR}\"\ncp -vR \"${SRC_BASE_DIR}/converter\" \"${DST_DIR}\"\n\"${BASE_DIR}/scripts/brand-vendor-resources.sh\" \"${DST_DIR}\" \"${PRODUCT_NAME:-Euro-Office}\"\n";
showEnvVarsInLog = 0;
};
FC0BD6F6258B63F700C47F95 /* Rename symbols */ = {
@@ -2245,7 +2245,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#!/bin/sh\n\n#exit 0\n\nbase_path=$(pwd)\ncontents_path=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\nframeworks_path=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nconverter_path=\"${contents_path}/Resources/converter\"\ncore_path=\"${base_path}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\napp_name=\"ONLYOFFICE\"\n\n# Signs a framework with the provided identity\ncode_sign_if_enabled() {\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY:-}\" -a \"${CODE_SIGNING_REQUIRED:-}\" != \"NO\" -a \"${CODE_SIGNING_ALLOWED}\" != \"NO\" ]; then\n # Use the current code_sign_identity\n echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n local code_sign_cmd=\"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'\"\n\n echo \"$code_sign_cmd\"\n eval \"$code_sign_cmd\"\n fi\n}\n\n# Sign libs in directory\nsign_libs_in_directory() {\n for i in $1/*.framework; do\n [ -d \"$i\" ] || break\n code_sign_if_enabled \"$i/Versions/Current\"\n done\n}\n\n# Change path of dependency library\nchange_dependency_path() {\n echo \"Rename path for $1 from $2 to $3\"\n install_name_tool -change \"$2\" \"$3\" \"$1\"\n}\n\nrm -rf \"${frameworks_path}/Chromium Embedded Framework.framework\"\nrm -rf \"${frameworks_path}/editors_helper.app\"\nrm -rf \"${frameworks_path}/editors_helper (GPU).app\"\nrm -rf \"${frameworks_path}/editors_helper (Renderer).app\"\nrm -rf \"${frameworks_path}/ascdocumentscore.framework\"\n#rm -rf \"${frameworks_path}/ooxmlsignature.framework\"\nrm -rf \"${frameworks_path}/hunspell.framework\"\n\nif [ ! -d \"${frameworks_path}\" ]; then\nmkdir -p \"${frameworks_path}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}/editors_helper.app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (GPU).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (Renderer).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/Chromium Embedded Framework.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/ascdocumentscore.framework\" \"${frameworks_path}\"\n#cp -Rv \"${core_path}/ooxmlsignature.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/hunspell.framework\" \"${frameworks_path}\"\n\n# Fixed paths application\necho \"Fixed dependency paths of application\"\nchange_dependency_path \"${contents_path}/MacOS/${app_name}\" \"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework\" \"@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework\"\n\n# Resign the code if required by the build settings to avoid unstable apps\necho \"Sign libraries and frameworks with ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n\n#code_sign_if_enabled \"${frameworks_path}/ooxmlsignature.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/ascdocumentscore.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/hunspell.framework/Versions/Current\"\n\nsign_libs_in_directory ${converter_path}\n\ncodesign --verbose --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${converter_path}/x2t\"\n\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper.app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (GPU).app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (Renderer).app\"\n\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Autoupdate\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B\"\n\ncodesign --verbose=4 --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${contents_path}/MacOS/${app_name}\"\n";
+ shellScript = "#!/bin/sh\n\n#exit 0\n\nbase_path=$(pwd)\ncontents_path=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\nframeworks_path=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nconverter_path=\"${contents_path}/Resources/converter\"\ncore_path=\"${base_path}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\napp_name=\"${EXECUTABLE_NAME}\"\n\n# Signs a framework with the provided identity\ncode_sign_if_enabled() {\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY:-}\" -a \"${CODE_SIGNING_REQUIRED:-}\" != \"NO\" -a \"${CODE_SIGNING_ALLOWED}\" != \"NO\" ]; then\n # Use the current code_sign_identity\n echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n local code_sign_cmd=\"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'\"\n\n echo \"$code_sign_cmd\"\n eval \"$code_sign_cmd\"\n fi\n}\n\n# Sign libs in directory\nsign_libs_in_directory() {\n for i in $1/*.framework; do\n [ -d \"$i\" ] || break\n code_sign_if_enabled \"$i/Versions/Current\"\n done\n}\n\n# Change path of dependency library\nchange_dependency_path() {\n echo \"Rename path for $1 from $2 to $3\"\n install_name_tool -change \"$2\" \"$3\" \"$1\"\n}\n\nrm -rf \"${frameworks_path}/Chromium Embedded Framework.framework\"\nrm -rf \"${frameworks_path}/editors_helper.app\"\nrm -rf \"${frameworks_path}/editors_helper (GPU).app\"\nrm -rf \"${frameworks_path}/editors_helper (Renderer).app\"\nrm -rf \"${frameworks_path}/ascdocumentscore.framework\"\n#rm -rf \"${frameworks_path}/ooxmlsignature.framework\"\nrm -rf \"${frameworks_path}/hunspell.framework\"\n\nif [ ! -d \"${frameworks_path}\" ]; then\nmkdir -p \"${frameworks_path}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}/editors_helper.app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (GPU).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (Renderer).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/Chromium Embedded Framework.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/ascdocumentscore.framework\" \"${frameworks_path}\"\n#cp -Rv \"${core_path}/ooxmlsignature.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/hunspell.framework\" \"${frameworks_path}\"\n\n# Fixed paths application\necho \"Fixed dependency paths of application\"\nchange_dependency_path \"${contents_path}/MacOS/${app_name}\" \"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework\" \"@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework\"\n\n# Resign the code if required by the build settings to avoid unstable apps\necho \"Sign libraries and frameworks with ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n\n#code_sign_if_enabled \"${frameworks_path}/ooxmlsignature.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/ascdocumentscore.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/hunspell.framework/Versions/Current\"\n\nsign_libs_in_directory ${converter_path}\n\ncodesign --verbose --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${converter_path}/x2t\"\n\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper.app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (GPU).app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (Renderer).app\"\n\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Autoupdate\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B\"\n\ncodesign --verbose=4 --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${contents_path}/MacOS/${app_name}\"\n";
showEnvVarsInLog = 0;
};
FC0BD6F7258B63F700C47F95 /* Increment Build Number */ = {
@@ -2282,7 +2282,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#!/bin/sh\n\n#exit 0\n\nbase_path=$(pwd)\ncontents_path=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\nframeworks_path=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nconverter_path=\"${contents_path}/Resources/converter\"\ncore_path=\"${base_path}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\napp_name=\"ONLYOFFICE\"\n\n# Signs a framework with the provided identity\ncode_sign_if_enabled() {\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY:-}\" -a \"${CODE_SIGNING_REQUIRED:-}\" != \"NO\" -a \"${CODE_SIGNING_ALLOWED}\" != \"NO\" ]; then\n # Use the current code_sign_identity\n echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n local code_sign_cmd=\"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'\"\n\n echo \"$code_sign_cmd\"\n eval \"$code_sign_cmd\"\n fi\n}\n\n# Sign libs in directory\nsign_libs_in_directory() {\n for i in $1/*.framework; do\n [ -d \"$i\" ] || break\n code_sign_if_enabled \"$i/Versions/Current\"\n done\n}\n\n# Change path of dependency library\nchange_dependency_path() {\n echo \"Rename path for $1 from $2 to $3\"\n install_name_tool -change \"$2\" \"$3\" \"$1\"\n}\n\nrm -rf \"${frameworks_path}/Chromium Embedded Framework.framework\"\nrm -rf \"${frameworks_path}/editors_helper.app\"\nrm -rf \"${frameworks_path}/editors_helper (GPU).app\"\nrm -rf \"${frameworks_path}/editors_helper (Renderer).app\"\nrm -rf \"${frameworks_path}/ascdocumentscore.framework\"\n#rm -rf \"${frameworks_path}/ooxmlsignature.framework\"\nrm -rf \"${frameworks_path}/hunspell.framework\"\n\nif [ ! -d \"${frameworks_path}\" ]; then\nmkdir -p \"${frameworks_path}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}/editors_helper.app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (GPU).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (Renderer).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/Chromium Embedded Framework.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/ascdocumentscore.framework\" \"${frameworks_path}\"\n#cp -Rv \"${core_path}/ooxmlsignature.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/hunspell.framework\" \"${frameworks_path}\"\n\n# Fixed paths application\necho \"Fixed dependency paths of application\"\nchange_dependency_path \"${contents_path}/MacOS/${app_name}\" \"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework\" \"@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework\"\n\n# Resign the code if required by the build settings to avoid unstable apps\necho \"Sign libraries and frameworks with ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n\n#code_sign_if_enabled \"${frameworks_path}/ooxmlsignature.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/ascdocumentscore.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/hunspell.framework/Versions/Current\"\n\nsign_libs_in_directory \"${converter_path}\"\n\ncodesign --verbose --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${converter_path}/x2t\"\n\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper.app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (GPU).app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (Renderer).app\"\n\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Autoupdate\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B\"\n\ncodesign --verbose=4 --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${contents_path}/MacOS/${app_name}\"\n";
+ shellScript = "#!/bin/sh\n\n#exit 0\n\nbase_path=$(pwd)\ncontents_path=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\nframeworks_path=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nconverter_path=\"${contents_path}/Resources/converter\"\ncore_path=\"${base_path}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\napp_name=\"${EXECUTABLE_NAME}\"\n\n# Signs a framework with the provided identity\ncode_sign_if_enabled() {\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY:-}\" -a \"${CODE_SIGNING_REQUIRED:-}\" != \"NO\" -a \"${CODE_SIGNING_ALLOWED}\" != \"NO\" ]; then\n # Use the current code_sign_identity\n echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n local code_sign_cmd=\"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'\"\n\n echo \"$code_sign_cmd\"\n eval \"$code_sign_cmd\"\n fi\n}\n\n# Sign libs in directory\nsign_libs_in_directory() {\n for i in $1/*.framework; do\n [ -d \"$i\" ] || break\n code_sign_if_enabled \"$i/Versions/Current\"\n done\n}\n\n# Change path of dependency library\nchange_dependency_path() {\n echo \"Rename path for $1 from $2 to $3\"\n install_name_tool -change \"$2\" \"$3\" \"$1\"\n}\n\nrm -rf \"${frameworks_path}/Chromium Embedded Framework.framework\"\nrm -rf \"${frameworks_path}/editors_helper.app\"\nrm -rf \"${frameworks_path}/editors_helper (GPU).app\"\nrm -rf \"${frameworks_path}/editors_helper (Renderer).app\"\nrm -rf \"${frameworks_path}/ascdocumentscore.framework\"\n#rm -rf \"${frameworks_path}/ooxmlsignature.framework\"\nrm -rf \"${frameworks_path}/hunspell.framework\"\n\nif [ ! -d \"${frameworks_path}\" ]; then\nmkdir -p \"${frameworks_path}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}/editors_helper.app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (GPU).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (Renderer).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/Chromium Embedded Framework.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/ascdocumentscore.framework\" \"${frameworks_path}\"\n#cp -Rv \"${core_path}/ooxmlsignature.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/hunspell.framework\" \"${frameworks_path}\"\n\n# Fixed paths application\necho \"Fixed dependency paths of application\"\nchange_dependency_path \"${contents_path}/MacOS/${app_name}\" \"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework\" \"@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework\"\n\n# Resign the code if required by the build settings to avoid unstable apps\necho \"Sign libraries and frameworks with ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n\n#code_sign_if_enabled \"${frameworks_path}/ooxmlsignature.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/ascdocumentscore.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/hunspell.framework/Versions/Current\"\n\nsign_libs_in_directory \"${converter_path}\"\n\ncodesign --verbose --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${converter_path}/x2t\"\n\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper.app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (GPU).app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (Renderer).app\"\n\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Autoupdate\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B\"\n\ncodesign --verbose=4 --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${contents_path}/MacOS/${app_name}\"\n";
showEnvVarsInLog = 0;
};
FC5A2D271BABF6E1001ACEB1 /* Copy Library */ = {
@@ -2297,7 +2297,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#!/bin/sh\n\n#exit 0\n\nCreateDir() {\nif [ ! -d $1 ]; then\nmkdir -p $1\nelse\nrm -Rf $1\nmkdir -p $1\nfi\n}\n\nBASE_DIR=$(pwd)\nDST_DIR=\"${BASE_DIR}/Vendor/ONLYOFFICE\"\nSRC_BASE_DIR=\"${BASE_DIR}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\n\n# Copy application resources\necho \"Copy application resources\"\nCreateDir \"${DST_DIR}/login\"\ncp -vR \"${SRC_BASE_DIR}/index.html\" \"${DST_DIR}/login/index.html\"\ncp -vR \"${SRC_BASE_DIR}/editors/webext/noconnect.html\" \"${DST_DIR}/login/noconnect.html\"\ncp -vR \"${SRC_BASE_DIR}/fonts\" \"${DST_DIR}/login/fonts\"\ncp -vR \"${BASE_DIR}/ONLYOFFICE/Resources/acknowledgments.html\" \"${DST_DIR}/login/acknowledgments.html\"\ncp -vR \"${SRC_BASE_DIR}/providers\" \"${DST_DIR}\"\n\n[ ! -d \"${DST_DIR}/license\" ] && mkdir -p \"${DST_DIR}/license\"\n\n# Copy editors and convertor\necho \"Copy editors and convertor\"\ncp -vR \"${SRC_BASE_DIR}/editors\" \"${DST_DIR}\"\nrsync -av \"${SRC_BASE_DIR}/converter\" \"${DST_DIR}\"\n";
+ shellScript = "#!/bin/sh\n\n#exit 0\n\nCreateDir() {\nif [ ! -d $1 ]; then\nmkdir -p $1\nelse\nrm -Rf $1\nmkdir -p $1\nfi\n}\n\nBASE_DIR=$(pwd)\nDST_DIR=\"${BASE_DIR}/Vendor/ONLYOFFICE\"\nSRC_BASE_DIR=\"${BASE_DIR}/../../build_tools/out/mac_64/onlyoffice/desktopeditors\"\n\n# Copy application resources\necho \"Copy application resources\"\nCreateDir \"${DST_DIR}/login\"\ncp -vR \"${SRC_BASE_DIR}/index.html\" \"${DST_DIR}/login/index.html\"\ncp -vR \"${SRC_BASE_DIR}/editors/webext/noconnect.html\" \"${DST_DIR}/login/noconnect.html\"\ncp -vR \"${SRC_BASE_DIR}/fonts\" \"${DST_DIR}/login/fonts\"\ncp -vR \"${BASE_DIR}/ONLYOFFICE/Resources/acknowledgments.html\" \"${DST_DIR}/login/acknowledgments.html\"\ncp -vR \"${SRC_BASE_DIR}/providers\" \"${DST_DIR}\"\n\n[ ! -d \"${DST_DIR}/license\" ] && mkdir -p \"${DST_DIR}/license\"\n\n# Copy editors and convertor\necho \"Copy editors and convertor\"\ncp -vR \"${SRC_BASE_DIR}/editors\" \"${DST_DIR}\"\nrsync -av \"${SRC_BASE_DIR}/converter\" \"${DST_DIR}\"\n\"${BASE_DIR}/scripts/brand-vendor-resources.sh\" \"${DST_DIR}\" \"${PRODUCT_NAME:-Euro-Office}\"\n";
showEnvVarsInLog = 0;
};
FCB4C6BB26DD018B0012C20D /* Copy Library */ = {
@@ -2312,7 +2312,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#!/bin/sh\n\n#exit 0\n\nCreateDir() {\nif [ ! -d $1 ]; then\nmkdir -p $1\nelse\nrm -Rf $1\nmkdir -p $1\nfi\n}\n\nBASE_DIR=$(pwd)\nDST_DIR=\"${BASE_DIR}/Vendor/ONLYOFFICE\"\nSRC_BASE_DIR=\"${BASE_DIR}/../../build_tools/out/mac_arm64/onlyoffice/desktopeditors\"\n\n# Copy application resources\necho \"Copy application resources\"\nCreateDir \"${DST_DIR}/login\"\ncp -vR \"${SRC_BASE_DIR}/index.html\" \"${DST_DIR}/login/index.html\"\ncp -vR \"${SRC_BASE_DIR}/editors/webext/noconnect.html\" \"${DST_DIR}/login/noconnect.html\"\ncp -vR \"${SRC_BASE_DIR}/fonts\" \"${DST_DIR}/login/fonts\"\ncp -vR \"${BASE_DIR}/ONLYOFFICE/Resources/acknowledgments.html\" \"${DST_DIR}/login/acknowledgments.html\"\ncp -vR \"${SRC_BASE_DIR}/providers\" \"${DST_DIR}\"\n\n[ ! -d \"${DST_DIR}/license\" ] && mkdir -p \"${DST_DIR}/license\"\n\n# Copy editors and convertor\necho \"Copy editors and convertor\"\ncd \"$BASE_DIR\"\ncp -vR \"${SRC_BASE_DIR}/editors\" \"${DST_DIR}\"\ncp -vR \"${SRC_BASE_DIR}/converter\" \"${DST_DIR}\"\n";
+ shellScript = "#!/bin/sh\n\n#exit 0\n\nCreateDir() {\nif [ ! -d $1 ]; then\nmkdir -p $1\nelse\nrm -Rf $1\nmkdir -p $1\nfi\n}\n\nBASE_DIR=$(pwd)\nDST_DIR=\"${BASE_DIR}/Vendor/ONLYOFFICE\"\nSRC_BASE_DIR=\"${BASE_DIR}/../../build_tools/out/mac_arm64/onlyoffice/desktopeditors\"\n\n# Copy application resources\necho \"Copy application resources\"\nCreateDir \"${DST_DIR}/login\"\ncp -vR \"${SRC_BASE_DIR}/index.html\" \"${DST_DIR}/login/index.html\"\ncp -vR \"${SRC_BASE_DIR}/editors/webext/noconnect.html\" \"${DST_DIR}/login/noconnect.html\"\ncp -vR \"${SRC_BASE_DIR}/fonts\" \"${DST_DIR}/login/fonts\"\ncp -vR \"${BASE_DIR}/ONLYOFFICE/Resources/acknowledgments.html\" \"${DST_DIR}/login/acknowledgments.html\"\ncp -vR \"${SRC_BASE_DIR}/providers\" \"${DST_DIR}\"\n\n[ ! -d \"${DST_DIR}/license\" ] && mkdir -p \"${DST_DIR}/license\"\n\n# Copy editors and convertor\necho \"Copy editors and convertor\"\ncd \"$BASE_DIR\"\ncp -vR \"${SRC_BASE_DIR}/editors\" \"${DST_DIR}\"\ncp -vR \"${SRC_BASE_DIR}/converter\" \"${DST_DIR}\"\n\"${BASE_DIR}/scripts/brand-vendor-resources.sh\" \"${DST_DIR}\" \"${PRODUCT_NAME:-Euro-Office}\"\n";
showEnvVarsInLog = 0;
};
FCB4C73226DD018B0012C20D /* Rename symbols */ = {
@@ -2331,7 +2331,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#!/bin/sh\n\n#exit 0\n\nbase_path=$(pwd)\ncontents_path=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\nframeworks_path=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nconverter_path=\"${contents_path}/Resources/converter\"\ncore_path=\"${base_path}/../../build_tools/out/mac_arm64/onlyoffice/desktopeditors\"\napp_name=\"ONLYOFFICE\"\n\n# Signs a framework with the provided identity\ncode_sign_if_enabled() {\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY:-}\" -a \"${CODE_SIGNING_REQUIRED:-}\" != \"NO\" -a \"${CODE_SIGNING_ALLOWED}\" != \"NO\" ]; then\n # Use the current code_sign_identity\n echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n local code_sign_cmd=\"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'\"\n\n echo \"$code_sign_cmd\"\n eval \"$code_sign_cmd\"\n fi\n}\n\n# Sign libs in directory\nsign_libs_in_directory() {\n for i in $1/*.framework; do\n [ -d \"$i\" ] || break\n code_sign_if_enabled \"$i/Versions/Current\"\n done\n}\n\n# Change path of dependency library\nchange_dependency_path() {\n echo \"Rename path for $1 from $2 to $3\"\n install_name_tool -change \"$2\" \"$3\" \"$1\"\n}\n\nrm -rf \"${frameworks_path}/Chromium Embedded Framework.framework\"\nrm -rf \"${frameworks_path}/editors_helper.app\"\nrm -rf \"${frameworks_path}/editors_helper (GPU).app\"\nrm -rf \"${frameworks_path}/editors_helper (Renderer).app\"\nrm -rf \"${frameworks_path}/ascdocumentscore.framework\"\n#rm -rf \"${frameworks_path}/ooxmlsignature.framework\"\nrm -rf \"${frameworks_path}/hunspell.framework\"\n\nif [ ! -d \"${frameworks_path}\" ]; then\nmkdir -p \"${frameworks_path}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}/editors_helper.app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (GPU).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (Renderer).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/Chromium Embedded Framework.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/ascdocumentscore.framework\" \"${frameworks_path}\"\n#cp -Rv \"${core_path}/ooxmlsignature.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/hunspell.framework\" \"${frameworks_path}\"\n\n# Fixed paths application\necho \"Fixed dependency paths of application\"\nchange_dependency_path \"${contents_path}/MacOS/${app_name}\" \"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework\" \"@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework\"\n\n# Resign the code if required by the build settings to avoid unstable apps\necho \"Sign libraries and frameworks with ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n\n#code_sign_if_enabled \"${frameworks_path}/ooxmlsignature.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/ascdocumentscore.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/hunspell.framework/Versions/Current\"\n\nsign_libs_in_directory ${converter_path}\n\ncodesign --verbose --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${converter_path}/x2t\"\n\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper.app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (GPU).app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (Renderer).app\"\n\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Autoupdate\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B\"\n\ncodesign --verbose=4 --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${contents_path}/MacOS/${app_name}\"\n";
+ shellScript = "#!/bin/sh\n\n#exit 0\n\nbase_path=$(pwd)\ncontents_path=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\nframeworks_path=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nconverter_path=\"${contents_path}/Resources/converter\"\ncore_path=\"${base_path}/../../build_tools/out/mac_arm64/onlyoffice/desktopeditors\"\napp_name=\"${EXECUTABLE_NAME}\"\n\n# Signs a framework with the provided identity\ncode_sign_if_enabled() {\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY:-}\" -a \"${CODE_SIGNING_REQUIRED:-}\" != \"NO\" -a \"${CODE_SIGNING_ALLOWED}\" != \"NO\" ]; then\n # Use the current code_sign_identity\n echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n local code_sign_cmd=\"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'\"\n\n echo \"$code_sign_cmd\"\n eval \"$code_sign_cmd\"\n fi\n}\n\n# Sign libs in directory\nsign_libs_in_directory() {\n for i in $1/*.framework; do\n [ -d \"$i\" ] || break\n code_sign_if_enabled \"$i/Versions/Current\"\n done\n}\n\n# Change path of dependency library\nchange_dependency_path() {\n echo \"Rename path for $1 from $2 to $3\"\n install_name_tool -change \"$2\" \"$3\" \"$1\"\n}\n\nrm -rf \"${frameworks_path}/Chromium Embedded Framework.framework\"\nrm -rf \"${frameworks_path}/editors_helper.app\"\nrm -rf \"${frameworks_path}/editors_helper (GPU).app\"\nrm -rf \"${frameworks_path}/editors_helper (Renderer).app\"\nrm -rf \"${frameworks_path}/ascdocumentscore.framework\"\n#rm -rf \"${frameworks_path}/ooxmlsignature.framework\"\nrm -rf \"${frameworks_path}/hunspell.framework\"\n\nif [ ! -d \"${frameworks_path}\" ]; then\nmkdir -p \"${frameworks_path}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}/editors_helper.app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (GPU).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/editors_helper (Renderer).app\" \"${frameworks_path}/\"\ncp -Rv \"${core_path}/Chromium Embedded Framework.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/ascdocumentscore.framework\" \"${frameworks_path}\"\n#cp -Rv \"${core_path}/ooxmlsignature.framework\" \"${frameworks_path}\"\ncp -Rv \"${core_path}/hunspell.framework\" \"${frameworks_path}\"\n\n# Fixed paths application\necho \"Fixed dependency paths of application\"\nchange_dependency_path \"${contents_path}/MacOS/${app_name}\" \"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework\" \"@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework\"\n\n# Resign the code if required by the build settings to avoid unstable apps\necho \"Sign libraries and frameworks with ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n\n#code_sign_if_enabled \"${frameworks_path}/ooxmlsignature.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/ascdocumentscore.framework/Versions/Current\"\ncode_sign_if_enabled \"${frameworks_path}/hunspell.framework/Versions/Current\"\n\nsign_libs_in_directory ${converter_path}\n\ncodesign --verbose --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${converter_path}/x2t\"\n\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Chromium Embedded Framework.framework\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper.app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (GPU).app\"\ncodesign --verbose=4 --force --deep --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" \"${frameworks_path}/editors_helper (Renderer).app\"\n\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/Autoupdate\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher\"\ncodesign --verbose --force --options runtime --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${frameworks_path}/Sparkle.framework/Versions/B\"\n\ncodesign --verbose=4 --force --options runtime --entitlements \"${CODE_SIGN_ENTITLEMENTS}\" --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \"${contents_path}/MacOS/${app_name}\"\n";
showEnvVarsInLog = 0;
};
FCB4C73326DD018B0012C20D /* Increment Build Number */ = {
@@ -3127,7 +3127,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 410;
- DEVELOPMENT_TEAM = 2WH24U26GJ;
+ DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = arm64;
FRAMEWORK_SEARCH_PATHS = (
@@ -3156,8 +3156,8 @@
"$(inherited)",
"-headerpad_max_install_names",
);
- PRODUCT_BUNDLE_IDENTIFIER = asc.onlyoffice.ONLYOFFICE;
- PRODUCT_NAME = ONLYOFFICE;
+ PRODUCT_BUNDLE_IDENTIFIER = org.euro-office.desktopeditors;
+ PRODUCT_NAME = "Euro-Office";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
};
@@ -3168,11 +3168,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "ONLYOFFICE/Resources/ONLYOFFICE-v8/ONLYOFFICE.entitlements";
- CODE_SIGN_IDENTITY = "Developer ID Application: Ascensio System SIA (2WH24U26GJ)";
+ CODE_SIGN_IDENTITY = "$(CODESIGNING_IDENTITY)";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 410;
- DEVELOPMENT_TEAM = 2WH24U26GJ;
+ DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = arm64;
FRAMEWORK_SEARCH_PATHS = (
@@ -3202,8 +3202,8 @@
"$(inherited)",
"-headerpad_max_install_names",
);
- PRODUCT_BUNDLE_IDENTIFIER = asc.onlyoffice.ONLYOFFICE;
- PRODUCT_NAME = ONLYOFFICE;
+ PRODUCT_BUNDLE_IDENTIFIER = org.euro-office.desktopeditors;
+ PRODUCT_NAME = "Euro-Office";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
};
@@ -3218,7 +3218,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 410;
- DEVELOPMENT_TEAM = 2WH24U26GJ;
+ DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = x86_64;
FRAMEWORK_SEARCH_PATHS = (
@@ -3248,8 +3248,8 @@
"$(inherited)",
"-headerpad_max_install_names",
);
- PRODUCT_BUNDLE_IDENTIFIER = asc.onlyoffice.ONLYOFFICE;
- PRODUCT_NAME = ONLYOFFICE;
+ PRODUCT_BUNDLE_IDENTIFIER = org.euro-office.desktopeditors;
+ PRODUCT_NAME = "Euro-Office";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
};
@@ -3260,11 +3260,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "ONLYOFFICE/Resources/ONLYOFFICE-arm/ONLYOFFICE.entitlements";
- CODE_SIGN_IDENTITY = "Developer ID Application: Ascensio System SIA (2WH24U26GJ)";
+ CODE_SIGN_IDENTITY = "$(CODESIGNING_IDENTITY)";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 410;
- DEVELOPMENT_TEAM = 2WH24U26GJ;
+ DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = x86_64;
FRAMEWORK_SEARCH_PATHS = (
@@ -3294,8 +3294,8 @@
"$(inherited)",
"-headerpad_max_install_names",
);
- PRODUCT_BUNDLE_IDENTIFIER = asc.onlyoffice.ONLYOFFICE;
- PRODUCT_NAME = ONLYOFFICE;
+ PRODUCT_BUNDLE_IDENTIFIER = org.euro-office.desktopeditors;
+ PRODUCT_NAME = "Euro-Office";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
};
@@ -3390,7 +3390,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 410;
- DEVELOPMENT_TEAM = 2WH24U26GJ;
+ DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = arm64;
FRAMEWORK_SEARCH_PATHS = (
@@ -3420,8 +3420,8 @@
"$(inherited)",
"-headerpad_max_install_names",
);
- PRODUCT_BUNDLE_IDENTIFIER = asc.onlyoffice.ONLYOFFICE;
- PRODUCT_NAME = ONLYOFFICE;
+ PRODUCT_BUNDLE_IDENTIFIER = org.euro-office.desktopeditors;
+ PRODUCT_NAME = "Euro-Office";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
};
@@ -3432,11 +3432,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "ONLYOFFICE/Resources/ONLYOFFICE-x86_64/ONLYOFFICE.entitlements";
- CODE_SIGN_IDENTITY = "Developer ID Application: Ascensio System SIA (2WH24U26GJ)";
+ CODE_SIGN_IDENTITY = "$(CODESIGNING_IDENTITY)";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 410;
- DEVELOPMENT_TEAM = 2WH24U26GJ;
+ DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = arm64;
FRAMEWORK_SEARCH_PATHS = (
@@ -3466,8 +3466,8 @@
"$(inherited)",
"-headerpad_max_install_names",
);
- PRODUCT_BUNDLE_IDENTIFIER = asc.onlyoffice.ONLYOFFICE;
- PRODUCT_NAME = ONLYOFFICE;
+ PRODUCT_BUNDLE_IDENTIFIER = org.euro-office.desktopeditors;
+ PRODUCT_NAME = "Euro-Office";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
};
diff --git a/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-arm.xcscheme b/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-arm.xcscheme
index 221b8a8d4..e3a4db327 100644
--- a/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-arm.xcscheme
+++ b/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-arm.xcscheme
@@ -15,7 +15,7 @@
@@ -45,7 +45,7 @@
@@ -62,7 +62,7 @@
diff --git a/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-v8.xcscheme b/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-v8.xcscheme
index b9b24513e..ee0e73355 100644
--- a/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-v8.xcscheme
+++ b/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-v8.xcscheme
@@ -15,7 +15,7 @@
@@ -45,7 +45,7 @@
@@ -62,7 +62,7 @@
diff --git a/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-x86_64.xcscheme b/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-x86_64.xcscheme
index fee259b21..065f8c2e6 100644
--- a/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-x86_64.xcscheme
+++ b/macos/ONLYOFFICE.xcodeproj/xcshareddata/xcschemes/ONLYOFFICE-x86_64.xcscheme
@@ -15,7 +15,7 @@
@@ -45,7 +45,7 @@
@@ -62,7 +62,7 @@
diff --git a/macos/ONLYOFFICE/AppDelegate.h b/macos/ONLYOFFICE/AppDelegate.h
index 7970d87ca..f718f2050 100644
--- a/macos/ONLYOFFICE/AppDelegate.h
+++ b/macos/ONLYOFFICE/AppDelegate.h
@@ -47,5 +47,5 @@
@property (nonatomic) NSUInteger spreadsheetNameCounter;
@property (nonatomic) NSUInteger presentationNameCounter;
@property (nonatomic) NSUInteger pdfNameCounter;
+@property (nonatomic) NSUInteger drawNameCounter;
@end
-
diff --git a/macos/ONLYOFFICE/AppDelegate.mm b/macos/ONLYOFFICE/AppDelegate.mm
index db9ee903d..53a0e3a2a 100644
--- a/macos/ONLYOFFICE/AppDelegate.mm
+++ b/macos/ONLYOFFICE/AppDelegate.mm
@@ -497,6 +497,11 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item {
[self.updateMenuItem setHidden:YES];
[self.eulaMenuItem setHidden:YES];
#endif
+ if ([item action] == @selector(checkForUpdates:)) {
+ NSString *feedURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURL"];
+ [self.updateMenuItem setHidden:(feedURL.length == 0)];
+ return feedURL.length > 0;
+ }
NSWindow *keyWindow = [NSApp keyWindow];
ASCTabView * tab = [[ASCSharedSettings sharedInstance] settingByKey:kSettingsCurrentTab];
BOOL hasKeyWindow = (keyWindow != nil && ([keyWindow isKindOfClass:[ASCTitleWindow class]] || [keyWindow isKindOfClass:[ASCEditorWindow class]]));
@@ -1003,6 +1008,7 @@ - (void)onCEFCreateTab:(NSNotification *)notification {
if ([param isEqualToString:@"cell"]) docType = AscEditorType::etSpreadsheet;
else if ([param isEqualToString:@"slide"]) docType = AscEditorType::etPresentation;
else if ([param isEqualToString:@"form"]) docType = AscEditorType::etDocumentMasterForm;
+ else if ([param isEqualToString:@"draw"]) docType = AscEditorType::etDraw;
// else /*if ([param isEqualToString:@"word"])*/ docType = AscEditorType::etDocument;
} else docType = (AscEditorType)[params[@"type"] intValue];
@@ -1022,6 +1028,9 @@ - (void)onCEFCreateTab:(NSNotification *)notification {
case AscEditorType::etDocumentMasterForm:
docName = [NSString stringWithFormat:NSLocalizedString(@"Document %ld.pdf", nil), ++self.pdfNameCounter];
break;
+ case AscEditorType::etDraw:
+ docName = [NSString stringWithFormat:NSLocalizedString(@"Drawing %ld.vsdx", nil), ++self.drawNameCounter];
+ break;
default: break;
}
diff --git a/macos/ONLYOFFICE/Base.lproj/Main.storyboard b/macos/ONLYOFFICE/Base.lproj/Main.storyboard
index 97eb7c5d1..58cf5ae6a 100644
--- a/macos/ONLYOFFICE/Base.lproj/Main.storyboard
+++ b/macos/ONLYOFFICE/Base.lproj/Main.storyboard
@@ -12,11 +12,11 @@