Переход на 4-ю версию грунта.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60497 954022d7-b5bf-4e40-9824-e11837661b57

Build/opensource/grunt.js → Build/opensource/Gruntfile.js

@@ -47,55 +47,54 @@ module.exports = function(grunt) {
     grunt.registerTask('build_webword',     ['build_webword_init', 'build_sdk']);
     grunt.registerTask('build_webexcel',  ['build_webexcel_init', 'build_sdk']);
     grunt.registerTask('build_webpowerpoint', ['build_webpowerpoint_init', 'build_sdk']);
-    grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk');
+    grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk']);
 
     grunt.registerTask('compile_sdk_init', function() {
         grunt.initConfig({
-            pkg: '<json:' + defaultConfig + '>',
-            meta: {
-                banner: '/*\n' +
-                    ' * (c) Copyright Ascensio System SIA 2010-<%= grunt.template.today("yyyy") %>\n' +
-                    ' *\n' +
-                    ' * This program is a free software product. You can redistribute it and/or \n' +
-                    ' * modify it under the terms of the GNU Affero General Public License (AGPL) \n' +
-                    ' * version 3 as published by the Free Software Foundation. In accordance with \n' +
-                    ' * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect \n' +
-                    ' * that Ascensio System SIA expressly excludes the warranty of non-infringement\n' +
-                    ' * of any third-party rights.\n' +
-                    ' *\n' +
-                    ' * This program is distributed WITHOUT ANY WARRANTY; without even the implied \n' +
-                    ' * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For \n' +
-                    ' * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html\n' +
-                    ' *\n' +
-                    ' * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,\n' +
-                    ' * EU, LV-1021.\n' +
-                    ' *\n' +
-                    ' * The  interactive user interfaces in modified source and object code versions\n' +
-                    ' * of the Program must display Appropriate Legal Notices, as required under \n' +
-                    ' * Section 5 of the GNU AGPL version 3.\n' +
-                    ' *\n' +
-                    ' * Pursuant to Section 7(b) of the License you must retain the original Product\n' +
-                    ' * logo when distributing the program. Pursuant to Section 7(e) we decline to\n' +
-                    ' * grant you any rights under trademark law for use of our trademarks.\n' +
-                    ' *\n' +
-                    ' * All the Product\'s GUI elements, including illustrations and icon sets, as\n' +
-                    ' * well as technical writing content are licensed under the terms of the\n' +
-                    ' * Creative Commons Attribution-ShareAlike 4.0 International. See the License\n' +
-                    ' * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode\n' +
-                    ' *\n' +
-                    ' * Version: <%= pkg.info.version %> (build:<%= pkg.info.build %>)\n' +
-                    ' */'
-            },
-
-            min: {
+            pkg: grunt.file.readJSON(defaultConfig),
+            uglify: {
+				options: {
+				banner: '/*\n' +
+						' * (c) Copyright Ascensio System SIA 2010-<%= grunt.template.today("yyyy") %>\n' +
+						' *\n' +
+						' * This program is a free software product. You can redistribute it and/or \n' +
+						' * modify it under the terms of the GNU Affero General Public License (AGPL) \n' +
+						' * version 3 as published by the Free Software Foundation. In accordance with \n' +
+						' * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect \n' +
+						' * that Ascensio System SIA expressly excludes the warranty of non-infringement\n' +
+						' * of any third-party rights.\n' +
+						' *\n' +
+						' * This program is distributed WITHOUT ANY WARRANTY; without even the implied \n' +
+						' * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For \n' +
+						' * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html\n' +
+						' *\n' +
+						' * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,\n' +
+						' * EU, LV-1021.\n' +
+						' *\n' +
+						' * The  interactive user interfaces in modified source and object code versions\n' +
+						' * of the Program must display Appropriate Legal Notices, as required under \n' +
+						' * Section 5 of the GNU AGPL version 3.\n' +
+						' *\n' +
+						' * Pursuant to Section 7(b) of the License you must retain the original Product\n' +
+						' * logo when distributing the program. Pursuant to Section 7(e) we decline to\n' +
+						' * grant you any rights under trademark law for use of our trademarks.\n' +
+						' *\n' +
+						' * All the Product\'s GUI elements, including illustrations and icon sets, as\n' +
+						' * well as technical writing content are licensed under the terms of the\n' +
+						' * Creative Commons Attribution-ShareAlike 4.0 International. See the License\n' +
+						' * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode\n' +
+						' *\n' +
+						' * Version: <%= pkg.info.version %> (build:<%= pkg.info.build %>)\n' +
+						' */'
+				},
                 sdk: {
-                    src: ['<banner:meta.banner>'].concat(packageFile['compile']["sdk"]['src']),
+                    src: packageFile['compile']["sdk"]['src'],
                     dest: packageFile['compile']["sdk"]['dst']
                 }
             }
         });
     });
-    grunt.registerTask('compile_sdk', ['compile_sdk_init', 'min']);
+    grunt.registerTask('compile_sdk', ['compile_sdk_init', 'uglify']);
 
     grunt.registerTask('default', 'build_all');
 };
\ No newline at end of file

Build/opensource/installtools.bat

 @echo off
 cd /D %~dp0
-echo Installation grunt and grunt-contrib
-call npm install -g grunt@0.3.17 
-call npm install grunt-contrib@0.3.0
+
+echo Installation grunt-cli
+call npm install -g grunt-cli
+
+call npm install
+

Build/opensource/package.json

+{
+    "name": "common",
+    "version": "0.0.0",
+    "homepage": "http://www.onlyoffice.com",
+    "private": true,
+    "dependencies": {
+        "grunt": "0.4.2",
+        "grunt-contrib": "0.9.0"
+    }
+}
\ No newline at end of file