rusefi
/
jSerialComm
mirror of https://github.com/rusefi/jSerialComm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add hard-float check and allow users to specify their Linux architecture

This commit is contained in:
hedgecrw85 2018-08-20 10:26:13 -05:00
parent c8104123ae
commit 104c329921
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/fazecast/jSerialComm/SerialPort.java
View File

@ -2,7 +2,7 @@
* SerialPort.java * SerialPort.java
* *
* Created on: Feb 25, 2012 * Created on: Feb 25, 2012
* Last Updated on: Aug 08, 2018 * Last Updated on: Aug 20, 2018
* Author: Will Hedgecock * Author: Will Hedgecock
* *
* Copyright (C) 2012-2018 Fazecast, Inc. * Copyright (C) 2012-2018 Fazecast, Inc.
@ -120,7 +120,9 @@ public final class SerialPort
} }
else if ((OS.indexOf("nix") >= 0) || (OS.indexOf("nux") >= 0)) else if ((OS.indexOf("nix") >= 0) || (OS.indexOf("nux") >= 0))
{ {
if (System.getProperty("os.arch").indexOf("arm") >= 0) if (!System.getProperty("os.arch_full").isEmpty())
libraryPath = "Linux/" + System.getProperty("os.arch_full").toLowerCase();
else if (System.getProperty("os.arch").indexOf("arm") >= 0)
{ {
// Determine the specific ARM architecture of this device // Determine the specific ARM architecture of this device
try try
@ -154,13 +156,26 @@ public final class SerialPort
try try
{ {
File linkerFile = new File("/lib/ld-linux-armhf.so.3"); File linkerFile = new File("/lib/ld-linux-armhf.so.3");
ProcessBuilder pb = new ProcessBuilder("/bin/sh", "-c", "ldd /usr/bin/ld | grep ld-"); if (linkerFile.exists())
Process p = pb.start();
p.waitFor();
BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
String linkLoader = br.readLine();
if (linkerFile.exists() || linkLoader.contains("armhf"))
libraryPath += "-hf"; libraryPath += "-hf";
else
{
ProcessBuilder pb = new ProcessBuilder("/bin/sh", "-c", "ls /lib/ld-linux*");
Process p = pb.start();
p.waitFor();
BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
if (br.readLine().contains("armhf"))
libraryPath += "-hf";
else
{
pb = new ProcessBuilder("/bin/sh", "-c", "ldd /usr/bin/ld | grep ld-");
p = pb.start();
p.waitFor();
br = new BufferedReader(new InputStreamReader(p.getInputStream()));
if (br.readLine().contains("armhf"))
libraryPath += "-hf";
}
}
} }
catch (Exception e) { e.printStackTrace(); } catch (Exception e) { e.printStackTrace(); }
} }