Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed obsolete Java version checker and Main5 classes and removed t…

…hem from the build process
  • Loading branch information...
commit 453423934d8c38d87c1030c773d1df2be2c07d96 1 parent 345b50c
@quintesse quintesse authored
View
35 bootstrap/src/main/java/ceylon/modules/bootstrap/Java7Checker.java
@@ -1,35 +0,0 @@
-/*
- * Copyright 2012 Red Hat inc. and third party contributors as noted
- * by the author tags.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ceylon.modules.bootstrap;
-
-public class Java7Checker {
-
- public static void check() {
- String version = System.getProperty("java.version");
- if(version == null || version.isEmpty()){
- System.err.println("Unable to determine Java version (java.version property missing or empty). Aborting.");
- System.exit(1);
- }
- if(!version.startsWith("1.7")){
- System.err.println("Your Java version is not supported: "+version);
- System.err.println("Ceylon needs Java 7. Please install it from http://www.java.com");
- System.err.println("Aborting.");
- System.exit(1);
- }
- }
-
-}
View
24 bootstrap/src/main/java/ceylon/modules/bootstrap/Main5.java
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012 Red Hat inc. and third party contributors as noted
- * by the author tags.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ceylon.modules.bootstrap;
-
-public class Main5 {
- public static void main(String[] args) throws Throwable{
- Java7Checker.check();
- org.jboss.modules.Main.main(args);
- }
-}
View
15 build.xml
@@ -178,21 +178,6 @@
destdir="${build.classes}"
classpathref="compiler.classpath"
includeantruntime="false"/>
- <!-- Need an extra pass for Java 7 testing -->
- <delete dir="${build.classes}">
- <include name="**/*Main5.class"/>
- <include name="**/Java7Checker.class"/>
- </delete>
- <javac debug="true"
- srcdir="${runtime-bootstrap.src}"
- destdir="${build.classes}"
- classpathref="compiler.classpath"
- source="1.5"
- target="1.5"
- includeantruntime="false">
- <include name="**/*Main5.java"/>
- <include name="**/Java7Checker.java"/>
- </javac>
<!-- Include META-INF -->
<copy todir="${build.classes}">
<fileset dir="${runtime-bootstrap.src}" excludes="**/*.java"/>
Please sign in to comment.
Something went wrong with that request. Please try again.