Commits
md_5 authored 5068da3ba10
| 89 89 | } |
| 90 90 | System.out.println( "Loading BuildTools version: " + buildVersion + " (#" + buildNumber + ")" ); |
| 91 91 | |
| 92 92 | OptionParser parser = new OptionParser(); |
| 93 93 | OptionSpec<Void> disableCertFlag = parser.accepts( "disable-certificate-check" ); |
| 94 94 | OptionSpec<Void> dontUpdateFlag = parser.accepts( "dont-update" ); |
| 95 95 | OptionSpec<Void> skipCompileFlag = parser.accepts( "skip-compile" ); |
| 96 96 | OptionSpec<Void> generateSourceFlag = parser.accepts( "generate-source" ); |
| 97 97 | OptionSpec<Void> generateDocsFlag = parser.accepts( "generate-docs" ); |
| 98 98 | OptionSpec<Void> devFlag = parser.accepts( "dev" ); |
| 99 + | OptionSpec<String> jenkinsVersion = parser.accepts( "rev" ).withRequiredArg().defaultsTo( "latest" ); |
| 99 100 | |
| 100 101 | OptionSet options = parser.parse( args ); |
| 101 102 | |
| 102 103 | if ( options.has( disableCertFlag ) ) |
| 103 104 | { |
| 104 105 | disableHttpsCertificateCheck(); |
| 105 106 | } |
| 106 107 | dontUpdate = options.has( dontUpdateFlag ); |
| 107 108 | skipCompile = options.has( skipCompileFlag ); |
| 108 109 | generateSource = options.has( generateSourceFlag ); |
| 188 189 | Git craftBukkitGit = Git.open( craftBukkit ); |
| 189 190 | Git spigotGit = Git.open( spigot ); |
| 190 191 | Git buildGit = Git.open( buildData ); |
| 191 192 | |
| 192 193 | BuildInfo buildInfo = new BuildInfo( "Dev Build", "Development", 0, new BuildInfo.Refs( "master", "master", "master", "master" ) ); |
| 193 194 | |
| 194 195 | if ( !dontUpdate ) |
| 195 196 | { |
| 196 197 | if ( !dev ) |
| 197 198 | { |
| 198 - | System.out.println( "Checking for latest version:" ); |
| 199 + | String askedVersion = options.valueOf( jenkinsVersion ); |
| 200 + | System.out.println( "Attempting to build version: '" + askedVersion + "' use --rev <version> to override" ); |
| 199 201 | |
| 200 202 | String verInfo; |
| 201 203 | try |
| 202 204 | { |
| 203 - | verInfo = get( "https://hub.spigotmc.org/versions/latest.json" ); |
| 205 + | verInfo = get( "https://hub.spigotmc.org/versions/" + askedVersion + ".json" ); |
| 204 206 | } catch ( IOException ex ) |
| 205 207 | { |
| 206 - | System.err.println( "Could not get latest version" ); |
| 208 + | System.err.println( "Could not get version " + askedVersion + " does it exist? Try another version or use 'latest'" ); |
| 207 209 | ex.printStackTrace(); |
| 208 210 | return; |
| 209 211 | } |
| 210 - | System.out.println( "Found latest version" ); |
| 212 + | System.out.println( "Found version" ); |
| 211 213 | System.out.println( verInfo ); |
| 212 214 | |
| 213 215 | buildInfo = new Gson().fromJson( verInfo, BuildInfo.class ); |
| 214 216 | |
| 215 217 | if ( buildNumber != -1 && buildInfo.getToolsVersion() != -1 && buildNumber < buildInfo.getToolsVersion() ) |
| 216 218 | { |
| 217 219 | System.err.println( "**** Your BuildTools is out of date and will not build the requested version. Please grab a new copy from http://www.spigotmc.org/" ); |
| 218 220 | System.exit( 1 ); |
| 219 221 | } |
| 220 222 | } |