Commits

md_5 authored 2cb26df8927
Exit 1 if we fail in the build process
No tags

src/main/java/org/spigotmc/builder/Builder.java

Modified
42 42 public static final File CWD = new File( "." );
43 43 public static final String MC_VERSION = "1.8";
44 44 private static final File jacobeDir = new File( "jacobe" );
45 45
46 46 public static void main(String[] args) throws Exception
47 47 {
48 48 if ( IS_MAC )
49 49 {
50 50 System.out.println( "Sorry, but Macintosh is not currently a supported platform for compilation at this time." );
51 51 System.out.println( "Please run this script on a Windows or Linux PC and then copy the jars to this computer." );
52 - return;
52 + System.exit( 1 );
53 53 }
54 54
55 55 try
56 56 {
57 57 runProcess( "bash -c exit", CWD );
58 58 } catch ( Exception ex )
59 59 {
60 60 System.out.println( "You must run this jar through bash (msysgit)" );
61 - return;
61 + System.exit( 1 );
62 62 }
63 63
64 64 try
65 65 {
66 66 runProcess( "git config --global user.name", CWD );
67 67 } catch ( Exception ex )
68 68 {
69 69 System.out.println( "Git name not set, setting it to default value." );
70 70 runProcess( "git config --global user.name BuildTools", CWD );
71 71 }
266 266 try
267 267 {
268 268 runProcess( "bash applyPatches.sh", spigot );
269 269 System.out.println( "*** Spigot patches applied!" );
270 270 System.out.println( "Compiling Spigot & Spigot-API" );
271 271 runProcess( mvnCmd + " clean install", spigot );
272 272 } catch ( Exception ex )
273 273 {
274 274 System.err.println( "Error compiling Spigot, are you running this jar via msysgit?" );
275 275 ex.printStackTrace();
276 + System.exit( 1 );
276 277 }
277 278 }
278 279
279 280 public static void getJacobe() throws Exception
280 281 {
281 282 if ( IS_WINDOWS )
282 283 {
283 284 File jacobeWindows = new File( "jacobe.win32.zip" );
284 285 download( "http://www.tiobe.com/content/products/jacobe/jacobe.win32.zip", jacobeWindows );
285 286 unzip( jacobeWindows, jacobeDir );

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut