diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-01-18 19:25:30 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-01-18 19:25:30 +0100 |
| commit | f5e65b08194d57c5e2f2b814585298c947f0ceee (patch) | |
| tree | f77630beefe256c82b5c07aeb48b55cde256ea68 /build | |
| parent | 4d77ca3e2113689bb4e2ce5cf9152dca7f3811d8 (diff) | |
| parent | a63c0910a6ebcc45ae2c0af7a5ae0840d4eab903 (diff) | |
| download | jquery-ui-f5e65b08194d57c5e2f2b814585298c947f0ceee.tar.gz jquery-ui-f5e65b08194d57c5e2f2b814585298c947f0ceee.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'build')
| -rw-r--r-- | build/release/release.js | 2 | ||||
| -rw-r--r-- | build/tasks/build.js | 11 | ||||
| -rw-r--r-- | build/tasks/testswarm.js | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/build/release/release.js b/build/release/release.js index 3470b6575..2eab5283f 100644 --- a/build/release/release.js +++ b/build/release/release.js @@ -121,7 +121,7 @@ function getVersions() { // TODO: handle 1.10.0 // Also see comment above about pre-releases - if ( minor === 0 ) { + if ( patch === 0 ) { abort( "This script is not smart enough to handle the 1.10.0 release." ); } diff --git a/build/tasks/build.js b/build/tasks/build.js index 18e427a56..75cbca4a0 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -175,9 +175,10 @@ grunt.registerMultiTask( "md5", "Create list of md5 hashes for CDN uploads", fun }); grunt.registerTask( "generate_themes", function() { - var download, files, done, + var download, files, done, configContent, target = "dist/" + grunt.template.process( grunt.config( "files.themes" ), grunt.config() ) + "/", - distFolder = "dist/" + grunt.template.process( grunt.config( "files.dist" ), grunt.config() ); + distFolder = "dist/" + grunt.template.process( grunt.config( "files.dist" ), grunt.config() ), + configFile = "node_modules/download.jqueryui.com/config.json"; try { require.resolve( "download.jqueryui.com" ); } catch( error ) { @@ -186,8 +187,12 @@ grunt.registerTask( "generate_themes", function() { // copy release files into download builder to avoid cloning again grunt.file.expandFiles( distFolder + "/**" ).forEach(function( file ) { - grunt.file.copy( file, "node_modules/download.jqueryui.com/release/" + file.replace(/^dist/, "") ); + grunt.file.copy( file, "node_modules/download.jqueryui.com/release/" + file.replace(/^dist\/jquery-ui-/, "") ); }); + // make it look for the right version + configContent = grunt.file.readJSON( configFile ); + configContent.jqueryUi.stable.version = grunt.config( "pkg.version" ); + grunt.file.write( configFile, JSON.stringify( configContent, null, "\t" ) + "\n" ); download = new ( require( "download.jqueryui.com" ) )(); diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index 838751fc7..0f23b3505 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -4,6 +4,7 @@ module.exports = function( grunt ) { var versions = { "git": "git", + "1.9": "1.9.0", "1.8": "1.8.0 1.8.1 1.8.2 1.8.3", "1.7": "1.7 1.7.1 1.7.2", "1.6": "1.6 1.6.1 1.6.2 1.6.3 1.6.4" |