Browse Source

Bump v2.1.0-unsupported.20180809

John Kleinschmidt 6 years ago
parent
commit
9d1e7a7a65

+ 2 - 2
atom/browser/resources/mac/Info.plist

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

+ 2 - 2
atom/browser/resources/win/atom.rc

@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0-unsupported-20180809,0
- PRODUCTVERSION 2,1,0-unsupported-20180809,0
+ FILEVERSION 2,1,0,20180809
+ PRODUCTVERSION 2,1,0,20180809
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

+ 2 - 2
atom/common/atom_version.h

@@ -7,8 +7,8 @@
 
 #define ATOM_MAJOR_VERSION 2
 #define ATOM_MINOR_VERSION 1
-#define ATOM_PATCH_VERSION 0-unsupported-20180809
-// #define ATOM_PRE_RELEASE_VERSION
+#define ATOM_PATCH_VERSION 0
+#define ATOM_PRE_RELEASE_VERSION -unsupported.20180809
 
 #ifndef ATOM_STRINGIFY
 #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "2.1.0-unsupported-20180809",
+  "version": "2.1.0-unsupported.20180809",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

+ 9 - 2
script/bump-version.py

@@ -72,10 +72,17 @@ def main():
     versions[3] = '0'
 
   if args.new_version != None:
-    versions = parse_version(re.sub('-beta', '', args.new_version))
+    clean_version = re.sub('-beta', '', args.new_version)
+    clean_version = re.sub('-unsupported', '', clean_version)
+    versions = parse_version(clean_version)
 
   version = '.'.join(versions[:3])
-  suffix = '' if versions[3] == '0' else '-beta.' + versions[3]
+  suffix = ''
+
+  if args.new_version != None and '-unsupported' in args.new_version:
+    suffix = '-unsupported.' + versions[3]
+  elif versions[3] != '0':
+    suffix = '-beta.' + versions[3]
 
   if args.dry_run:
     print 'new version number would be: {0}\n'.format(version + suffix)