mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #173 from atom/cj-fix-release-name

Browse source 
Parse the 4th argument into a date.
This commit is contained in:
Cheng Zhao 2014-02-03 16:58:53 -08:00
commit dc69c7b694
6 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
browser/api/lib/auto-updater.coffee
View file

@ -5,7 +5,7 @@ AutoUpdater::__proto__ = EventEmitter.prototype
autoUpdater = new AutoUpdater autoUpdater = new AutoUpdater
autoUpdater.on 'update-downloaded-raw', (args...) -> autoUpdater.on 'update-downloaded-raw', (args...) ->
args[2] = new Date(args[2]) # releaseDate args[3] = new Date(args[3]) # releaseDate
@emit 'update-downloaded', args..., => @quitAndInstall() @emit 'update-downloaded', args..., => @quitAndInstall()
module.exports = autoUpdater module.exports = autoUpdater

2
browser/auto_updater_mac.mm
View file

@ -14,6 +14,8 @@
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "browser/auto_updater_delegate.h" #include "browser/auto_updater_delegate.h"
#include <iostream>
namespace auto_updater { namespace auto_updater {
namespace { namespace {

2
browser/resources/mac/Info.plist
View file

@ -11,7 +11,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>atom.icns</string> <string>atom.icns</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.9.0</string> <string>0.9.1</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string>MainMenu</string> <string>MainMenu</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>

8
browser/resources/win/atom.rc
View file

@ -50,8 +50,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,0,0 FILEVERSION 0,9,1,0
PRODUCTVERSION 0,9,0,0 PRODUCTVERSION 0,9,1,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -68,12 +68,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "GitHub, Inc." VALUE "CompanyName", "GitHub, Inc."
VALUE "FileDescription", "Atom-Shell" VALUE "FileDescription", "Atom-Shell"
VALUE "FileVersion", "0.9.0" VALUE "FileVersion", "0.9.1"
VALUE "InternalName", "atom.exe" VALUE "InternalName", "atom.exe"
VALUE "LegalCopyright", "Copyright (C) 2013 GitHub, Inc. All rights reserved." VALUE "LegalCopyright", "Copyright (C) 2013 GitHub, Inc. All rights reserved."
VALUE "OriginalFilename", "atom.exe" VALUE "OriginalFilename", "atom.exe"
VALUE "ProductName", "Atom-Shell" VALUE "ProductName", "Atom-Shell"
VALUE "ProductVersion", "0.9.0" VALUE "ProductVersion", "0.9.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
common/atom_version.h
View file

@ -7,7 +7,7 @@
#define ATOM_MAJOR_VERSION 0 #define ATOM_MAJOR_VERSION 0
#define ATOM_MINOR_VERSION 9 #define ATOM_MINOR_VERSION 9
#define ATOM_PATCH_VERSION 0 #define ATOM_PATCH_VERSION 1
#define ATOM_VERSION_IS_RELEASE 1 #define ATOM_VERSION_IS_RELEASE 1

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "atom-shell", "name": "atom-shell",
"version": "0.9.0", "version": "0.9.1",
"devDependencies": { "devDependencies": {
"coffee-script": "~1.6.3", "coffee-script": "~1.6.3",