summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-01-06 09:44:23 +1100
committermd_5 <git@md-5.net>2015-01-06 09:44:23 +1100
commit2bc3c93e18b86de809e055b7cdbdb8cc091f438c (patch)
tree444e0952cf4844c125beb8264a80d3dd6e7c88ad
parenta48f9fafe5daefed9f706b8655f1b78b6275939f (diff)
downloadbuildtools-2bc3c93e18b86de809e055b7cdbdb8cc091f438c.tar
buildtools-2bc3c93e18b86de809e055b7cdbdb8cc091f438c.tar.gz
buildtools-2bc3c93e18b86de809e055b7cdbdb8cc091f438c.tar.lz
buildtools-2bc3c93e18b86de809e055b7cdbdb8cc091f438c.tar.xz
buildtools-2bc3c93e18b86de809e055b7cdbdb8cc091f438c.zip
Finish up Mac OSX support, require Java 7 for BuildTools.
Support for Java 6 ended over a year ago, plus SpecialSource-2 requires it.
-rw-r--r--src/main/java/org/spigotmc/builder/Builder.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java
index 4973335..aa90137 100644
--- a/src/main/java/org/spigotmc/builder/Builder.java
+++ b/src/main/java/org/spigotmc/builder/Builder.java
@@ -55,7 +55,6 @@ public class Builder
public static final String LOG_FILE = "BuildTools.log.txt";
public static final boolean IS_WINDOWS = System.getProperty( "os.name" ).startsWith( "Windows" );
- public static final boolean IS_MAC = System.getProperty( "os.name" ).startsWith( "Mac" );
public static final File CWD = new File( "." );
public static final String MC_VERSION = "1.8";
private static boolean dontUpdate;
@@ -81,12 +80,11 @@ public class Builder
logOutput();
- if ( IS_MAC && !Boolean.getBoolean( "mac.supported" ) )
+ if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 )
{
- System.out.println( "Sorry, but Macintosh is not currently a supported platform for compilation at this time." );
- System.out.println( "If you feel like testing Macintosh support please run this script with the -Dmac.supported=true option." );
- System.out.println( "Else please run this script on a Windows or Linux PC and then copy the jars to this computer." );
- System.exit( 1 );
+ System.err.println( "*** ERROR *** BuildTools should be run with Java 7 or above." );
+ System.err.println( "*** ERROR *** Use java -version to check your Java version." );
+ return;
}
try