Skip to content

S
sdkjs
Commit cae13ee5 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

add buil local to config with param --desktop=true (or --desktop=1, т.к. не... 

add buil local to config with param --desktop=true (or --desktop=1, т.к. не могу использовать несколько значений без параметров - incorrect parsing of multiple options with no value)
parent ffee2c76
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 582 deletions
build/deploy/Gruntfile.js
View file @ cae13ee5
...@@ -145,6 +145,7 @@ module.exports = function(grunt) { ...@@ -145,6 +145,7 @@ module.exports = function(grunt) {
packageFile['compile']['sdk']['dst'], packageFile['compile']['sdk']['dst'],
packageFile['compile']['defines']['dst'], packageFile['compile']['defines']['dst'],
map_record_file_path ]; map_record_file_path ];
var srcFiles = packageFile['compile']['sdk']['common'];
var sdkOpt = { var sdkOpt = {
compilation_level: compilation_level, compilation_level: compilation_level,
warning_level: 'QUIET', warning_level: 'QUIET',
...@@ -157,6 +158,7 @@ module.exports = function(grunt) { ...@@ -157,6 +158,7 @@ module.exports = function(grunt) {
warning_level: 'QUIET' warning_level: 'QUIET'
}; };
if (formatting) { if (formatting) {
console.log('formatting');
definesOpt['formatting'] = sdkOpt['formatting'] = formatting; definesOpt['formatting'] = sdkOpt['formatting'] = formatting;
} }
if (!nomap) { if (!nomap) {
...@@ -164,15 +166,20 @@ module.exports = function(grunt) { ...@@ -164,15 +166,20 @@ module.exports = function(grunt) {
sdkOpt['property_renaming_report'] = packageFile['compile']['sdk']['log'] + '/property.map'; sdkOpt['property_renaming_report'] = packageFile['compile']['sdk']['log'] + '/property.map';
} }
if (grunt.option('desktop')) {
console.log('desktop');
srcFiles.concat(packageFile['compile']['sdk']['desktop']);
}
var cc = require('google-closure-compiler').compiler; var cc = require('google-closure-compiler').compiler;
cc.prototype.spawnOptions = {env: {'JAVA_OPTS': '-Xms2048m'}}; cc.prototype.spawnOptions = {env: {'JAVA_OPTS': '-Xms2048m'}};
grunt.initConfig({ grunt.initConfig({
pkg: grunt.file.readJSON(defaultConfig), pkg: packageFile,
'closure-compiler': { 'closure-compiler': {
sdk: { sdk: {
files: { files: {
'<%= pkg.compile.sdk.dst %>': packageFile['compile']['sdk']['src'] '<%= pkg.compile.sdk.dst %>': srcFiles
}, },
options: sdkOpt options: sdkOpt
}, },
......
build/deploy/sdk_configs/webexcel.json
View file @ cae13ee5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
}, },
"compile": { "compile": {
"sdk": { "sdk": {
"src": [ "common": [
"../../common/Build/License.js", "../../common/Build/License.js",
"../../common/browser.js", "../../common/browser.js",
"../../common/docscoapicommon.js", "../../common/docscoapicommon.js",
...@@ -164,6 +164,10 @@ ...@@ -164,6 +164,10 @@
"../../common/Private/license.js", "../../common/Private/license.js",
"../../cell/Private/comments.js" "../../cell/Private/comments.js"
], ],
"desktop": [
"../../common/Local/common.js",
"../../cell/Local/api.js"
],
"dst": "../../cell/sdk-all.js", "dst": "../../cell/sdk-all.js",
"externs": [ "externs": [
"../../common/Build/Externs.js", "../../common/Build/Externs.js",
......
build/deploy/sdk_configs/webpowerpoint.json
View file @ cae13ee5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
}, },
"compile": { "compile": {
"sdk": { "sdk": {
"src": [ "common": [
"../../common/Build/License.js", "../../common/Build/License.js",
"../../common/browser.js", "../../common/browser.js",
"../../common/FontsFreeType/font_engine.js", "../../common/FontsFreeType/font_engine.js",
...@@ -147,6 +147,10 @@ ...@@ -147,6 +147,10 @@
"../../common/AdvancedOptions.js", "../../common/AdvancedOptions.js",
"../../common/Private/Locks.js" "../../common/Private/Locks.js"
], ],
"desktop": [
"../../common/Local/common.js",
"../../slide/Local/api.js"
],
"dst": "../../slide/sdk-all.js", "dst": "../../slide/sdk-all.js",
"externs": [ "externs": [
"../../common/Build/Externs.js", "../../common/Build/Externs.js",
......
build/deploy/sdk_configs/webword.json
View file @ cae13ee5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
}, },
"compile": { "compile": {
"sdk": { "sdk": {
"src": [ "common": [
"../../common/Build/License.js", "../../common/Build/License.js",
"../../common/browser.js", "../../common/browser.js",
"../../common/docscoapicommon.js", "../../common/docscoapicommon.js",
...@@ -152,6 +152,10 @@ ...@@ -152,6 +152,10 @@
"../../common/AdvancedOptions.js", "../../common/AdvancedOptions.js",
"../../common/Private/Locks.js" "../../common/Private/Locks.js"
], ],
"desktop": [
"../../common/Local/common.js",
"../../word/Local/api.js"
],
"dst": "../../word/sdk-all.js", "dst": "../../word/sdk-all.js",
"externs": [ "externs": [
"../../common/Build/Externs.js", "../../common/Build/Externs.js",
......
build/local/webexcel.json deleted 100644 → 0
View file @ ffee2c76
This diff is collapsed.
build/local/webpowerpoint.json deleted 100644 → 0
View file @ ffee2c76
{
"info": {
"version": "3.7.0",
"build": 158
},
"update_src": {
"revision": "HEAD",
"src": "../../common ../../word ../../slide"
},
"compile": {
"sdk": {
"src": [
"../../common/Build/License.js",
"../../common/browser.js",
"../../common/FontsFreeType/font_engine.js",
"../../common/FontsFreeType/FontFile.js",
"../../common/FontsFreeType/FontManager.js",
"../../common/FontsFreeType/font_map.js",
"../../word/Drawing/Externals.js",
"../../common/GlobalLoaders.js",
"../../common/commonDefines.js",
"../../common/apiCommon.js",
"../../common/downloaderfiles.js",
"../../common/docscoapicommon.js",
"../../common/docscoapi.js",
"../../common/wordcopypaste.js",
"../../common/editorscommon.js",
"../../slide/Drawing/ThemeLoader.js",
"../../common/Charts/DrawingObjects.js",
"../../common/SerializeCommonWordExcel.js",
"../../common/SerializeChart.js",
"../../common/Charts/charts.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/Charts/3DTransformation.js",
"../../common/Charts/DrawingArea.js",
"../../common/NumFormat.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/Styles.js",
"../../word/Editor/Numbering.js",
"../../word/Drawing/Metafile.js",
"../../common/CollaborativeEditingBase.js",
"../../slide/Editor/CollaborativeEditing.js",
"../../word/Drawing/GraphicsEvents.js",
"../../word/Drawing/WorkEvents.js",
"../../common/Controls.js",
"../../word/Drawing/Rulers.js",
"../../word/Editor/Table.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Common.js",
"../../word/Editor/Sections.js",
"../../common/scroll.js",
"../../word/Editor/History.js",
"../../common/Drawings/Hit.js",
"../../common/Drawings/States.js",
"../../common/Drawings/DrawingObjectsHandlers.js",
"../../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../common/Drawings/TrackObjects/ResizeTracks.js",
"../../common/Drawings/TrackObjects/RotateTracks.js",
"../../common/Drawings/TrackObjects/NewShapeTracks.js",
"../../common/Drawings/TrackObjects/PolyLine.js",
"../../common/Drawings/TrackObjects/Spline.js",
"../../common/Drawings/TrackObjects/MoveTracks.js",
"../../word/Drawing/HatchPattern.js",
"../../word/Drawing/Graphics.js",
"../../word/Drawing/Overlay.js",
"../../word/Drawing/ShapeDrawer.js",
"../../slide/Drawing/Transitions.js",
"../../slide/Drawing/DrawingDocument.js",
"../../slide/Drawing/HtmlPage.js",
"../../slide/apiDefines.js",
"../../common/Drawings/Format/Constants.js",
"../../common/Shapes/Serialize.js",
"../../common/Shapes/SerializeWriter.js",
"../../word/Editor/SerializeCommon.js",
"../../common/Drawings/Math.js",
"../../common/Drawings/ArcTo.js",
"../../word/Drawing/ColorArray.js",
"../../slide/Editor/Format/Presentation.js",
"../../common/Drawings/CommonController.js",
"../../cell/view/DrawingObjectsController.js",
"../../slide/Editor/DrawingObjectsController.js",
"../../common/Drawings/Format/Format.js",
"../../common/Drawings/Format/CreateGeometry.js",
"../../common/Drawings/Format/Geometry.js",
"../../common/Drawings/Format/Path.js",
"../../common/Drawings/Format/Shape.js",
"../../common/Drawings/Format/Image.js",
"../../common/Drawings/Format/GroupShape.js",
"../../common/Drawings/Format/ChartSpace.js",
"../../common/Drawings/Format/ChartFormat.js",
"../../common/Drawings/Format/TextBody.js",
"../../common/Drawings/TextDrawer.js",
"../../slide/Editor/Format/Slide.js",
"../../slide/Editor/Format/SlideMaster.js",
"../../slide/Editor/Format/Layout.js",
"../../slide/Editor/Format/Comments.js",
"../../word/Editor/Styles.js",
"../../word/Editor/Numbering.js",
"../../word/Editor/ParagraphContent.js",
"../../word/Editor/ParagraphContentBase.js",
"../../word/Editor/Hyperlink.js",
"../../word/Editor/Field.js",
"../../word/Editor/Run.js",
"../../word/Math/mathTypes.js",
"../../word/Math/mathText.js",
"../../word/Math/mathContent.js",
"../../word/Math/base.js",
"../../word/Math/fraction.js",
"../../word/Math/degree.js",
"../../word/Math/matrix.js",
"../../word/Math/limit.js",
"../../word/Math/nary.js",
"../../word/Math/radical.js",
"../../word/Math/operators.js",
"../../word/Math/accent.js",
"../../word/Math/borderBox.js",
"../../word/Editor/FlowObjects.js",
"../../word/Editor/Paragraph.js",
"../../word/Editor/Paragraph_Recalculate.js",
"../../word/Editor/Document.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/HeaderFooter.js",
"../../word/Editor/Math.js",
"../../word/Editor/Spelling.js",
"../../word/Editor/Search.js",
"../../word/Editor/FontClassification.js",
"../../slide/Editor/Format/ShapePrototype.js",
"../../slide/Editor/Format/ImagePrototype.js",
"../../slide/Editor/Format/GroupPrototype.js",
"../../slide/Editor/Format/ChartSpacePrototype.js",
"../../slide/Editor/Format/GraphicFrame.js",
"../../common/apiBase.js",
"../../slide/api.js",
"../../common/Private/license.js",
"../../slide/Private/comments.js",
"../../slide/apiCommon.js",
"../../word/apiCommon.js",
"../../slide/apiExport.js",
"../../cell/utils/utils.js",
"../../cell/model/Serialize.js",
"../../cell/model/WorkbookElems.js",
"../../cell/model/Workbook.js",
"../../cell/model/CellInfo.js",
"../../common/AdvancedOptions.js",
"../../common/Private/Locks.js",
"../../common/Local/common.js",
"../../slide/Local/api.js"
],
"dst": "../../slide/sdk-all.js",
"externs": [
"../../common/Build/Externs.js",
"../../../web-apps/vendor/jquery/jquery.min.js",
"../../../web-apps/vendor/underscore/underscore-min.js",
"../../../web-apps/vendor/sockjs/sockjs.min.js",
"../../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../../web-apps/vendor/jszip/jszip.min.js",
"../../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../slide/Build/Log"
},
"defines": {
"src": [
"../../common/Shapes/EditorSettings.js",
"../../slide/themes/Themes.js",
"../../slide/apiDefines.js",
"../../common/commonDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/PowerPoint"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk"
]
}
}
\ No newline at end of file
build/local/webword.json deleted 100644 → 0
View file @ ffee2c76
{
"info": {
"version": "3.7.0",
"build": 168
},
"update_src": {
"revision": "HEAD",
"src": "../../common ../../word"
},
"compile": {
"sdk": {
"src": [
"../../common/Build/License.js",
"../../common/browser.js",
"../../common/docscoapicommon.js",
"../../common/docscoapi.js",
"../../common/apiCommon.js",
"../../common/spellcheckapi.js",
"../../common/wordcopypaste.js",
"../../common/spellCheckLanguage.js",
"../../common/spellCheckLanguagesAll.js",
"../../common/downloaderfiles.js",
"../../common/commonDefines.js",
"../../common/editorscommon.js",
"../../common/Shapes/Serialize.js",
"../../common/Shapes/SerializeWriter.js",
"../../common/SerializeCommonWordExcel.js",
"../../common/SerializeChart.js",
"../../common/Drawings/Format/Constants.js",
"../../common/Drawings/Format/Format.js",
"../../common/FontsFreeType/font_engine.js",
"../../common/FontsFreeType/FontFile.js",
"../../common/FontsFreeType/FontManager.js",
"../../common/FontsFreeType/font_map.js",
"../../word/Drawing/Externals.js",
"../../common/GlobalLoaders.js",
"../../word/Drawing/translations.js",
"../../common/Charts/charts.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/Charts/3DTransformation.js",
"../../common/Charts/DrawingArea.js",
"../../common/Charts/DrawingObjects.js",
"../../common/NumFormat.js",
"../../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../common/Drawings/TrackObjects/MoveTracks.js",
"../../common/Drawings/TrackObjects/NewShapeTracks.js",
"../../common/Drawings/TrackObjects/PolyLine.js",
"../../common/Drawings/TrackObjects/ResizeTracks.js",
"../../common/Drawings/TrackObjects/RotateTracks.js",
"../../common/Drawings/TrackObjects/Spline.js",
"../../common/Drawings/ArcTo.js",
"../../common/Drawings/ColorArray.js",
"../../common/Drawings/CommonController.js",
"../../common/Drawings/DrawingObjectsHandlers.js",
"../../common/Drawings/Hit.js",
"../../common/Drawings/Joined.js",
"../../common/Drawings/Math.js",
"../../common/Drawings/Format/Shape.js",
"../../common/Drawings/Format/Image.js",
"../../common/Drawings/Format/GroupShape.js",
"../../common/Drawings/Format/ChartSpace.js",
"../../common/Drawings/Format/ChartFormat.js",
"../../common/Drawings/Format/CreateGeometry.js",
"../../common/Drawings/Format/Geometry.js",
"../../common/Drawings/Format/Path.js",
"../../common/Drawings/Format/TextBody.js",
"../../common/Drawings/TextDrawer.js",
"../../word/Editor/GraphicObjects/Format/ShapePrototype.js",
"../../word/Editor/GraphicObjects/Format/ImagePrototype.js",
"../../word/Editor/GraphicObjects/Format/GroupPrototype.js",
"../../word/Editor/GraphicObjects/Format/ChartSpacePrototype.js",
"../../slide/Editor/Format/GraphicFrame.js",
"../../word/Editor/GraphicObjects/DrawingStates.js",
"../../word/Editor/GraphicObjects/GraphicObjects.js",
"../../word/Editor/GraphicObjects/GraphicPage.js",
"../../word/Editor/GraphicObjects/WrapManager.js",
"../../word/Editor/CollaborativeEditing.js",
"../../word/Editor/Comments.js",
"../../word/Editor/History.js",
"../../word/Editor/Styles.js",
"../../word/Editor/FlowObjects.js",
"../../word/Editor/ParagraphContent.js",
"../../word/Editor/ParagraphContentBase.js",
"../../word/Editor/Hyperlink.js",
"../../word/Editor/Field.js",
"../../word/Editor/Run.js",
"../../word/Editor/Math.js",
"../../word/Editor/Paragraph.js",
"../../word/Editor/Paragraph_Recalculate.js",
"../../word/Editor/Sections.js",
"../../word/Editor/Numbering.js",
"../../word/Editor/HeaderFooter.js",
"../../word/Editor/Document.js",
"../../word/Editor/Common.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/Table.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/Search.js",
"../../word/Editor/FontClassification.js",
"../../word/Editor/Spelling.js",
"../../word/Drawing/Graphics.js",
"../../word/Drawing/Overlay.js",
"../../word/Drawing/HatchPattern.js",
"../../word/Drawing/ShapeDrawer.js",
"../../word/Drawing/Metafile.js",
"../../common/CollaborativeEditingBase.js",
"../../word/Drawing/DrawingDocument.js",
"../../word/Drawing/GraphicsEvents.js",
"../../common/Scrolls/iscroll.js",
"../../word/Drawing/WorkEvents.js",
"../../common/Controls.js",
"../../word/Drawing/Rulers.js",
"../../word/Drawing/HtmlPage.js",
"../../word/Drawing/documentrenderer.js",
"../../common/scroll.js",
"../../word/Editor/SerializeCommon.js",
"../../word/apiDefines.js",
"../../common/apiBase.js",
"../../word/api.js",
"../../common/Private/license.js",
"../../common/Private/versionHistory.js",
"../../word/Private/comments.js",
"../../word/Private/StyleManager.js",
"../../word/Private/MailMerge.js",
"../../word/Private/TrackRevisions.js",
"../../word/apiCommon.js",
"../../word/apiExport.js",
"../../word/document/empty.js",
"../../word/Math/mathTypes.js",
"../../word/Math/mathText.js",
"../../word/Math/mathContent.js",
"../../word/Math/base.js",
"../../word/Math/fraction.js",
"../../word/Math/degree.js",
"../../word/Math/matrix.js",
"../../word/Math/limit.js",
"../../word/Math/nary.js",
"../../word/Math/radical.js",
"../../word/Math/operators.js",
"../../word/Math/accent.js",
"../../word/Math/borderBox.js",
"../../cell/utils/utils.js",
"../../cell/model/CellComment.js",
"../../cell/model/Serialize.js",
"../../cell/model/WorkbookElems.js",
"../../cell/model/Workbook.js",
"../../cell/model/CellInfo.js",
"../../common/AdvancedOptions.js",
"../../common/Private/Locks.js",
"../../common/Local/common.js",
"../../word/Local/api.js"
],
"dst": "../../word/sdk-all.js",
"externs": [
"../../common/Build/Externs.js",
"../../../web-apps/vendor/jquery/jquery.min.js",
"../../../web-apps/vendor/underscore/underscore-min.js",
"../../../web-apps/vendor/sockjs/sockjs.min.js",
"../../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../../web-apps/vendor/jszip/jszip.min.js",
"../../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../word/Build/Log"
},
"defines": {
"src": [
"../../common/Shapes/EditorSettings.js",
"../../common/commonDefines.js",
"../../word/apiDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/Word"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk"
]
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7