Skip to content

64-bit improvements #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drebbe-intrepid merged 6 commits into from
Dec 8, 2023
Merged

64-bit improvements #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43fc831
fixed NeoDevice._Handle on 64-bit
drebbe-intrepid Sep 8, 2023
6402d65
added formatting config
drebbe-intrepid Sep 8, 2023
0e9f7ba
apply formatting
drebbe-intrepid Sep 8, 2023
a65f1aa
update ciwheel version
drebbe-intrepid Dec 6, 2023
1218156
updated macos version
drebbe-intrepid Dec 6, 2023
515ed36
Merge branch '64-bit-support' of github.com:intrepidcs/python_ics int…
drebbe-intrepid Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, macOS-11]
os: [ubuntu-20.04, windows-2019, macOS-13]

steps:
- uses: actions/checkout@v3
Expand All @@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-python@v3

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.12.1
run: python -m pip install cibuildwheel==2.16.2

- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
Expand Down
113 changes: 64 additions & 49 deletions build_libicsneo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,90 +4,105 @@
import shutil
import sys

LIBICSNEO_COMMIT = '9ef93eb73e1ada72ccc7a571744b9db1a564f18b'
LIBUSB_COMMIT = '4239bc3a50014b8e6a5a2a59df1fff3b7469543b'
LIBICSNEO_COMMIT = "9ef93eb73e1ada72ccc7a571744b9db1a564f18b"
LIBUSB_COMMIT = "4239bc3a50014b8e6a5a2a59df1fff3b7469543b"
CPUS = str(multiprocessing.cpu_count())


def checkout():
if not os.path.isdir('libicsneo'):
subprocess.check_output(
['git', 'clone', 'https://github.com/intrepidcs/libicsneo.git'])
subprocess.check_output(
['git', 'checkout', LIBICSNEO_COMMIT], cwd='libicsneo')
if not os.path.isdir("libicsneo"):
subprocess.check_output(["git", "clone", "https://github.com/intrepidcs/libicsneo.git"])
subprocess.check_output(["git", "checkout", LIBICSNEO_COMMIT], cwd="libicsneo")

if not os.path.isdir('libusb') and sys.platform == 'darwin':
subprocess.check_output(
['git', 'clone', 'https://github.com/libusb/libusb.git'])
subprocess.check_output(['git', 'checkout', LIBUSB_COMMIT], cwd='libusb')
if not os.path.isdir("libusb") and sys.platform == "darwin":
subprocess.check_output(["git", "clone", "https://github.com/libusb/libusb.git"])
subprocess.check_output(["git", "checkout", LIBUSB_COMMIT], cwd="libusb")


def _build_libusb():
subprocess.check_output(['git', 'clean', '-xdf'], cwd='libusb')
subprocess.check_output(["git", "clean", "-xdf"], cwd="libusb")

subprocess.check_output(['./bootstrap.sh'], cwd='libusb')
subprocess.check_output(["./bootstrap.sh"], cwd="libusb")

env = os.environ.copy()
env['CFLAGS'] = '-arch x86_64 -arch arm64 -mmacosx-version-min=10.13'
env['CXXFLAGS'] = '-arch x86_64 -arch arm64 -mmacosx-version-min=10.13'
subprocess.check_output(
['./configure', '--disable-static', '--prefix=/tmp/libusb'], cwd='libusb', env=env)
env["CFLAGS"] = "-arch x86_64 -arch arm64 -mmacosx-version-min=10.13"
env["CXXFLAGS"] = "-arch x86_64 -arch arm64 -mmacosx-version-min=10.13"
subprocess.check_output(["./configure", "--disable-static", "--prefix=/tmp/libusb"], cwd="libusb", env=env)

subprocess.check_output(['make', '-j' + CPUS], cwd='libusb')
subprocess.check_output(['make', 'install'], cwd='libusb')
subprocess.check_output(["make", "-j" + CPUS], cwd="libusb")
subprocess.check_output(["make", "install"], cwd="libusb")


def _build_icsneo_linux():
subprocess.check_output(['git', 'clean', '-xdf'], cwd='libicsneo')
subprocess.check_output(['mkdir', '-p', 'libicsneo/build'])
subprocess.check_output(["git", "clean", "-xdf"], cwd="libicsneo")
subprocess.check_output(["mkdir", "-p", "libicsneo/build"])

subprocess.check_output(
["cmake", "..", "-DCMAKE_BUILD_TYPE=Release", "-DLIBICSNEO_BUILD_ICSNEOLEGACY=ON"], cwd="libicsneo/build"
)
subprocess.check_output(
["cmake", "--build", ".", "--target", "icsneolegacy", "--parallel", CPUS], cwd="libicsneo/build"
)

subprocess.check_output(['cmake', '..', '-DCMAKE_BUILD_TYPE=Release', '-DLIBICSNEO_BUILD_ICSNEOLEGACY=ON'], cwd='libicsneo/build')
subprocess.check_output(['cmake', '--build', '.', '--target',
'icsneolegacy', '--parallel', CPUS], cwd='libicsneo/build')

def _build_icsneo_macos():
subprocess.check_output(['git', 'clean', '-xdf'], cwd='libicsneo')
subprocess.check_output(['mkdir', '-p', 'libicsneo/build'])
subprocess.check_output(["git", "clean", "-xdf"], cwd="libicsneo")
subprocess.check_output(["mkdir", "-p", "libicsneo/build"])

subprocess.check_output(['cmake', '..', '-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64',
'-DLIBICSNEO_BUILD_ICSNEOLEGACY=ON', '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13',
'-DLIBUSB_LIBRARIES=/tmp/libusb/lib/libusb-1.0.0.dylib',
'-DLIBUSB_INCLUDE_DIR=/tmp/libusb/include/libusb-1.0'], cwd='libicsneo/build')
subprocess.check_output(
[
"cmake",
"..",
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64",
"-DLIBICSNEO_BUILD_ICSNEOLEGACY=ON",
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13",
"-DLIBUSB_LIBRARIES=/tmp/libusb/lib/libusb-1.0.0.dylib",
"-DLIBUSB_INCLUDE_DIR=/tmp/libusb/include/libusb-1.0",
],
cwd="libicsneo/build",
)

subprocess.check_output(['cmake', '--build', '.', '--target',
'icsneolegacy', '--parallel', CPUS], cwd='libicsneo/build')
subprocess.check_output(['install_name_tool', '-change', '/tmp/libusb/lib/libusb-1.0.0.dylib',
'@loader_path/libusb-1.0.0.dylib', 'libicsneolegacy.dylib'], cwd='libicsneo/build')
subprocess.check_output(
["cmake", "--build", ".", "--target", "icsneolegacy", "--parallel", CPUS], cwd="libicsneo/build"
)
subprocess.check_output(
[
"install_name_tool",
"-change",
"/tmp/libusb/lib/libusb-1.0.0.dylib",
"@loader_path/libusb-1.0.0.dylib",
"libicsneolegacy.dylib",
],
cwd="libicsneo/build",
)


def build():
print("Building libicsneo...")
if sys.platform == 'darwin':
if sys.platform == "darwin":
_build_libusb()
_build_icsneo_macos()
elif sys.platform == 'linux':
elif sys.platform == "linux":
_build_icsneo_linux()


def copy():
if sys.platform == 'darwin':
shutil.copyfile('/tmp/libusb/lib/libusb-1.0.0.dylib',
'ics/libusb-1.0.0.dylib')
shutil.copyfile('libicsneo/build/libicsneolegacy.dylib',
'ics/libicsneolegacy.dylib')
elif sys.platform == 'linux':
shutil.copyfile('libicsneo/build/libicsneolegacy.so',
'ics/libicsneolegacy.so')
if sys.platform == "darwin":
shutil.copyfile("/tmp/libusb/lib/libusb-1.0.0.dylib", "ics/libusb-1.0.0.dylib")
shutil.copyfile("libicsneo/build/libicsneolegacy.dylib", "ics/libicsneolegacy.dylib")
elif sys.platform == "linux":
shutil.copyfile("libicsneo/build/libicsneolegacy.so", "ics/libicsneolegacy.so")


def clean():
shutil.rmtree('libicsneo')
shutil.rmtree('libusb')
shutil.rmtree('/tmp/libusb')
shutil.rmtree("libicsneo")
shutil.rmtree("libusb")
shutil.rmtree("/tmp/libusb")


if __name__ == '__main__':
if '--clean' in sys.argv:
if __name__ == "__main__":
if "--clean" in sys.argv:
clean()
exit(0)
checkout()
Expand Down
Loading