From 8e61e038d8ee06141fcd7756f91db32f54f6273f Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Tue, 12 Aug 2014 22:09:56 +0200 Subject: [PATCH] Sprint -> Release --- appshell/version.rc | 2 +- installer/mac/buildInstaller.sh | 4 +-- installer/win/README.MD | 12 +++---- installer/win/brackets-win-install-build.xml | 6 ++-- tasks/build.js | 8 ++--- tasks/set-sprint.js | 34 ++++++++++---------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/appshell/version.rc b/appshell/version.rc index 141a4d0ec..de00e191e 100644 --- a/appshell/version.rc +++ b/appshell/version.rc @@ -43,7 +43,7 @@ BEGIN BEGIN VALUE "CompanyName", "brackets.io\0" VALUE "FileDescription", "\0" - VALUE "FileVersion", "Sprint 43\0" + VALUE "FileVersion", "Release 43\0" VALUE "ProductName", APP_NAME "\0" VALUE "ProductVersion", "\0" VALUE "LegalCopyright", "(c) 2012 Adobe Systems, Inc.\0" diff --git a/installer/mac/buildInstaller.sh b/installer/mac/buildInstaller.sh index 45148427a..75a322e42 100755 --- a/installer/mac/buildInstaller.sh +++ b/installer/mac/buildInstaller.sh @@ -2,7 +2,7 @@ # config releaseName="Brackets" -dmgName="${releaseName} Sprint 43" +dmgName="${releaseName} Release 43" format="bzip2" encryption="none" tmpLayout="./dropDmgConfig/layouts/tempLayout" @@ -40,4 +40,4 @@ dropdmg ./$tempDir --format $format --encryption $encryption $customIcon --layou # clean up rm -rf $tempDir -rm -rf $tmpLayout \ No newline at end of file +rm -rf $tmpLayout diff --git a/installer/win/README.MD b/installer/win/README.MD index bd48ff22c..5e409e6aa 100644 --- a/installer/win/README.MD +++ b/installer/win/README.MD @@ -28,14 +28,14 @@ Normally, the installer scripts are run via Jenkins on the build machine http:// * Copy these two files to _(wix-install-dir)_\bin 9. You may need to locally edit `wix.base` in brackets-win-install-build.xml if the Wix install folder doesn't match what's hardcoded there -## Update Sprint Number with Grunt -To rev the Brackets sprint number with Grunt, both brackets-shell and brackets repositories must be updated. For the initial Grunt setup, see: https://github.com/adobe/brackets/wiki/Grunt-Setup. +## Update Release Number with Grunt +To rev the Brackets release number with Grunt, both brackets-shell and brackets repositories must be updated. For the initial Grunt setup, see: https://github.com/adobe/brackets/wiki/Grunt-Setup. -brackets > grunt set-sprint --sprint=NN -brackets-shell > grunt set-sprint --sprint=NN +brackets > grunt set-release --release=NN +brackets-shell > grunt set-release --release=NN -## To rev the Brackets sprint number manually -1. Open brackets-win-install-build.xml and change `product.sprint.number` +## To rev the Brackets release number manually +1. Open brackets-win-install-build.xml and change `product.release.number` 2. Open brackets-shell\installer\mac\buildInstaller.sh and change `releaseName` 3. Open Brackets.wxs and replace the `StartMenuShortcut` GUID property with a newly generated GUID 4. Open brackets-shell\appshell\version.rc and change `FILEVERSION` and `"FileVersion"` diff --git a/installer/win/brackets-win-install-build.xml b/installer/win/brackets-win-install-build.xml index 1a0b49a53..72d9e7180 100644 --- a/installer/win/brackets-win-install-build.xml +++ b/installer/win/brackets-win-install-build.xml @@ -11,9 +11,9 @@ default="build.mul"> - - - + + + diff --git a/tasks/build.js b/tasks/build.js index 9625cf2e0..e7ddf8618 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -234,10 +234,10 @@ module.exports = function (grunt) { grunt.file.write("installer/linux/debian/package-root/DEBIAN/control", content); var done = this.async(), - sprint = semver.parse(grunt.config("pkg").version).minor; + release = semver.parse(grunt.config("pkg").version).minor; spawn(["bash build_installer.sh"], { cwd: resolve("installer/linux"), env: getBracketsEnv() }).then(function () { - return common.rename("installer/linux/brackets.deb", "installer/linux/Brackets Sprint " + sprint + " " + common.arch() + "-bit.deb"); + return common.rename("installer/linux/brackets.deb", "installer/linux/Brackets Release " + release + " " + common.arch() + "-bit.deb"); }).then(function () { done(); }, function (err) { @@ -251,10 +251,10 @@ module.exports = function (grunt) { grunt.task.requires(["package"]); var done = this.async(), - sprint = semver.parse(grunt.config("pkg").version).minor; + release = semver.parse(grunt.config("pkg").version).minor; spawn(["bash build_archive.sh"], { cwd: resolve("installer/linux"), env: getBracketsEnv() }).then(function () { - return common.rename("installer/linux/brackets.tar.gz", "installer/linux/Brackets Sprint " + sprint + " " + common.arch() + "-bit.tar.gz"); + return common.rename("installer/linux/brackets.tar.gz", "installer/linux/Brackets Release " + release + " " + common.arch() + "-bit.tar.gz"); }).then(function () { done(); }, function (err) { diff --git a/tasks/set-sprint.js b/tasks/set-sprint.js index 0090107a2..5df9bd9df 100644 --- a/tasks/set-sprint.js +++ b/tasks/set-sprint.js @@ -37,8 +37,8 @@ module.exports = function (grunt) { return newContent; } - // task: set-sprint - grunt.registerTask("set-sprint", "Update occurrences of sprint number for all native installers and binaries", function () { + // task: set-release + grunt.registerTask("set-release", "Update occurrences of release number for all native installers and binaries", function () { var packageJsonPath = "package.json", packageJSON = grunt.file.readJSON(packageJsonPath), winInstallerBuildXmlPath = "installer/win/brackets-win-install-build.xml", @@ -46,31 +46,31 @@ module.exports = function (grunt) { wxsPath = "installer/win/Brackets.wxs", versionRcPath = "appshell/version.rc", infoPlistPath = "appshell/mac/Info.plist", - sprint = grunt.option("sprint") || 0, + release = grunt.option("release") || 0, versionShort = packageJSON.version.substr(0, packageJSON.version.indexOf("-")), text; - // replace sprint number in short version, e.g. N..N - versionShort = versionShort.replace(/([0-9]+\.)([0-9]+)(\.[0-9]+)/, "$1" + sprint + "$3"); + // replace release number in short version, e.g. N..N + versionShort = versionShort.replace(/([0-9]+\.)([0-9]+)(\.[0-9]+)/, "$1" + release + "$3"); - if (!sprint) { - grunt.fail.fatal("Please specify a sprint. e.g. grunt set-sprint --sprint=21"); + if (!release) { + grunt.fail.fatal("Please specify a release. e.g. grunt set-release --release=21"); } // 1. Update package.json packageJSON.version = safeReplace( packageJSON.version, /([0-9]+\.)([0-9]+)([\.\-a-zA-Z0-9]*)?/, - "$1" + sprint + "$3" + "$1" + release + "$3" ); common.writeJSON(packageJsonPath, packageJSON); - // 2. Open installer/win/brackets-win-install-build.xml and change `product.sprint.number` + // 2. Open installer/win/brackets-win-install-build.xml and change `product.release.number` text = grunt.file.read(winInstallerBuildXmlPath); text = safeReplace( text, - //, - '' + //, + '' ); grunt.file.write(winInstallerBuildXmlPath, text); @@ -78,8 +78,8 @@ module.exports = function (grunt) { text = grunt.file.read(buildInstallerScriptPath); text = safeReplace( text, - /( Sprint )([0-9]+)/, - "$1" + sprint + /( Release )([0-9]+)/, + "$1" + release ); grunt.file.write(buildInstallerScriptPath, text); @@ -88,12 +88,12 @@ module.exports = function (grunt) { text = safeReplace( text, /(FILEVERSION\s+[0-9]+,)([0-9]+)/, - "$1" + sprint + "$1" + release ); text = safeReplace( text, - /(Sprint )([0-9]+)/, - "$1" + sprint + /(Release )([0-9]+)/, + "$1" + release ); grunt.file.write(versionRcPath, text); @@ -111,4 +111,4 @@ module.exports = function (grunt) { ); grunt.file.write(infoPlistPath, text); }); -}; \ No newline at end of file +};