diff --git a/packages/py-spinnfrontendcommon/package.py b/packages/py-spinnfrontendcommon/package.py index a85a7d50027d3e9c286aa3d85a39ac9f487b9a4f..3e7856af24265115a40dc66eb1b14f0e8c15952b 100644 --- a/packages/py-spinnfrontendcommon/package.py +++ b/packages/py-spinnfrontendcommon/package.py @@ -6,6 +6,7 @@ from spack.package import * from spack.fetch_strategy import URLFetchStrategy from spack.store import find +import os _JAR_URL = "https://github.com/SpiNNakerManchester/JavaSpiNNaker/releases/download/7.0.0/spinnaker-exe.jar" _JAR_SHA256 = "2d909c7fb3aa15886acf26febb1bd48e25db0c347a231944aa6a5f86107bb55b" @@ -32,8 +33,17 @@ class PySpinnfrontendcommon(PythonPackage): def install(self, spec, prefix): super(PySpinnfrontendcommon, self).install(spec, prefix) + # Work out the python version installed, so we know where to put # the java code! python_spec = find("python@3.7:")[0] - python_lib = f"python{python_spec.version}" - install_tree("JavaSpiNNaker", prefix.lib.join(python_lib).site_packages) + python_version_parts = python_spec.version.split('.') + python_version = ".".join(python_version_parts[0:2]) + python_lib = f"python{python_version}" + site_packages = prefix.lib.join(python_lib).site_packages + install_tree("JavaSpiNNaker", site_packages) + + # Test where things are now installed + for root, dirnames, filenames in os.walk(site_packages): + for filename in filenames: + print(os.path.join(root, filename))