delete unused code from build

delete defines
add closure to build sdk-all.js (in header and footer)

build/Gruntfile.js

@@ -30,9 +30,7 @@ module.exports = function(grunt) {
 	var formatting = grunt.option('formatting') || '';
 	var nomap = grunt.option('nomap') || '';
 
-	grunt.loadNpmTasks('grunt-contrib-clean');
 	grunt.loadNpmTasks('grunt-contrib-concat');
-	grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-exec');
 	grunt.loadNpmTasks('grunt-replace');
 	
@@ -134,39 +132,14 @@ module.exports = function(grunt) {
 		grunt.file.write(defaultConfig, JSON.stringify(pkg, null, 4));
     });
 	
-	grunt.registerTask('create_map_file', function() {
-		//      ,    .	
-		var map_file_path = packageFile['compile']['sdk']['dst'] + '.map';	
-		var map_record = '//@ sourceMappingURL=' + packageFile['compile']['source_map']['url'] + '/' + map_file_path;
-
-		var map_record_file_path = map_file_path + '.tmp';
-		grunt.file.write(map_record_file_path, map_record);
-	});
-	
 	grunt.registerTask('compile_sdk_init', function(compilation_level) {
-		grunt.file.mkdir( packageFile['compile']['sdk']['log'] );
-		var map_file_path = packageFile['compile']['sdk']['dst'] + '.map';
-		var map_record_file_path = map_file_path + '.tmp';
-		var concat_res = {};
-		concat_res[packageFile['compile']['sdk']['dst']] = [
-					packageFile['compile']['sdk']['dst'],
-					packageFile['compile']['defines']['dst'],
-					map_record_file_path ];
+		grunt.file.mkdir( packageFile['compile']['sdk']['log'] );
 		var srcFiles = packageFile['compile']['sdk']['common'];
 		var sdkOpt = {
 			compilation_level: compilation_level,
 			warning_level: 'QUIET',
-			externs: packageFile['compile']['sdk']['externs']/*,
-			create_source_map: map_file_path,
-			source_map_format: "V3"*/
+			externs: packageFile['compile']['sdk']['externs']
 		};
-		var definesOpt = {
-			compilation_level: 'ADVANCED' === compilation_level ? 'SIMPLE' : compilation_level,
-			warning_level: 'QUIET'
-		};
-		if (formatting) {
-			definesOpt['formatting'] = sdkOpt['formatting'] = formatting;
-		}
 		if (!nomap) {
 			sdkOpt['variable_renaming_report'] = packageFile['compile']['sdk']['log'] + '/variable.map';
 			sdkOpt['property_renaming_report'] = packageFile['compile']['sdk']['log'] + '/property.map';
@@ -198,20 +171,18 @@ module.exports = function(grunt) {
 						'<%= pkg.compile.sdk.dst %>': srcFiles
 					},
 					options: sdkOpt
-				},
-				defines: {
-					files: {
-						'<%= pkg.compile.defines.dst %>': packageFile['compile']['defines']['src']
-					},
-					options: definesOpt
 				}
+			},
+			concat: {
+				options: {
+					banner: '(function(window, undefined) {',
+					footer: '})(window);'
+				},
+				dist: {
+					src: ['<%= pkg.compile.sdk.dst %>'],
+					dest: '<%= pkg.compile.sdk.dst %>'
+				}
 			},
-			create_map_file: {},
-			concat: concat_res,
-			clean: [ 
-				packageFile['compile']['defines']['dst'],
-				map_record_file_path
-			],
 			replace: {
 				version: {
 					options: {
@@ -229,8 +200,8 @@ module.exports = function(grunt) {
 		});
 	});
 	
-	grunt.registerTask('compile_sdk', ['compile_sdk_init:' + level, 'closure-compiler', 'concat', 'replace', 'clean']);
-	grunt.registerTask('compile_sdk_native', ['compile_sdk_init:' + level, 'closure-compiler:sdk', 'concat', 'replace', 'clean']);
+	grunt.registerTask('compile_sdk', ['compile_sdk_init:' + level, 'closure-compiler', 'concat', 'replace']);
+	grunt.registerTask('compile_sdk_native', ['compile_sdk_init:' + level, 'closure-compiler:sdk', 'concat', 'replace']);
 		 
 	grunt.registerTask('default', ['build_all']);
 };
\ No newline at end of file

build/configs/webexcel.json

@@ -56,6 +56,7 @@
                 "../cell/model/FormulaObjects/informationFunctions.js",
                 "../cell/model/FormulaObjects/logicalFunctions.js",
                 "../cell/model/Serialize.js",
+				"../common/Shapes/EditorSettings.js",
                 "../cell/model/WorkbookElems.js",
                 "../cell/model/Workbook.js",
                 "../cell/model/CellInfo.js",
@@ -185,14 +186,6 @@
             "map": "sdk-all.js.map",
             "log": "../cell/Build/Log"
         },
-        "defines": {
-            "src": [
-                "../common/Shapes/EditorSettings.js",
-                "../common/commonDefines.js",
-                "../cell/apiDefines.js"
-            ],
-            "dst": "apiDefines.min.js"
-        },
         "source_map": {
             "url": "http://localhost:8080/sdkjs/cell"
         }

build/configs/webpowerpoint.json

@@ -26,6 +26,7 @@
                 "../common/wordcopypaste.js",
                 "../common/editorscommon.js",
                 "../slide/Drawing/ThemeLoader.js",
+				"../common/Shapes/EditorSettings.js",
                 "../common/Charts/DrawingObjects.js",
                 "../common/SerializeCommonWordExcel.js",
                 "../common/SerializeChart.js",
@@ -72,6 +73,7 @@
                 "../slide/Drawing/HtmlPage.js",
                 "../slide/apiDefines.js",
                 "../common/Drawings/Format/Constants.js",
+				"../slide/themes/Themes.js",
                 "../common/Shapes/Serialize.js",
                 "../common/Shapes/SerializeWriter.js",
                 "../word/Editor/SerializeCommon.js",
@@ -189,15 +191,6 @@
             "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/sdkjs/slide"
         }

build/configs/webword.json

@@ -23,6 +23,7 @@
                 "../common/commonDefines.js",
                 "../common/editorscommon.js",
                 "../common/Shapes/Serialize.js",
+				"../common/Shapes/EditorSettings.js",
                 "../common/Shapes/SerializeWriter.js",
                 "../common/SerializeCommonWordExcel.js",
                 "../common/SerializeChart.js",
@@ -173,14 +174,6 @@
             "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/sdkjs/word"
         }

build/package.json

@@ -6,9 +6,7 @@
   "dependencies": {
     "google-closure-compiler": "20160315.2.0",
     "grunt": "0.4.5",
-    "grunt-contrib-clean": "0.5.0",
     "grunt-contrib-concat": "0.3.0",
-    "grunt-contrib-copy": "0.5.0",
     "grunt-exec": "0.4.5",
     "grunt-replace": "0.7.3"
   }