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

chore: fix pre passing to atom.rc (#16311)

Browse source 
* chore: fix pre passing to versionH

* preTypes => preType
This commit is contained in:
Shelley Vohr 2019-01-07 13:41:07 -08:00 • committed by GitHub
parent ff1c90b638
commit 2ac677228d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
script/bump-version.js
View file

@ -12,6 +12,12 @@ const minimist = require('minimist')
const writeFile = promisify(fs.writeFile) const writeFile = promisify(fs.writeFile)
const readFile = promisify(fs.readFile) const readFile = promisify(fs.readFile)
const preType = {
NONE: 'none',
PARTIAL: 'partial',
FULL: 'full'
}
function parseCommandLine () { function parseCommandLine () {
let help let help
const opts = minimist(process.argv.slice(2), { const opts = minimist(process.argv.slice(2), {
@ -164,8 +170,8 @@ async function updateWinRC (components) {
const arr = data.split('\n') const arr = data.split('\n')
arr.forEach((line, idx) => { arr.forEach((line, idx) => {
if (line.includes('FILEVERSION')) { if (line.includes('FILEVERSION')) {
arr[idx] = ` FILEVERSION ${utils.makeVersion(components, ',', true)}` arr[idx] = ` FILEVERSION ${utils.makeVersion(components, ',', preType.PARTIAL)}`
arr[idx + 1] = ` PRODUCTVERSION ${utils.makeVersion(components, ',', true)}` arr[idx + 1] = ` PRODUCTVERSION ${utils.makeVersion(components, ',', preType.PARTIAL)}`
} else if (line.includes('FileVersion')) { } else if (line.includes('FileVersion')) {
arr[idx] = ` VALUE "FileVersion", "${utils.makeVersion(components, '.')}"` arr[idx] = ` VALUE "FileVersion", "${utils.makeVersion(components, '.')}"`
arr[idx + 5] = ` VALUE "ProductVersion", "${utils.makeVersion(components, '.')}"` arr[idx + 5] = ` VALUE "ProductVersion", "${utils.makeVersion(components, '.')}"`

12
script/lib/version-utils.js
View file

@ -8,6 +8,12 @@ const { promisify } = require('util')
const readFile = promisify(fs.readFile) const readFile = promisify(fs.readFile)
const gitDir = path.resolve(__dirname, '..', '..') const gitDir = path.resolve(__dirname, '..', '..')
const preType = {
NONE: 'none',
PARTIAL: 'partial',
FULL: 'full'
}
const getCurrentDate = () => { const getCurrentDate = () => {
const d = new Date() const d = new Date()
const dd = `${d.getDate()}`.padStart(2, '0') const dd = `${d.getDate()}`.padStart(2, '0')
@ -23,9 +29,11 @@ const isStable = v => {
return !!(parsed && parsed.prerelease.length === 0) return !!(parsed && parsed.prerelease.length === 0)
} }
const makeVersion = (components, delim, withPre = false) => { const makeVersion = (components, delim, pre = preType.NONE) => {
let version = [components.major, components.minor, components.patch].join(delim) let version = [components.major, components.minor, components.patch].join(delim)
if (withPre) { if (pre === preType.PARTIAL) {
version += `${delim}${components.pre[1]}`
} else if (pre === preType.FULL) {
version += `-${components.pre[0]}${delim}${components.pre[1]}` version += `-${components.pre[0]}${delim}${components.pre[1]}`
} }
return version return version