From 02125ff9bd8745c20c1d0ce1213441d2ea8c839b Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 23 Jan 2014 15:35:09 -0500 Subject: [PATCH 1/3] Set sprint 37 --- appshell/mac/Info.plist | 4 ++-- appshell/version.rc | 4 ++-- installer/mac/buildInstaller.sh | 2 +- installer/win/brackets-win-install-build.xml | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appshell/mac/Info.plist b/appshell/mac/Info.plist index d5efbc963..16540f5e0 100644 --- a/appshell/mac/Info.plist +++ b/appshell/mac/Info.plist @@ -19,9 +19,9 @@ CFBundleSignature ???? CFBundleVersion - 0.36.0 + 0.37.0 CFBundleShortVersionString - 0.36.0 + 0.37.0 NSMainNibFile MainMenu NSPrincipalClass diff --git a/appshell/version.rc b/appshell/version.rc index 90496d0a3..8516d8eb8 100644 --- a/appshell/version.rc +++ b/appshell/version.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,36,0,0 +FILEVERSION 0,37,0,0 /* PRODUCTVERSION 1,0,0,0 */ FILEOS VOS__WINDOWS32 FILETYPE VFT_APP @@ -43,7 +43,7 @@ BEGIN BEGIN VALUE "CompanyName", "brackets.io\0" VALUE "FileDescription", "\0" - VALUE "FileVersion", "Sprint 36\0" + VALUE "FileVersion", "Sprint 37\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 3b32158c7..6c9d905f9 100755 --- a/installer/mac/buildInstaller.sh +++ b/installer/mac/buildInstaller.sh @@ -2,7 +2,7 @@ # config releaseName="Brackets" -dmgName="${releaseName} Sprint 36" +dmgName="${releaseName} Sprint 37" format="bzip2" encryption="none" tmpLayout="./dropDmgConfig/layouts/tempLayout" diff --git a/installer/win/brackets-win-install-build.xml b/installer/win/brackets-win-install-build.xml index 6a4431f4c..1af985ec8 100644 --- a/installer/win/brackets-win-install-build.xml +++ b/installer/win/brackets-win-install-build.xml @@ -11,7 +11,7 @@ default="build.mul"> - + diff --git a/package.json b/package.json index 5834c3c24..61921e3be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Brackets-Shell", - "version": "0.36.0-0", + "version": "0.37.0-0", "homepage": "http://brackets.io", "issues": { "url": "http://github.com/adobe/brackets-shell/issues" From 7bde0558becbf073ef650135003c8cc2779c3fda Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 24 Jan 2014 11:10:41 -0800 Subject: [PATCH 2/3] rename brackets-node.exe to node.exe --- Gruntfile.js | 2 +- appshell.gyp | 2 +- appshell/config.h | 2 +- tasks/setup.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 53c1a8066..f205a5f17 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -100,7 +100,7 @@ module.exports = function (grunt) { "locales/**", "node-core/**", "Brackets.exe", - "Brackets-node.exe", + "node.exe", "cef.pak", "devtools_resources.pak", "icudt.dll", diff --git a/appshell.gyp b/appshell.gyp index 84f9ee897..2d5f4012f 100755 --- a/appshell.gyp +++ b/appshell.gyp @@ -103,7 +103,7 @@ { # Copy node executable to the output directory 'destination': '<(PRODUCT_DIR)', - 'files': ['deps/node/Brackets-node.exe'], + 'files': ['deps/node/node.exe'], }, { # Copy node server files to the output directory diff --git a/appshell/config.h b/appshell/config.h index 37fb01ec0..86f38870c 100644 --- a/appshell/config.h +++ b/appshell/config.h @@ -36,7 +36,7 @@ #define WINDOW_TITLE APP_NAME // Paths for node resources are relative to the location of the appshell executable -#define NODE_EXECUTABLE_PATH "Brackets-node.exe" +#define NODE_EXECUTABLE_PATH "node.exe" #define NODE_CORE_PATH "node-core" #define FIRST_INSTANCE_MUTEX_NAME (APP_NAME L".Shell.Instance") #endif diff --git a/tasks/setup.js b/tasks/setup.js index 6c6261c7f..1bacf1f5f 100644 --- a/tasks/setup.js +++ b/tasks/setup.js @@ -255,7 +255,7 @@ module.exports = function (grunt) { grunt.file.mkdir("deps/node"); // copy node.exe to Brackets-node - grunt.file.copy(exeFile, "deps/node/Brackets-node.exe"); + grunt.file.copy(exeFile, "deps/node/node.exe"); // unzip NPM unzip(npmFile, "deps/node").then(function () { From 325f50cf4bb683220b95ffcb08fc83a005f3638b Mon Sep 17 00:00:00 2001 From: Bryan Chin Date: Wed, 29 Jan 2014 10:49:57 -0600 Subject: [PATCH 3/3] reversing changes to Sprint 37 version for release branch --- appshell/mac/Info.plist | 4 ++-- appshell/version.rc | 4 ++-- installer/mac/buildInstaller.sh | 2 +- installer/win/brackets-win-install-build.xml | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appshell/mac/Info.plist b/appshell/mac/Info.plist index 16540f5e0..d5efbc963 100644 --- a/appshell/mac/Info.plist +++ b/appshell/mac/Info.plist @@ -19,9 +19,9 @@ CFBundleSignature ???? CFBundleVersion - 0.37.0 + 0.36.0 CFBundleShortVersionString - 0.37.0 + 0.36.0 NSMainNibFile MainMenu NSPrincipalClass diff --git a/appshell/version.rc b/appshell/version.rc index 8516d8eb8..90496d0a3 100644 --- a/appshell/version.rc +++ b/appshell/version.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,37,0,0 +FILEVERSION 0,36,0,0 /* PRODUCTVERSION 1,0,0,0 */ FILEOS VOS__WINDOWS32 FILETYPE VFT_APP @@ -43,7 +43,7 @@ BEGIN BEGIN VALUE "CompanyName", "brackets.io\0" VALUE "FileDescription", "\0" - VALUE "FileVersion", "Sprint 37\0" + VALUE "FileVersion", "Sprint 36\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 6c9d905f9..3b32158c7 100755 --- a/installer/mac/buildInstaller.sh +++ b/installer/mac/buildInstaller.sh @@ -2,7 +2,7 @@ # config releaseName="Brackets" -dmgName="${releaseName} Sprint 37" +dmgName="${releaseName} Sprint 36" format="bzip2" encryption="none" tmpLayout="./dropDmgConfig/layouts/tempLayout" diff --git a/installer/win/brackets-win-install-build.xml b/installer/win/brackets-win-install-build.xml index 1af985ec8..6a4431f4c 100644 --- a/installer/win/brackets-win-install-build.xml +++ b/installer/win/brackets-win-install-build.xml @@ -11,7 +11,7 @@ default="build.mul"> - + diff --git a/package.json b/package.json index 61921e3be..5834c3c24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Brackets-Shell", - "version": "0.37.0-0", + "version": "0.36.0-0", "homepage": "http://brackets.io", "issues": { "url": "http://github.com/adobe/brackets-shell/issues"