MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle/C++: workaround NoClassDefFoundError sometimes happened on CI windows10 agent with MSVC 2017

Browse Source
This commit is contained in:
Vladislav.Soroka
2018-05-04 08:22:53 +03:00
parent fe7f3abf01
commit c3db87f30d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/native/tooling/src/builder/CppModelBuilder.java
+8 -4
View File
@@ -26,7 +26,6 @@ import org.gradle.nativeplatform.toolchain.Clang;
import org.gradle.nativeplatform.toolchain.Gcc;
import org.gradle.nativeplatform.toolchain.NativeToolChain;
import org.gradle.nativeplatform.toolchain.VisualCpp;
import org.gradle.nativeplatform.toolchain.internal.NativeLanguageTools;
import org.gradle.nativeplatform.toolchain.internal.PlatformToolProvider;
import org.gradle.nativeplatform.toolchain.internal.ToolType;
import org.gradle.nativeplatform.toolchain.internal.tools.CommandLineToolSearchResult;
@@ -46,6 +45,7 @@ import org.jetbrains.plugins.gradle.tooling.ModelBuilderService;
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.*;
/**
@@ -196,9 +196,13 @@ public class CppModelBuilder implements ModelBuilderService {
Field visualCppField = toolProvider.getClass().getDeclaredField("visualCpp");
visualCppField.setAccessible(true);
Object visualCpp = visualCppField.get(toolProvider);
if (visualCpp instanceof NativeLanguageTools) {
return ((NativeLanguageTools)visualCpp).getCompilerExecutable();
}
//if (visualCpp instanceof NativeLanguageTools) {
// return ((NativeLanguageTools)visualCpp).getCompilerExecutable();
//}
Method getCompilerExecutable = visualCpp.getClass().getMethod("getCompilerExecutable");
Object compilerExecutable = getCompilerExecutable.invoke(visualCpp);
return (File)compilerExecutable;
}
}
}