From e28cad61117af2768b90a0db5df6b7d63898feb5 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 7 Aug 2014 01:31:40 +0200 Subject: [PATCH 1/2] Sprint -> Release --- Gruntfile.js | 6 +-- .../default/HTMLCodeHints/unittests.js | 2 +- src/language/CSSUtils.js | 6 +-- src/nls/root/strings.js | 2 +- src/utils/BuildInfoUtils.js | 4 +- src/utils/UpdateNotification.js | 2 +- tasks/build.js | 2 +- ...int-number.js => update-release-number.js} | 42 +++++++++---------- 8 files changed, 33 insertions(+), 33 deletions(-) rename tasks/{update-sprint-number.js => update-release-number.js} (76%) diff --git a/Gruntfile.js b/Gruntfile.js index 9cf1ac7f24f..28823e24b34 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -312,9 +312,9 @@ module.exports = function (grunt) { grunt.registerTask('test', ['jshint:all', 'jasmine']); // grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine_node']); - // task: set-sprint - // Update sprint number in package.json and rewrite src/config.json - grunt.registerTask('set-sprint', ['update-sprint-number', 'write-config']); + // task: set-release + // Update version number in package.json and rewrite src/config.json + grunt.registerTask('set-release', ['update-release-number', 'write-config']); // task: build grunt.registerTask('build', [ diff --git a/src/extensions/default/HTMLCodeHints/unittests.js b/src/extensions/default/HTMLCodeHints/unittests.js index 0a0e5cc55a0..1033255ea64 100644 --- a/src/extensions/default/HTMLCodeHints/unittests.js +++ b/src/extensions/default/HTMLCodeHints/unittests.js @@ -447,7 +447,7 @@ define(function (require, exports, module) { // Expect no filtering - however, we offer some attributes (including first in the list) that // are specific to the tag, so we can't use the default "no filtering" empty arg here. - // (This smart filtering isn't officially part of the sprint, so no unit tests specifically + // (This smart filtering isn't officially part of the release, so no unit tests specifically // targeting that functionality yet). verifyAttrHints(hintList, "accept"); }); diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js index f7704c26d19..6d242c2cd67 100644 --- a/src/language/CSSUtils.js +++ b/src/language/CSSUtils.js @@ -1018,7 +1018,7 @@ define(function (require, exports, module) { * Finds all instances of the specified selector in "text". * Returns an Array of Objects with start and end properties. * - * For Sprint 4, we only support simple selectors. This function will need to change + * For now, we only support simple selectors. This function will need to change * dramatically to support full selectors. * * FUTURE: (JRB) It would be nice to eventually use the browser/jquery to do the selector evaluation. @@ -1038,7 +1038,7 @@ define(function (require, exports, module) { var result = []; var i; - // For sprint 4 we only match the rightmost simple selector, and ignore + // For now, we only match the rightmost simple selector, and ignore // attribute selectors and pseudo selectors var classOrIdSelector = selector[0] === "." || selector[0] === "#"; var prefix = ""; @@ -1147,7 +1147,7 @@ define(function (require, exports, module) { /** * Return all rules matching the specified selector. - * For Sprint 4, we only look at the rightmost simple selector. For example, searching for ".foo" will + * For now, we only look at the rightmost simple selector. For example, searching for ".foo" will * match these rules: * .foo {} * div .foo {} diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 6d74adde667..4658c50ff7b 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -403,7 +403,7 @@ define({ "RELAUNCH_CHROME" : "Relaunch Chrome", "ABOUT" : "About", "CLOSE" : "Close", - "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE1" : "release {VERSION_MAJOR}.{VERSION_MINOR} {BUILD_TYPE} {VERSION}", "ABOUT_TEXT_BUILD_TIMESTAMP" : "build timestamp: ", "ABOUT_TEXT_LINE3" : "Notices, terms and conditions pertaining to third party software are located at {ADOBE_THIRD_PARTY} and incorporated by reference herein.", "ABOUT_TEXT_LINE4" : "Documentation and source at https://github.com/adobe/brackets/", diff --git a/src/utils/BuildInfoUtils.js b/src/utils/BuildInfoUtils.js index 7b7f7449a0e..c989b3a8e63 100644 --- a/src/utils/BuildInfoUtils.js +++ b/src/utils/BuildInfoUtils.js @@ -85,7 +85,7 @@ define(function (require, exports, module) { // Look for Git metadata on disk to load the SHAs for 'brackets'. Done on // startup instead of on demand because the version that's currently running is what was // loaded at startup (the src on disk may be updated to a different version later). - // Git metadata may be missing (e.g. in the per-sprint ZIP builds) - silently ignore if so. + // Git metadata may be missing (e.g. in the release builds) - silently ignore if so. var bracketsSrc = FileUtils.getNativeBracketsDirectoryPath(); // Assumes Brackets is a standalone repo and not a submodule (prior to brackets-shell, @@ -107,4 +107,4 @@ define(function (require, exports, module) { // FIXME (jasonsanjose): Since the move to brackets-shell, can't reliably get SHA for shell. // exports._getBracketsShellSHA = getBracketsShellSHA; -}); \ No newline at end of file +}); diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js index 8a3d0b8bcf1..30f8b58067f 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -75,7 +75,7 @@ define(function (require, exports, module) { // an Object with the following fields: // // {Number} buildNumber Number of the build - // {String} versionString String representation of the build number (ie "Sprint 14") + // {String} versionString String representation of the build number (ie "Release 0.40") // {String} dateString Date of the build // {String} releaseNotesURL URL of the release notes for this build // {String} downloadURL URL to download this build diff --git a/tasks/build.js b/tasks/build.js index 7d76f93b283..bf3dd1a2894 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -40,7 +40,7 @@ module.exports = function (grunt) { json = {}; // count the number of commits for our version number - // ..- + // ..- return qexec("git log --format=%h", opts).then(function (stdout) { json.commits = stdout.toString().match(/[0-9a-f]\n/g).length; diff --git a/tasks/update-sprint-number.js b/tasks/update-release-number.js similarity index 76% rename from tasks/update-sprint-number.js rename to tasks/update-release-number.js index ebb24a83e71..1f25a88a634 100644 --- a/tasks/update-sprint-number.js +++ b/tasks/update-release-number.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*global module, require*/ @@ -26,21 +26,21 @@ module.exports = function (grunt) { "use strict"; var common = require("./lib/common")(grunt); - - // task: update-sprint-number + + // task: update-release-number // Updates the version property in package.json - grunt.registerTask('update-sprint-number', function () { + grunt.registerTask('update-release-number', function () { var path = "package.json", packageJSON = grunt.file.readJSON(path), - sprint = grunt.option("sprint") || 0, + release = grunt.option("release") || 0, versionNumberRegexp = /([0-9]+\.)([0-9]+)([\.\-a-zA-Z0-9]*)?/; - if (!sprint) { - grunt.fail.fatal("Please specify a sprint. e.g. grunt update-sprint-number --sprint=21"); + if (!release) { + grunt.fail.fatal("Please specify a release. e.g. grunt update-release-number --release=40"); } - - packageJSON.version = packageJSON.version.replace(versionNumberRegexp, "$1" + sprint + "$3"); - packageJSON.apiVersion = packageJSON.apiVersion.replace(versionNumberRegexp, "$1" + sprint + "$3"); + + packageJSON.version = packageJSON.version.replace(versionNumberRegexp, "$1" + release + "$3"); + packageJSON.apiVersion = packageJSON.apiVersion.replace(versionNumberRegexp, "$1" + release + "$3"); common.writeJSON(grunt, path, packageJSON); }); From 13fb6ae56b43c6abb7ca3f70e1599110bf9a42ec Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 7 Aug 2014 14:26:49 +0200 Subject: [PATCH 2/2] Uppercase Release --- src/nls/root/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 4658c50ff7b..029ef88a320 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -403,7 +403,7 @@ define({ "RELAUNCH_CHROME" : "Relaunch Chrome", "ABOUT" : "About", "CLOSE" : "Close", - "ABOUT_TEXT_LINE1" : "release {VERSION_MAJOR}.{VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE1" : "Release {VERSION_MAJOR}.{VERSION_MINOR} {BUILD_TYPE} {VERSION}", "ABOUT_TEXT_BUILD_TIMESTAMP" : "build timestamp: ", "ABOUT_TEXT_LINE3" : "Notices, terms and conditions pertaining to third party software are located at {ADOBE_THIRD_PARTY} and incorporated by reference herein.", "ABOUT_TEXT_LINE4" : "Documentation and source at https://github.com/adobe/brackets/",