Merge pull request #8680 from MarcelGerber/sprint-to-release

ingorichter · ingorichter · commit 0f21bf6b9740 · 2014-09-08T18:29:17.000-07:00
Sprint -&gt; Release
diff --git 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
@@ -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 <input> 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
@@ -1255,7 +1255,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.
@@ -1276,7 +1276,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 = "";
@@ -1384,7 +1384,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
@@ -411,7 +411,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 <a href='{ADOBE_THIRD_PARTY}'>{ADOBE_THIRD_PARTY}</a> and incorporated by reference herein.",
     "ABOUT_TEXT_LINE4"                     : "Documentation and source at <a href='https://github.com/adobe/brackets/'>https://github.com/adobe/brackets/</a>",
diff --git 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;
-});
+});
diff --git 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
@@ -40,7 +40,7 @@ module.exports = function (grunt) {
             json = {};
 
         // count the number of commits for our version number
-        //     <major>.<sprint>.<patch>-<number of commits>
+        //     <major>.<minor>.<patch>-<number of commits>
         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-release-number.js b/tasks/update-release-number.js
@@ -1,46 +1,46 @@
 /*
  * 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*/
 
 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);
     });
