add mac

openseespy-pip/build_pip.py

@@ -3,6 +3,7 @@
 import os
 import os.path
 import sys
+import glob
 
 
 def copy_library(so, pyd):
@@ -38,6 +39,41 @@ def copy_library(so, pyd):
             shutil.copy(line[i:j], linux+'lib/')
 
 
+def copy_mac_library(so):
+
+    mac = './openseespy/opensees/mac/'
+    if os.path.exists(so):
+        if os.path.exists(mac+'opensees.so'):
+            os.remove(mac+'opensees.so')
+        for f in glob.glob(mac+'lib/*.dylib'):
+            os.remove(f)
+
+        shutil.copy(so, mac)
+
+        # get dependent library for linux
+        p = subprocess.run(
+            ["otool", "-L", so], capture_output=True)
+
+        for line in p.stdout.decode('utf-8').split('\n'):
+            i = line.find('/')
+            j = line.find(' ', i)
+            if i < 0 or j < 0 or i >= j:
+                continue
+
+            print('copying '+line[i:j]+' to '+mac+'lib/')
+            shutil.copy(line[i:j], mac+'lib/')
+            lib_name = line[i:j].split('/')
+            lib_name = lib_name[-1]
+            print('changing rpath from '+line[i:j]+' to lib/'+lib_name)
+            subprocess.run(
+                ['install_name_tool', '-change', line[i:j],
+                    'lib/'+lib_name, mac+'opensees.so']
+            )
+
+        if os.path.exists(mac+'lib/Python'):
+            os.remove(mac+'lib/Python')
+
+
 def build_pip():
 
     print('==============================================================')
@@ -49,16 +85,16 @@ def build_pip():
     subprocess.run(['rm', '-fr', 'build', 'dist', 'openseespy.egg-info'])
 
     # update tools
-    subprocess.run(['python', '-m', 'pip', 'install', '--upgrade',
+    subprocess.run(['python3', '-m', 'pip', 'install', '--upgrade',
                     'setuptools', 'wheel', 'twine', 'pytest'])
 
     # compile wheel
-    subprocess.run(['python', 'setup.py', 'bdist_wheel'])
+    subprocess.run(['python3', 'setup.py', 'bdist_wheel'])
 
 
 def upload_pip():
     # upload
-    subprocess.run(['python', '-m', 'twine', 'upload', 'dist/*'])
+    subprocess.run(['python3', '-m', 'twine', 'upload', 'dist/*'])
 
 
 def clean_pip():
@@ -67,17 +103,17 @@ def clean_pip():
 
 def upload_pip_test():
     # upload
-    subprocess.run(['python', '-m', 'twine', 'upload',
+    subprocess.run(['python3', '-m', 'twine', 'upload',
                     '--repository', 'testpypi', 'dist/*'])
 
 
 def install_pip_test():
-    subprocess.run(['python', '-m', 'pip', 'uninstall', '-y', 'openseespy'])
-    subprocess.run(['python', '-m', 'pip',  'install', '--pre', '--no-cache-dir', '--index-url',
+    subprocess.run(['python3', '-m', 'pip', 'uninstall', '-y', 'openseespy'])
+    subprocess.run(['python3', '-m', 'pip',  'install', '--pre', '--no-cache-dir', '--index-url',
                     'https://test.pypi.org/simple/', 'openseespy'])
 
 
 def install_pip():
-    subprocess.run(['python', '-m', 'pip', 'uninstall', '-y', 'openseespy'])
-    subprocess.run(['python', '-m', 'pip', 'install',
+    subprocess.run(['python3', '-m', 'pip', 'uninstall', '-y', 'openseespy'])
+    subprocess.run(['python3', '-m', 'pip', 'install',
                     '--pre', '--no-cache-dir', 'openseespy'])

openseespy-pip/copy_mac.py

@@ -0,0 +1,3 @@
+from build_pip import copy_mac_library
+
+copy_mac_library('../../opensees/SRC/interpreter/opensees.so')