Download dependencies only in dist

Don't extract dependencies in dependencies/all, only in dist/dependencies
Remove konan.dependencies property
This commit is contained in:
Ilya Matveev
2017-03-29 15:47:29 +07:00
committed by ilmat192
parent 7f4740130e
commit a906bd0d07
9 changed files with 10 additions and 45 deletions
@@ -59,7 +59,6 @@ abstract class KonanTest extends JavaExec {
void setJvmArgs(Iterable<?> arguments) {
super.setJvmArgs(arguments +
"-Dkonan.home=${dist.canonicalPath}" +
"-Dkonan.dependencies=${dependenciesDir.canonicalPath}" +
"-Djava.library.path=${dist.canonicalPath}/konan/nativelib")
}
@@ -173,7 +173,6 @@ class NamedNativeInteropConfig implements Named {
new File(project.findProject(":Interop:Runtime").buildDir, "nativelibs")
).asPath
systemProperties "konan.home": project.rootProject.file("dist")
systemProperties "konan.dependencies": project.findProject(":dependencies").file("all")
environment "LIBCLANG_DISABLE_CRASH_RECOVERY": "1"
environment "DYLD_LIBRARY_PATH": "${project.llvmDir}/lib"
environment "LD_LIBRARY_PATH": "${project.llvmDir}/lib"