Merge pull request #466 from MarcelGerber/sprint-to-release-fixup

ingorichter · ingorichter · commit 7b7f8281961e · 2014-09-18T14:10:00.000-07:00
Fix spots where Sprint -&gt; Release wasn't done properly
diff --git a/installer/mac/buildInstaller.sh b/installer/mac/buildInstaller.sh
@@ -2,7 +2,7 @@
 
 # config
 releaseName="Brackets"
-dmgName="${releaseName} Release 44"
+dmgName="${releaseName} Release 0.44"
 format="bzip2"
 encryption="none"
 tmpLayout="./dropDmgConfig/layouts/tempLayout"
diff --git a/installer/win/README.MD b/installer/win/README.MD
@@ -35,8 +35,8 @@ brackets       > grunt set-release --release=NN
 brackets-shell > grunt set-release --release=NN
 
 ## 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`
+1. Open brackets-win-install-build.xml and change `product.release.number.minor`, and, for a major release, `product.release.number.major` as well
+2. Open brackets-shell\installer\mac\buildInstaller.sh and change `dmgName`
 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"`
 5. Open brackets-shell\appshell\mac\Info.plist and change `CFBundleVersion` and `CFBundleShortVersionString`
diff --git a/installer/win/brackets-win-install-build.xml b/installer/win/brackets-win-install-build.xml
@@ -11,9 +11,10 @@ default="build.mul">
   <!-- Product & version labeling -->
   <!-- See also: product name definitions in Brackets_<locale>.wxl -->
   <property name="product.shortname" value="Brackets"/>
-  <property name="product.release.number" value="44"/>
-  <property name="product.version.number" value="0.${product.release.number}"/>
-  <property name="product.version.name" value="Release ${product.release.number}"/>
+  <property name="product.release.number.major" value="0"/>
+  <property name="product.release.number.minor" value="44"/>
+  <property name="product.version.number" value="${product.release.number.major}.${product.release.number.minor}"/>
+  <property name="product.version.name" value="Release ${product.version.number}"/>
   <property name="product.fullname" value="Brackets ${product.version.name}"/>
   <property name="product.manufacturer" value="brackets.io"/>
   <property name="product.registry.root" value="${product.shortname}"/>
diff --git a/tasks/build.js b/tasks/build.js
@@ -225,7 +225,8 @@ module.exports = function (grunt) {
         grunt.file.write("installer/linux/debian/package-root/DEBIAN/control", content);
 
         var done = this.async(),
-            release = semver.parse(grunt.config("pkg").version).minor;
+            version = semver.parse(grunt.config("pkg").version),
+            release = version.major + "." + 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 Release " + release + " " + common.arch() + "-bit.deb");
@@ -242,7 +243,8 @@ module.exports = function (grunt) {
         grunt.task.requires(["package"]);
 
         var done = this.async(),
-            release = semver.parse(grunt.config("pkg").version).minor;
+            version = semver.parse(grunt.config("pkg").version),
+            release = version.major + "." + 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 Release " + release + " " + common.arch() + "-bit.tar.gz");
diff --git a/tasks/set-release.js b/tasks/set-release.js
@@ -69,16 +69,16 @@ module.exports = function (grunt) {
         text = grunt.file.read(winInstallerBuildXmlPath);
         text = safeReplace(
             text,
-            /<property name="product\.release\.number" value="([0-9]+)"\/>/,
-            '<property name="product.release.number" value="' + release + '"/>'
+            /<property name="product\.release\.number\.minor" value="([0-9]+)"\/>/,
+            '<property name="product.release.number.minor" value="' + release + '"/>'
         );
         grunt.file.write(winInstallerBuildXmlPath, text);
         
-        // 3. Open installer/mac/buildInstaller.sh and change `releaseName`
+        // 3. Open installer/mac/buildInstaller.sh and change `dmgName`
         text = grunt.file.read(buildInstallerScriptPath);
         text = safeReplace(
             text,
-            /( Release )([0-9]+)/,
+            /( Release [0-9]+\.)([0-9]+)/,
             "$1" + release
         );
         grunt.file.write(buildInstallerScriptPath, text);
@@ -92,7 +92,7 @@ module.exports = function (grunt) {
         );
         text = safeReplace(
             text,
-            /(Release 0\.)([0-9]+)/,
+            /(Release [0-9]+\.)([0-9]+)/,
             "$1" + release
         );
         grunt.file.write(versionRcPath, text);
