Commit cdc6adc1 authored by Alexey.Golubev's avatar Alexey.Golubev Committed by Alexander.Trofimov

Синхронизация билдов.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64304 954022d7-b5bf-4e40-9824-e11837661b57
parent b62c4ef2
{ {
"info": { "info": {
"version": "3.5.0", "version": "3.5.0",
"build": 147 "build": 148
}, },
"update_src": { "update_src": {
"revision": "HEAD", "revision": "HEAD",
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
"../../Word/apiCommon.js", "../../Word/apiCommon.js",
"../../Excel/Build/Log/apiCommonExport.js", "../../Excel/Build/Log/apiCommonExport.js",
"../../Excel/api.js", "../../Excel/api.js",
"../../Excel/Private/api.js" "../../Excel/Private/api.js"
], ],
"dst": "../../Excel/sdk-all.js", "dst": "../../Excel/sdk-all.js",
"externs": [ "externs": [
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
"cwd": "../../Excel/", "cwd": "../../Excel/",
"src": [ "src": [
"api.js", "api.js",
"Private/api.js", "Private/api.js",
"apiDefines.js", "apiDefines.js",
"view/EventsController.js", "view/EventsController.js",
"view/HandlerList.js", "view/HandlerList.js",
......
{ {
"info": { "info": {
"version": "3.5.0", "version": "3.5.0",
"build": 157 "build": 158
}, },
"update_src": { "update_src": {
"revision": "HEAD", "revision": "HEAD",
"src": "../../Common ../../Word ../../PowerPoint" "src": "../../Common ../../Word ../../PowerPoint"
}, },
"concat_api": { "concat_api": {
"../../PowerPoint/api-all.js": [ "../../PowerPoint/api-all.js": [
"../../PowerPoint/api.js", "../../PowerPoint/api.js",
"../../PowerPoint/Private/api.js", "../../PowerPoint/Private/api.js",
"../../PowerPoint/apiCommon.js", "../../PowerPoint/apiCommon.js",
"../../Word/apiCommon.js" "../../Word/apiCommon.js"
] ]
}, },
"extract_api": { "extract_api": {
"src": "../../PowerPoint/api-all.js", "src": "../../PowerPoint/api-all.js",
"dst": "../../PowerPoint/Build/Log/apiExport.js" "dst": "../../PowerPoint/Build/Log/apiExport.js"
}, },
"compile": { "compile": {
"sdk": { "sdk": {
"src": [ "src": [
"../../Common/Build/License.js", "../../Common/Build/License.js",
"../../Common/browser.js", "../../Common/browser.js",
"../../Common/FontsFreeType/font_engine.js", "../../Common/FontsFreeType/font_engine.js",
"../../Common/FontsFreeType/FontFile.js", "../../Common/FontsFreeType/FontFile.js",
"../../Common/FontsFreeType/FontManager.js", "../../Common/FontsFreeType/FontManager.js",
"../../Common/FontsFreeType/font_map.js", "../../Common/FontsFreeType/font_map.js",
"../../Word/Drawing/Externals.js", "../../Word/Drawing/Externals.js",
"../../Word/Drawing/GlobalLoaders.js", "../../Word/Drawing/GlobalLoaders.js",
"../../Common/commonDefines.js", "../../Common/commonDefines.js",
"../../Common/apiCommon.js", "../../Common/apiCommon.js",
"../../Common/downloaderfiles.js", "../../Common/downloaderfiles.js",
"../../Common/docscoapicommon.js", "../../Common/docscoapicommon.js",
"../../Common/docscoapi.js", "../../Common/docscoapi.js",
"../../Common/wordcopypaste.js", "../../Common/wordcopypaste.js",
"../../Common/editorscommon.js", "../../Common/editorscommon.js",
"../../PowerPoint/Drawing/ThemeLoader.js", "../../PowerPoint/Drawing/ThemeLoader.js",
"../../Common/Charts/DrawingObjects.js", "../../Common/Charts/DrawingObjects.js",
"../../Common/SerializeCommonWordExcel.js", "../../Common/SerializeCommonWordExcel.js",
"../../Common/SerializeChart.js", "../../Common/SerializeChart.js",
"../../Common/Charts/charts.js", "../../Common/Charts/charts.js",
"../../Common/Charts/ChartsDrawer.js", "../../Common/Charts/ChartsDrawer.js",
"../../Common/Charts/DrawingArea.js", "../../Common/Charts/DrawingArea.js",
"../../Common/NumFormat.js", "../../Common/NumFormat.js",
"../../Word/Editor/Serialize2.js", "../../Word/Editor/Serialize2.js",
"../../Common/trackFile.js", "../../Common/trackFile.js",
"../../Word/Editor/Styles.js",
"../../Word/Editor/Styles.js", "../../Word/Editor/Numbering.js",
"../../Word/Editor/Numbering.js", "../../Word/Drawing/Metafile.js",
"../../Word/Drawing/Metafile.js", "../../PowerPoint/Editor/CollaborativeEditing.js",
"../../PowerPoint/Editor/CollaborativeEditing.js", "../../Word/Drawing/GraphicsEvents.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/GraphicsEvents.js", "../../Common/Controls.js",
"../../Word/Drawing/WorkEvents.js", "../../Word/Drawing/Rulers.js",
"../../Common/Controls.js", "../../Word/Editor/Table.js",
"../../Word/Drawing/Rulers.js", "../../Word/Editor/Common.js",
"../../Word/Editor/Table.js", "../../Word/Editor/Sections.js",
"../../Word/Editor/Common.js", "../../Common/scroll.js",
"../../Word/Editor/Sections.js", "../../Word/Editor/History.js",
"../../Common/scroll.js", "../../Common/Drawings/Hit.js",
"../../Common/Drawings/States.js",
"../../Word/Editor/History.js", "../../Common/Drawings/DrawingObjectsHandlers.js",
"../../Common/Drawings/Hit.js", "../../Common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../Common/Drawings/States.js", "../../Common/Drawings/TrackObjects/ResizeTracks.js",
"../../Common/Drawings/DrawingObjectsHandlers.js", "../../Common/Drawings/TrackObjects/RotateTracks.js",
"../../Common/Drawings/TrackObjects/AdjustmentTracks.js", "../../Common/Drawings/TrackObjects/NewShapeTracks.js",
"../../Common/Drawings/TrackObjects/ResizeTracks.js", "../../Common/Drawings/TrackObjects/PolyLine.js",
"../../Common/Drawings/TrackObjects/RotateTracks.js", "../../Common/Drawings/TrackObjects/Spline.js",
"../../Common/Drawings/TrackObjects/NewShapeTracks.js", "../../Common/Drawings/TrackObjects/MoveTracks.js",
"../../Common/Drawings/TrackObjects/PolyLine.js", "../../Word/Drawing/HatchPattern.js",
"../../Common/Drawings/TrackObjects/Spline.js", "../../Word/Drawing/Graphics.js",
"../../Common/Drawings/TrackObjects/MoveTracks.js", "../../Word/Drawing/Overlay.js",
"../../Word/Drawing/ShapeDrawer.js",
"../../Word/Drawing/HatchPattern.js", "../../PowerPoint/Drawing/Transitions.js",
"../../Word/Drawing/Graphics.js", "../../PowerPoint/Drawing/DrawingDocument.js",
"../../Word/Drawing/Overlay.js", "../../PowerPoint/Drawing/HtmlPage.js",
"../../Word/Drawing/ShapeDrawer.js", "../../PowerPoint/apiDefines.js",
"../../PowerPoint/Drawing/Transitions.js", "../../Common/Drawings/Format/Constants.js",
"../../PowerPoint/Drawing/DrawingDocument.js", "../../Common/Shapes/Serialize.js",
"../../PowerPoint/Drawing/HtmlPage.js", "../../Common/Shapes/SerializeWriter.js",
"../../PowerPoint/apiDefines.js", "../../Word/Editor/SerializeCommon.js",
"../../Common/Drawings/Math.js",
"../../Common/Drawings/Format/Constants.js", "../../Common/Drawings/ArcTo.js",
"../../Word/Drawing/ColorArray.js",
"../../Common/Shapes/Serialize.js", "../../PowerPoint/Editor/Format/Presentation.js",
"../../Common/Shapes/SerializeWriter.js", "../../Common/Drawings/CommonController.js",
"../../Word/Editor/SerializeCommon.js", "../../Excel/view/DrawingObjectsController.js",
"../../PowerPoint/Editor/DrawingObjectsController.js",
"../../Common/Drawings/Math.js", "../../Common/Drawings/Format/Format.js",
"../../Common/Drawings/ArcTo.js", "../../Common/Drawings/Format/CreateGeometry.js",
"../../Word/Drawing/ColorArray.js", "../../Common/Drawings/Format/Geometry.js",
"../../Common/Drawings/Format/Path.js",
"../../PowerPoint/Editor/Format/Presentation.js", "../../Common/Drawings/Format/Shape.js",
"../../Common/Drawings/CommonController.js", "../../Common/Drawings/Format/Image.js",
"../../Excel/view/DrawingObjectsController.js", "../../Common/Drawings/Format/GroupShape.js",
"../../PowerPoint/Editor/DrawingObjectsController.js", "../../Common/Drawings/Format/ChartSpace.js",
"../../Common/Drawings/Format/ChartFormat.js",
"../../Common/Drawings/Format/Format.js", "../../Common/Drawings/Format/TextBody.js",
"../../Common/Drawings/Format/CreateGeometry.js", "../../Common/Drawings/TextDrawer.js",
"../../Common/Drawings/Format/Geometry.js", "../../PowerPoint/Editor/Format/Slide.js",
"../../Common/Drawings/Format/Path.js", "../../PowerPoint/Editor/Format/SlideMaster.js",
"../../Common/Drawings/Format/Shape.js", "../../PowerPoint/Editor/Format/Layout.js",
"../../Common/Drawings/Format/Image.js", "../../PowerPoint/Editor/Format/Comments.js",
"../../Common/Drawings/Format/GroupShape.js", "../../Word/Editor/Styles.js",
"../../Common/Drawings/Format/ChartSpace.js", "../../Word/Editor/Numbering.js",
"../../Common/Drawings/Format/ChartFormat.js", "../../Word/Editor/ParagraphContent.js",
"../../Common/Drawings/Format/TextBody.js", "../../Word/Editor/ParagraphContentBase.js",
"../../Common/Drawings/TextDrawer.js", "../../Word/Editor/Hyperlink.js",
"../../PowerPoint/Editor/Format/Slide.js", "../../Word/Editor/Field.js",
"../../PowerPoint/Editor/Format/SlideMaster.js", "../../Word/Editor/Run.js",
"../../PowerPoint/Editor/Format/Layout.js", "../../Word/Math/mathTypes.js",
"../../PowerPoint/Editor/Format/Comments.js", "../../Word/Math/mathText.js",
"../../Word/Math/mathContent.js",
"../../Word/Editor/Styles.js", "../../Word/Math/base.js",
"../../Word/Editor/Numbering.js", "../../Word/Math/fraction.js",
"../../Word/Editor/ParagraphContent.js", "../../Word/Math/degree.js",
"../../Word/Editor/ParagraphContentBase.js", "../../Word/Math/matrix.js",
"../../Word/Editor/Hyperlink.js", "../../Word/Math/limit.js",
"../../Word/Editor/Field.js", "../../Word/Math/nary.js",
"../../Word/Editor/Run.js", "../../Word/Math/radical.js",
"../../Word/Math/operators.js",
"../../Word/Math/mathTypes.js", "../../Word/Math/accent.js",
"../../Word/Math/mathText.js", "../../Word/Math/borderBox.js",
"../../Word/Math/mathContent.js", "../../Word/Editor/FlowObjects.js",
"../../Word/Math/base.js", "../../Word/Editor/Paragraph.js",
"../../Word/Math/fraction.js", "../../Word/Editor/Paragraph_Recalculate.js",
"../../Word/Math/degree.js", "../../Word/Editor/Document.js",
"../../Word/Math/matrix.js", "../../Word/Editor/DocumentContent.js",
"../../Word/Math/limit.js", "../../Word/Editor/HeaderFooter.js",
"../../Word/Math/nary.js", "../../Word/Editor/Table.js",
"../../Word/Math/radical.js", "../../Word/Editor/Math.js",
"../../Word/Math/operators.js", "../../Word/Editor/Spelling.js",
"../../Word/Math/accent.js", "../../Word/Editor/Search.js",
"../../Word/Math/borderBox.js", "../../Word/Editor/FontClassification.js",
"../../PowerPoint/Editor/Format/ShapePrototype.js",
"../../Word/Editor/FlowObjects.js", "../../PowerPoint/Editor/Format/ImagePrototype.js",
"../../Word/Editor/Paragraph.js", "../../PowerPoint/Editor/Format/GroupPrototype.js",
"../../Word/Editor/Paragraph_Recalculate.js", "../../PowerPoint/Editor/Format/ChartSpacePrototype.js",
"../../Word/Editor/Document.js", "../../PowerPoint/Editor/Format/GraphicFrame.js",
"../../Word/Editor/DocumentContent.js", "../../PowerPoint/api-all.js",
"../../Word/Editor/HeaderFooter.js", "../../PowerPoint/Build/Log/apiExport.js",
"../../Word/Editor/Table.js", "../../Excel/utils/utils.js",
"../../Word/Editor/Math.js", "../../Excel/model/Serialize.js",
"../../Word/Editor/Spelling.js", "../../Excel/model/WorkbookElems.js",
"../../Word/Editor/Search.js", "../../Excel/model/Workbook.js",
"../../Word/Editor/FontClassification.js", "../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js",
"../../PowerPoint/Editor/Format/ShapePrototype.js", "../../Common/Locks.js"
"../../PowerPoint/Editor/Format/ImagePrototype.js", ],
"../../PowerPoint/Editor/Format/GroupPrototype.js", "dst": "../../PowerPoint/sdk-all.js",
"../../PowerPoint/Editor/Format/ChartSpacePrototype.js", "externs": [
"../../PowerPoint/Editor/Format/GraphicFrame.js", "../../Common/Build/Externs.js",
"../../Common/3rdparty/jquery/jquery.min.js",
"../../PowerPoint/api-all.js", "../../Common/3rdparty/Underscore/underscore-min.js",
"../../PowerPoint/Build/Log/apiExport.js", "../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js"
"../../Excel/utils/utils.js", ],
"../../Excel/model/Serialize.js", "map": "sdk-all.js.map",
"../../Excel/model/WorkbookElems.js", "log": "../../PowerPoint/Build/Log",
"../../Excel/model/Workbook.js", "define": [
"../../Excel/model/CellInfo.js", "ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"../../Excel/model/AdvancedOptions.js", "ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"../../Common/Locks.js" },
], "defines": {
"dst": "../../PowerPoint/sdk-all.js", "src": [
"externs": [ "../../Common/Shapes/EditorSettings.js",
"../../Common/Build/Externs.js", "../../PowerPoint/themes/Themes.js",
"../../Common/3rdparty/jquery/jquery.min.js", "../../PowerPoint/apiDefines.js",
"../../Common/3rdparty/Underscore/underscore-min.js", "../../Common/commonDefines.js"
"../../Common/3rdparty/Sockjs/sockjs-0.3.min.js", ],
"../../Common/3rdparty/XRegExp/xregexp-all-min.js" "dst": "apiDefines.min.js"
], },
"map": "sdk-all.js.map", "source_map": {
"log": "../../PowerPoint/Build/Log", "url": "http://localhost:8080/sdk/PowerPoint"
"define": [ }
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false", },
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true" "deploy": {
] "copy": {
}, "api": {
"defines": { "expand": true,
"src": [ "cwd": "../../PowerPoint/",
"../../Common/Shapes/EditorSettings.js", "src": [
"../../PowerPoint/themes/Themes.js", "api.js",
"../../PowerPoint/apiDefines.js", "Private/api.js",
"../../Common/commonDefines.js" "apiCommon.js",
], "apiDefines.js"
"dst": "apiDefines.min.js" ],
}, "dest": "<%= pkg.menu_path %>/PowerPoint/"
"source_map": { },
"url": "http://localhost:8080/sdk/PowerPoint" "sdk": {
} "expand": true,
}, "cwd": "../../PowerPoint/",
"deploy": { "src": [
"copy": { "sdk-all.js",
"api": { "themes/theme*/**"
"expand": true, ],
"cwd": "../../PowerPoint/", "dest": "<%= pkg.menu_path %>/PowerPoint/"
"src": [ },
"api.js", "doc": {
"Private/api.js", "expand": true,
"apiCommon.js", "cwd": "../../PowerPoint/",
"apiDefines.js" "src": "document/**",
], "dest": "<%= pkg.menu_path %>/PowerPoint/"
"dest": "<%= pkg.menu_path %>/PowerPoint/" },
}, "log": {
"sdk": { "expand": true,
"expand": true, "cwd": "../../PowerPoint/",
"cwd": "../../PowerPoint/", "flatten": true,
"src": [ "src": [
"sdk-all.js", "sdk-all.js.map",
"themes/theme*/**" "Build/Log/property.map",
], "Build/Log/variable.map",
"dest": "<%= pkg.menu_path %>/PowerPoint/" "Build/Log/apiExport.js"
}, ],
"doc": { "dest": "<%= pkg.menu_path %>/PowerPoint/"
"expand": true, },
"cwd": "../../PowerPoint/", "sample": {
"src": "document/**", "expand": true,
"dest": "<%= pkg.menu_path %>/PowerPoint/" "cwd": "../../PowerPoint/",
}, "src": "index.html.deploy",
"log": { "dest": "<%= pkg.menu_path %>/PowerPoint/"
"expand": true, }
"cwd": "../../PowerPoint/", },
"flatten": true, "store_log": {
"src": [ "dst": "../../PowerPoint/Build/Log"
"sdk-all.js.map", }
"Build/Log/property.map", },
"Build/Log/variable.map", "tasks": {
"Build/Log/apiExport.js" "build": [
], "increment_build",
"dest": "<%= pkg.menu_path %>/PowerPoint/" "concat_js_api",
}, "extract_js_api",
"sample": { "compile_sdk"
"expand": true, ]
"cwd": "../../PowerPoint/", }
"src": "index.html.deploy",
"dest": "<%= pkg.menu_path %>/PowerPoint/"
}
},
"store_log": {
"dst": "../../PowerPoint/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"concat_js_api",
"extract_js_api",
"compile_sdk"
]
}
} }
\ No newline at end of file
{ {
"info": { "info": {
"version": "3.5.0", "version": "3.5.0",
"build": 165 "build": 167
}, },
"update_src": { "update_src": {
"revision": "HEAD", "revision": "HEAD",
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"concat_api": { "concat_api": {
"../../Word/api-all.js": [ "../../Word/api-all.js": [
"../../Word/api.js", "../../Word/api.js",
"../../Word/Private/api.js", "../../Word/Private/api.js",
"../../Word/apiCommon.js" "../../Word/apiCommon.js"
] ]
}, },
...@@ -148,7 +148,6 @@ ...@@ -148,7 +148,6 @@
"../../Excel/model/Workbook.js", "../../Excel/model/Workbook.js",
"../../Excel/model/CellInfo.js", "../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js", "../../Excel/model/AdvancedOptions.js",
"../../Common/Locks.js" "../../Common/Locks.js"
], ],
"dst": "../../Word/sdk-all.js", "dst": "../../Word/sdk-all.js",
...@@ -158,8 +157,8 @@ ...@@ -158,8 +157,8 @@
"../../Common/3rdparty/Underscore/underscore-min.js", "../../Common/3rdparty/Underscore/underscore-min.js",
"../../Common/3rdparty/Sockjs/sockjs-0.3.min.js", "../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js", "../../Common/3rdparty/XRegExp/xregexp-all-min.js",
"../../Common/3rdparty/jszip/jszip.min.js", "../../Common/3rdparty/jszip/jszip.min.js",
"../../Common/3rdparty/jszip-utils/jszip-utils.min.js" "../../Common/3rdparty/jszip-utils/jszip-utils.min.js"
], ],
"map": "sdk-all.js.map", "map": "sdk-all.js.map",
"log": "../../Word/Build/Log", "log": "../../Word/Build/Log",
...@@ -187,7 +186,7 @@ ...@@ -187,7 +186,7 @@
"cwd": "../../Word/", "cwd": "../../Word/",
"src": [ "src": [
"api.js", "api.js",
"Private/api.js", "Private/api.js",
"apiCommon.js", "apiCommon.js",
"apiDefines.js" "apiDefines.js"
], ],
...@@ -220,7 +219,7 @@ ...@@ -220,7 +219,7 @@
"src": [ "src": [
"AllFonts.js", "AllFonts.js",
"docscoapisettings.js", "docscoapisettings.js",
"spellcheckapisettings.js", "spellcheckapisettings.js",
"commonDefines.js", "commonDefines.js",
"apiCommon.js", "apiCommon.js",
"downloaderfiles.js", "downloaderfiles.js",
......
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