Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Commit cd64ac1

Browse files
author
Marcel Gerber
committed
Fix spots where Sprint -> Release wasn't done properly
1 parent 0aeafb5 commit cd64ac1

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

installer/mac/buildInstaller.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# config
44
releaseName="Brackets"
5-
dmgName="${releaseName} Release 44"
5+
dmgName="${releaseName} Release 0.44"
66
format="bzip2"
77
encryption="none"
88
tmpLayout="./dropDmgConfig/layouts/tempLayout"

installer/win/README.MD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ brackets > grunt set-release --release=NN
3535
brackets-shell > grunt set-release --release=NN
3636

3737
## To rev the Brackets release number manually
38-
1. Open brackets-win-install-build.xml and change `product.release.number`
39-
2. Open brackets-shell\installer\mac\buildInstaller.sh and change `releaseName`
38+
1. Open brackets-win-install-build.xml and change `product.release.number.minor`, and, for a major release, `product.release.number.major` as well
39+
2. Open brackets-shell\installer\mac\buildInstaller.sh and change `dmgName`
4040
3. Open Brackets.wxs and replace the `StartMenuShortcut` GUID property with a newly generated GUID
4141
4. Open brackets-shell\appshell\version.rc and change `FILEVERSION` and `"FileVersion"`
4242
5. Open brackets-shell\appshell\mac\Info.plist and change `CFBundleVersion` and `CFBundleShortVersionString`

installer/win/brackets-win-install-build.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ default="build.mul">
1111
<!-- Product & version labeling -->
1212
<!-- See also: product name definitions in Brackets_<locale>.wxl -->
1313
<property name="product.shortname" value="Brackets"/>
14-
<property name="product.release.number" value="44"/>
15-
<property name="product.version.number" value="0.${product.release.number}"/>
16-
<property name="product.version.name" value="Release ${product.release.number}"/>
14+
<property name="product.release.number.major" value="0"/>
15+
<property name="product.release.number.minor" value="44"/>
16+
<property name="product.version.number" value="${product.release.number.major}.${product.release.number.minor}"/>
17+
<property name="product.version.name" value="Release ${product.version.number}"/>
1718
<property name="product.fullname" value="Brackets ${product.version.name}"/>
1819
<property name="product.manufacturer" value="brackets.io"/>
1920
<property name="product.registry.root" value="${product.shortname}"/>

tasks/build.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ module.exports = function (grunt) {
234234
grunt.file.write("installer/linux/debian/package-root/DEBIAN/control", content);
235235

236236
var done = this.async(),
237-
release = semver.parse(grunt.config("pkg").version).minor;
237+
version = semver.parse(grunt.config("pkg").version),
238+
release = version.major + "." + version.minor;
238239

239240
spawn(["bash build_installer.sh"], { cwd: resolve("installer/linux"), env: getBracketsEnv() }).then(function () {
240241
return common.rename("installer/linux/brackets.deb", "installer/linux/Brackets Release " + release + " " + common.arch() + "-bit.deb");
@@ -251,7 +252,8 @@ module.exports = function (grunt) {
251252
grunt.task.requires(["package"]);
252253

253254
var done = this.async(),
254-
release = semver.parse(grunt.config("pkg").version).minor;
255+
version = semver.parse(grunt.config("pkg").version),
256+
release = version.major + "." + version.minor;
255257

256258
spawn(["bash build_archive.sh"], { cwd: resolve("installer/linux"), env: getBracketsEnv() }).then(function () {
257259
return common.rename("installer/linux/brackets.tar.gz", "installer/linux/Brackets Release " + release + " " + common.arch() + "-bit.tar.gz");

tasks/set-release.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ module.exports = function (grunt) {
6969
text = grunt.file.read(winInstallerBuildXmlPath);
7070
text = safeReplace(
7171
text,
72-
/<property name="product\.release\.number" value="([0-9]+)"\/>/,
73-
'<property name="product.release.number" value="' + release + '"/>'
72+
/<property name="product\.release\.number\.minor" value="([0-9]+)"\/>/,
73+
'<property name="product.release.number.minor" value="' + release + '"/>'
7474
);
7575
grunt.file.write(winInstallerBuildXmlPath, text);
7676

77-
// 3. Open installer/mac/buildInstaller.sh and change `releaseName`
77+
// 3. Open installer/mac/buildInstaller.sh and change `dmgName`
7878
text = grunt.file.read(buildInstallerScriptPath);
7979
text = safeReplace(
8080
text,
81-
/( Release )([0-9]+)/,
81+
/( Release [0-9]+\.)([0-9]+)/,
8282
"$1" + release
8383
);
8484
grunt.file.write(buildInstallerScriptPath, text);
@@ -92,7 +92,7 @@ module.exports = function (grunt) {
9292
);
9393
text = safeReplace(
9494
text,
95-
/(Release 0\.)([0-9]+)/,
95+
/(Release [0-9]+\.)([0-9]+)/,
9696
"$1" + release
9797
);
9898
grunt.file.write(versionRcPath, text);

0 commit comments

Comments
 (0)