From f6471f4f3668d236211d3d3e353852f0bc3a20ea Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Tue, 9 Apr 2013 08:07:21 -0400 Subject: [PATCH] Use semantic versions. --- build/release.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/release.js b/build/release.js index d2bff0f16..f29673aca 100644 --- a/build/release.js +++ b/build/release.js @@ -65,8 +65,8 @@ function initialize( next ) { // First arg should be the version number being released var newver, oldver, - rversion = /^(\d)\.(\d+)\.(\d)((?:a|b|rc)\d|pre)?$/, - version = ( process.argv[3] || "" ).toLowerCase().match( rversion ) || {}, + rsemver = /^(\d+)\.(\d+)\.(\d+)(?:-([\dA-Za-z\-]+(?:\.[\dA-Za-z\-]+)*))?$/, + version = ( process.argv[3] || "" ).toLowerCase().match( rsemver ) || {}, major = version[1], minor = version[2], patch = version[3], @@ -88,14 +88,14 @@ function initialize( next ) { pkg = JSON.parse( fs.readFileSync( "package.json" ) ); console.log( "Current version is " + pkg.version + "; generating release " + releaseVersion ); - version = pkg.version.match( rversion ); + version = pkg.version.match( rsemver ); oldver = ( +version[1] ) * 10000 + ( +version[2] * 100 ) + ( +version[3] ) newver = ( +major ) * 10000 + ( +minor * 100 ) + ( +patch ); if ( newver < oldver ) { die( "Next version is older than current version!" ); } - nextVersion = major + "." + minor + "." + ( isBeta ? patch : +patch + 1 ) + "pre"; + nextVersion = major + "." + minor + "." + ( isBeta ? patch : +patch + 1 ) + "-pre"; next(); } -- 2.39.5