From 497aa071b588e93d25314182d7b6d04c881f9ac6 Mon Sep 17 00:00:00 2001 From: pathmann Date: Thu, 25 Aug 2016 17:55:18 +0200 Subject: [PATCH] rename python lib on linux depending on architecture --- tools/bundle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bundle.py b/tools/bundle.py index 8f03216..602ecda 100755 --- a/tools/bundle.py +++ b/tools/bundle.py @@ -20,8 +20,8 @@ PYTHONFILES = {'win32' : [("python35.dll", "plugins/pyTSon/python35.dll"), ("Lib", "plugins/pyTSon/include/Lib_win32"), ("DLLs/_bz2.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_bz2.pyd"), ("DLLs/_ctypes.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_ctypes.pyd"), ("DLLs/_decimal.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_decimal.pyd"), ("DLLs/_elementtree.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_elementtree.pyd"), ("DLLs/_hashlib.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_hashlib.pyd"), ("DLLs/_lzma.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_lzma.pyd"), ("DLLs/_msi.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_msi.pyd"), ("DLLs/_multiprocessing.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_multiprocessing.pyd"), ("DLLs/_overlapped.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_overlapped.pyd"), ("DLLs/_socket.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_socket.pyd"), ("DLLs/_ssl.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/_ssl.pyd"), ("DLLs/pyexpat.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/pyexpat.pyd"), ("DLLs/select.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/select.pyd"), ("DLLs/unicodedata.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/unicodedata.pyd"), ("DLLs/winsound.pyd", "plugins/pyTSon/include/Lib_win32/lib-dynload/winsound.pyd"), ], 'win64' : [("python35.dll", "plugins/pyTSon/python35.dll"), ("Lib", "plugins/pyTSon/include/Lib_win64"), ("DLLs/_bz2.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_bz2.pyd"), ("DLLs/_ctypes.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_ctypes.pyd"), ("DLLs/_decimal.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_decimal.pyd"), ("DLLs/_elementtree.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_elementtree.pyd"), ("DLLs/_hashlib.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_hashlib.pyd"), ("DLLs/_lzma.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_lzma.pyd"), ("DLLs/_msi.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_msi.pyd"), ("DLLs/_multiprocessing.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_multiprocessing.pyd"), ("DLLs/_overlapped.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_overlapped.pyd"), ("DLLs/_socket.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_socket.pyd"), ("DLLs/_sqlite3.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_sqlite3.pyd"), ("DLLs/_ssl.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/_ssl.pyd"), ("DLLs/pyexpat.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/pyexpat.pyd"), ("DLLs/select.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/select.pyd"), ("DLLs/unicodedata.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/unicodedata.pyd"), ("DLLs/winsound.pyd", "plugins/pyTSon/include/Lib_win64/lib-dynload/winsound.pyd") ], - 'linux_x86' : [("lib/libpython3.5m.so.1.0", "plugins/pyTSon/libpython3.5m.so.1.0"), ("lib/python3.5", "plugins/pyTSon/include/Lib_linux32"), ], - 'linux_amd64' : [("lib/libpython3.5m.so.1.0", "plugins/pyTSon/libpython3.5m.so.1.0"), ("lib/python3.5", "plugins/pyTSon/include/Lib_linux64"), ], + 'linux_x86' : [("lib/libpython3.5m.so.1.0", "plugins/pyTSon/libpython3.5m_32.so"), ("lib/python3.5", "plugins/pyTSon/include/Lib_linux32"), ], + 'linux_amd64' : [("lib/libpython3.5m.so.1.0", "plugins/pyTSon/libpython3.5m_64.so"), ("lib/python3.5", "plugins/pyTSon/include/Lib_linux64"), ], 'mac' : [("lib/libpython3.5m.dylib", "plugins/pyTSon/libpython3.5m.dylib"), ("lib/python3.5", "plugins/pyTSon/include/Lib"), ]} INIBASE = """