workaround compile server make failures for now

This commit is contained in:
peter
2012-02-09 19:47:18 +01:00
parent 92bec8c9f1
commit 719ec475ee
3 changed files with 14 additions and 8 deletions
+10 -3
View File
@@ -3,9 +3,16 @@ package org.jetbrains.jps
/**
* @author Eugene.Kudelevsky
*/
public interface JavaSdk {
public abstract class JavaSdk extends Sdk {
def JavaSdk(Project project, String name, String jdkPath, Closure initializer) {
super(project, name, initializer)
}
String getJavacExecutable();
JavaSdk(project, name, initializer) {
super(project, name, initializer)
}
String getJavaExecutable();
abstract String getJavacExecutable();
abstract String getJavaExecutable();
}
@@ -3,7 +3,7 @@ package org.jetbrains.jps
/**
* @author nik
*/
class JavaSdkImpl extends Sdk implements JavaSdk {
class JavaSdkImpl extends JavaSdk {
String jdkPath
def JavaSdkImpl(Project project, String name, String jdkPath, Closure initializer) {
@@ -1,20 +1,19 @@
package org.jetbrains.jps.android
import org.jetbrains.jps.JavaSdk
import org.jetbrains.jps.Project
import org.jetbrains.jps.Sdk
import org.jetbrains.jps.JavaSdkImpl
import org.jetbrains.jps.Project
/**
* @author Eugene.Kudelevsky
*/
class AndroidSdk extends Sdk implements JavaSdk {
class AndroidSdk extends JavaSdk {
final String sdkPath;
final String buildTargetHashString;
final String javaSdkName;
AndroidSdk(Project project, String name, String sdkPath, String javaSdkName, String buildTargetHashString) {
super(project, name, {})
super(project, name, '', {})
this.sdkPath = sdkPath
this.buildTargetHashString = buildTargetHashString
this.javaSdkName = javaSdkName;