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

Merge pull request #12127 from electron/set-dev-version-everywhere

Browse source 
Use version 0.0.0-dev everywhere
This commit is contained in:
John Kleinschmidt 2018-03-05 12:28:55 -05:00 committed by GitHub
commit 1005a63130
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/resources/mac/Info.plist
View file

@ -17,9 +17,9 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>electron.icns</string> <string>electron.icns</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.8.2</string> <string>0.0.0</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.8.2</string> <string>0.0.0</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string> <string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

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

@ -56,8 +56,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,8,2,2 FILEVERSION 0,0,0,0
PRODUCTVERSION 1,8,2,2 PRODUCTVERSION 0,0,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -74,12 +74,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "GitHub, Inc." VALUE "CompanyName", "GitHub, Inc."
VALUE "FileDescription", "Electron" VALUE "FileDescription", "Electron"
VALUE "FileVersion", "1.8.2" VALUE "FileVersion", "0.0.0"
VALUE "InternalName", "electron.exe" VALUE "InternalName", "electron.exe"
VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved." VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
VALUE "OriginalFilename", "electron.exe" VALUE "OriginalFilename", "electron.exe"
VALUE "ProductName", "Electron" VALUE "ProductName", "Electron"
VALUE "ProductVersion", "1.8.2" VALUE "ProductVersion", "0.0.0"
VALUE "SquirrelAwareVersion", "1" VALUE "SquirrelAwareVersion", "1"
END END
END END

8
atom/common/atom_version.h
View file

@ -5,10 +5,10 @@
#ifndef ATOM_COMMON_ATOM_VERSION_H_ #ifndef ATOM_COMMON_ATOM_VERSION_H_
#define ATOM_COMMON_ATOM_VERSION_H_ #define ATOM_COMMON_ATOM_VERSION_H_
#define ATOM_MAJOR_VERSION 1 #define ATOM_MAJOR_VERSION 0
#define ATOM_MINOR_VERSION 8 #define ATOM_MINOR_VERSION 0
#define ATOM_PATCH_VERSION 2 #define ATOM_PATCH_VERSION 0
#define ATOM_PRE_RELEASE_VERSION -beta.2 #define ATOM_PRE_RELEASE_VERSION -dev
#ifndef ATOM_STRINGIFY #ifndef ATOM_STRINGIFY
#define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n) #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)

2
electron.gyp
View file

@ -4,7 +4,7 @@
'product_name%': 'Electron', 'product_name%': 'Electron',
'company_name%': 'GitHub, Inc', 'company_name%': 'GitHub, Inc',
'company_abbr%': 'github', 'company_abbr%': 'github',
'version%': '1.8.2-beta.2', 'version%': '0.0.0-dev',
'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c', 'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
}, },
'includes': [ 'includes': [