From ae3cc8f568e4d6c6306a609bb8c6a88c15cc334d Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 16 Mar 2018 11:02:22 +0100 Subject: Workaround for gradle not finding swig when executed from Android Studio --- main/build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'main/build.gradle') diff --git a/main/build.gradle b/main/build.gradle index ad18d002..cf677e5d 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -38,15 +38,20 @@ dependencies { def openvpn3SwigFiles = new File(buildDir, "generated/source/ovpn3swig/ovpn3") task ("generateOpenVPN3Swig" ,type:Exec) { + def swigcmd = "swig" + // Workaround for Mac OS X since it otherwise does not find swig and I cannot get + // the Exec task to respect the PATH environment :( + if (file("/usr/local/bin/swig").exists()) + swigcmd = "/usr/local/bin/swig" + doFirst { mkdir openvpn3SwigFiles } - commandLine "swig", "-outdir", openvpn3SwigFiles, "-outcurrentdir", "-c++", "-java", "-package", "net.openvpn.ovpn3", + commandLine swigcmd, "-outdir", openvpn3SwigFiles, "-outcurrentdir", "-c++", "-java", "-package", "net.openvpn.ovpn3", "-Isrc/main/cpp/openvpn3/client", "-Isrc/main/cpp/openvpn3/", "-o", "${openvpn3SwigFiles}/ovpncli_wrap.cxx", "-oh", "${openvpn3SwigFiles}/ovpncli_wrap.h", "src/main/cpp/openvpn3/javacli/ovpncli.i" - environment 'PATH', "${environment.PATH}:/usr/local/bin/" - +\ } android { -- cgit v1.2.3