diff --git a/osb/checkOsb.sh b/osb/checkOsb.sh index 84db5384..9ea6548f 100755 --- a/osb/checkOsb.sh +++ b/osb/checkOsb.sh @@ -185,6 +185,7 @@ standardGHProject 'DANDIArchiveShowcase' 'showcase' standardGHProject 'FitzHugh-Nagumo' 'generic' standardGHProject 'hodgkin_huxley_tutorial' 'generic' 'openworm' +standardGHProject 'HindmarshRose1984' 'generic' standardGHProject 'CSAShowcase' 'showcase' standardGHProject 'neuroConstructShowcase' 'showcase' diff --git a/src/ucl/physiol/neuroconstruct/neuron/NeuronFileManager.java b/src/ucl/physiol/neuroconstruct/neuron/NeuronFileManager.java index a0e6bb1e..a694d881 100755 --- a/src/ucl/physiol/neuroconstruct/neuron/NeuronFileManager.java +++ b/src/ucl/physiol/neuroconstruct/neuron/NeuronFileManager.java @@ -5322,7 +5322,12 @@ else if (project.neuronSettings.getGraphicsMode().equals(NeuronSettings.Graphics { String[] options = { - GeneralUtils.DIR_64BIT,GeneralUtils.DIR_I386, GeneralUtils.DIR_I686,GeneralUtils.DIR_POWERPC, GeneralUtils.DIR_UMAC + GeneralUtils.DIR_64BIT, + GeneralUtils.DIR_I386, + GeneralUtils.DIR_I686, + GeneralUtils.DIR_POWERPC, + GeneralUtils.DIR_UMAC, + GeneralUtils.DIR_ARM64 }; for (String o : options) diff --git a/src/ucl/physiol/neuroconstruct/project/ProjectManager.java b/src/ucl/physiol/neuroconstruct/project/ProjectManager.java index 745514ec..a8e7fc5e 100755 --- a/src/ucl/physiol/neuroconstruct/project/ProjectManager.java +++ b/src/ucl/physiol/neuroconstruct/project/ProjectManager.java @@ -311,6 +311,7 @@ else if (activeProject.neuronSettings.isCopySimFiles() && generatedNeuronFiles[i].getName().equals(GeneralUtils.DIR_I386) || generatedNeuronFiles[i].getName().equals(GeneralUtils.DIR_64BIT) || generatedNeuronFiles[i].getName().equals(GeneralUtils.DIR_UMAC) || + generatedNeuronFiles[i].getName().equals(GeneralUtils.DIR_ARM64) || generatedNeuronFiles[i].getName().equals(GeneralUtils.DIR_POWERPC))) { File toDir = new File(dirForSimFiles, generatedNeuronFiles[i].getName()); diff --git a/src/ucl/physiol/neuroconstruct/utils/GeneralUtils.java b/src/ucl/physiol/neuroconstruct/utils/GeneralUtils.java index 58fad7cd..5d38ef76 100755 --- a/src/ucl/physiol/neuroconstruct/utils/GeneralUtils.java +++ b/src/ucl/physiol/neuroconstruct/utils/GeneralUtils.java @@ -69,12 +69,14 @@ public class GeneralUtils public static final String ARCH_64BIT = "amd64"; public static final String ARCH_POWERPC = "ppc"; public static final String ARCH_UMAC = "umac"; + public static final String ARCH_ARM64 = "aarch64"; public static final String DIR_I386 = "i386"; public static final String DIR_I686 = "i686"; public static final String DIR_64BIT = "x86_64"; public static final String DIR_POWERPC = "powerpc"; public static final String DIR_UMAC = "umac"; + public static final String DIR_ARM64 = "arm64"; private static long lastMeasuredMemory = 0; @@ -97,6 +99,11 @@ public GeneralUtils() public static String getArchSpecificDir() { if (!isMacBasedPlatform() && + (System.getProperty("os.arch").equals(ARCH_ARM64))) + { + return DIR_ARM64; + } + else if (!isMacBasedPlatform() && (System.getProperty("os.arch").equals(ARCH_64BIT) || System.getProperty("os.arch").indexOf("64")>=0)) {