@@ -64,10 +64,19 @@ target(processAuth:"Prompts user for login details to create authentication mana usr = usr+".default" psw = psw+".default" } - ant.input(message:"Please enter your SVN username:", addproperty:usr) - ant.input(message:"Please enter your SVN password:", addproperty:psw) - def username = ant.antProject.getProperty(usr) - def password = ant.antProject.getProperty(psw) + + def (username, password) = [argsMap.username, argsMap.password] + + if (!username) { + ant.input(message:"Please enter your SVN username:", addproperty:usr) + username = ant.antProject.getProperty(usr) + } + + if (!password) { + ant.input(message:"Please enter your SVN password:", addproperty:psw) + password = ant.antProject.getProperty(psw) + } + authManager = SVNWCUtil.createDefaultAuthenticationManager( username , password ) authManagerMap.put(authKey,authManager) } @@ -106,6 +115,10 @@ target(releasePlugin: "The implementation target") { } processAuth() + if (argsMap.message) { + commitMessage = argsMap.message + } + if(argsMap.repository) { configureRepositoryForName(argsMap.repository, "distribution") } @@ -238,7 +251,7 @@ target(modifyOrCreatePluginList:"Updates the remote plugin.xml descriptor or cre def publisher = new DefaultPluginPublisher(remoteRevision, pluginSVN) def updatedList = publisher.publishRelease(pluginName, new FileSystemResource(pluginsListFile), !skipLatest) - pluginsListFile.withWriter { w -> + pluginsListFile.withWriter("UTF-8") { w -> publisher.writePluginList(updatedList, w) } } @@ -487,9 +500,6 @@ target(tagPluginRelease:"Tags a plugin-in with the LATEST_RELEASE tag and versio // Get remote URL for this working copy. def wcClient = new SVNWCClient((ISVNAuthenticationManager) authManager, null) def copyFromUrl = trunk - if (new File(grailsSettings.baseDir, ".svn").exists()) { - copyFromUrl = wcClient.doInfo(new File("."), SVNRevision.WORKING).URL - } // First tag this release with the version number. try { grails/scripts/ReleasePlugin.groovy e5505ac0dde8cfbd8b9c3f72d9780bb3690efdde 35185f406048a97d440d0b8e64d1d9285c481d48 Graeme Rocher graeme.rocher@gmail.com http://github.com/grails/grails/commit/d45a150533103ff77ce539f7d700ac1579d42d2d d45a150533103ff77ce539f7d700ac1579d42d2d 2009-11-10T04:58:21-08:00 2009-11-10T04:58:21-08:00 Merge commit 'lukedaley/release-plugin-fixes-take-2' 5a834942202a8cb860537e25578321698f211419 Graeme Rocher graeme.rocher@gmail.com