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

Fix spots where Sprint -> Release wasn't done properly #466

Merged
merged 2 commits into from
Sep 18, 2014
Merged

Fix spots where Sprint -> Release wasn't done properly #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd64ac1
Fix spots where Sprint -> Release wasn't done properly
Sep 11, 2014
af2f146
Merge remote-tracking branch 'upstream/master' into sprint-to-release…
Sep 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installer/mac/buildInstaller.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# config
releaseName="Brackets"
dmgName="${releaseName} Release 44"
dmgName="${releaseName} Release 0.44"
format="bzip2"
encryption="none"
tmpLayout="./dropDmgConfig/layouts/tempLayout"
Expand Down
4 changes: 2 additions & 2 deletions installer/win/README.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
7 changes: 4 additions & 3 deletions installer/win/brackets-win-install-build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand Down
6 changes: 4 additions & 2 deletions tasks/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down
10 changes: 5 additions & 5 deletions tasks/set-release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down