Simplify the name of the lib directory

LeoHsiao1 · Jun 26, 2021 · 97731ed · 97731ed
1 parent 21c70ff
commit 97731ed
Show file tree

Hide file tree

Showing 32 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/make_package.sh b/.github/workflows/make_package.sh
@@ -55,7 +55,7 @@ make_wheels(){
         rm -rf $TEST_DIR
         cd $LIB_DIR
         ls $EXIV2_LIB_FILES | grep -v $EXIV2_LIB_FILE | xargs rm -f
-        find . -maxdepth 1 -type d -name 'py3.*' | grep -v py3.${version}-${plat_type} | xargs rm -rf
+        find . -maxdepth 1 -type d -name 'py3*' | grep -v py3${version}-${plat_type} | xargs rm -rf
         cd $WORK_DIR
         python3 setup.py bdist_wheel --python-tag cp3${version}  --plat-name ${plat_name}
     done

diff --git a/pyexiv2/lib/__init__.py b/pyexiv2/lib/__init__.py
@@ -19,15 +19,15 @@
 sys_name = platform.system() or 'Unknown'
 if sys_name == 'Linux':
     ctypes.CDLL(os.path.join(lib_dir, 'libexiv2.so'))
-    sys.path.append(os.path.join(lib_dir, 'py{}-linux'.format(py_version)))
+    sys.path.append(os.path.join(lib_dir, 'py{}-linux'.format(py_version.replace('.',''))))
     import exiv2api
 elif sys_name == 'Darwin':
     ctypes.CDLL(os.path.join(lib_dir, 'libexiv2.dylib'))
-    sys.path.append(os.path.join(lib_dir, 'py{}-darwin'.format(py_version)))
+    sys.path.append(os.path.join(lib_dir, 'py{}-darwin'.format(py_version.replace('.',''))))
     import exiv2api
 elif sys_name == 'Windows':
     ctypes.CDLL(os.path.join(lib_dir, 'exiv2.dll'))
-    sys.path.append(os.path.join(lib_dir, 'py{}-win'.format(py_version)))
+    sys.path.append(os.path.join(lib_dir, 'py{}-win'.format(py_version.replace('.',''))))
     import exiv2api
 else:
     raise RuntimeError('pyexiv2 can only run on Linux, Darwin or Windows system. But your system is {} .'.format(sys_name))
diff --git a/pyexiv2/lib/py35-darwin/__init__.py b/pyexiv2/lib/py35-darwin/__init__.py
diff --git a/pyexiv2/lib/py3.5-darwin/exiv2api.so → pyexiv2/lib/py35-darwin/exiv2api.so b/pyexiv2/lib/py3.5-darwin/exiv2api.so → pyexiv2/lib/py35-darwin/exiv2api.so
diff --git a/pyexiv2/lib/py35-linux/__init__.py b/pyexiv2/lib/py35-linux/__init__.py
diff --git a/pyexiv2/lib/py3.5-linux/exiv2api.so → pyexiv2/lib/py35-linux/exiv2api.so b/pyexiv2/lib/py3.5-linux/exiv2api.so → pyexiv2/lib/py35-linux/exiv2api.so
diff --git a/pyexiv2/lib/py35-win/__init__.py b/pyexiv2/lib/py35-win/__init__.py
diff --git a/pyexiv2/lib/py3.5-win/exiv2api.pyd → pyexiv2/lib/py35-win/exiv2api.pyd b/pyexiv2/lib/py3.5-win/exiv2api.pyd → pyexiv2/lib/py35-win/exiv2api.pyd
diff --git a/pyexiv2/lib/py36-darwin/__init__.py b/pyexiv2/lib/py36-darwin/__init__.py
diff --git a/pyexiv2/lib/py3.6-darwin/exiv2api.so → pyexiv2/lib/py36-darwin/exiv2api.so b/pyexiv2/lib/py3.6-darwin/exiv2api.so → pyexiv2/lib/py36-darwin/exiv2api.so
diff --git a/pyexiv2/lib/py36-linux/__init__.py b/pyexiv2/lib/py36-linux/__init__.py
diff --git a/pyexiv2/lib/py3.6-linux/exiv2api.so → pyexiv2/lib/py36-linux/exiv2api.so b/pyexiv2/lib/py3.6-linux/exiv2api.so → pyexiv2/lib/py36-linux/exiv2api.so
diff --git a/pyexiv2/lib/py36-win/__init__.py b/pyexiv2/lib/py36-win/__init__.py
diff --git a/pyexiv2/lib/py3.6-win/exiv2api.pyd → pyexiv2/lib/py36-win/exiv2api.pyd b/pyexiv2/lib/py3.6-win/exiv2api.pyd → pyexiv2/lib/py36-win/exiv2api.pyd
diff --git a/pyexiv2/lib/py37-darwin/__init__.py b/pyexiv2/lib/py37-darwin/__init__.py
diff --git a/pyexiv2/lib/py3.7-darwin/exiv2api.so → pyexiv2/lib/py37-darwin/exiv2api.so b/pyexiv2/lib/py3.7-darwin/exiv2api.so → pyexiv2/lib/py37-darwin/exiv2api.so
diff --git a/pyexiv2/lib/py37-linux/__init__.py b/pyexiv2/lib/py37-linux/__init__.py
diff --git a/pyexiv2/lib/py3.7-linux/exiv2api.so → pyexiv2/lib/py37-linux/exiv2api.so b/pyexiv2/lib/py3.7-linux/exiv2api.so → pyexiv2/lib/py37-linux/exiv2api.so
diff --git a/pyexiv2/lib/py37-win/__init__.py b/pyexiv2/lib/py37-win/__init__.py
diff --git a/pyexiv2/lib/py3.7-win/exiv2api.pyd → pyexiv2/lib/py37-win/exiv2api.pyd b/pyexiv2/lib/py3.7-win/exiv2api.pyd → pyexiv2/lib/py37-win/exiv2api.pyd
diff --git a/pyexiv2/lib/py38-darwin/__init__.py b/pyexiv2/lib/py38-darwin/__init__.py
diff --git a/pyexiv2/lib/py3.8-darwin/exiv2api.so → pyexiv2/lib/py38-darwin/exiv2api.so b/pyexiv2/lib/py3.8-darwin/exiv2api.so → pyexiv2/lib/py38-darwin/exiv2api.so
diff --git a/pyexiv2/lib/py38-linux/__init__.py b/pyexiv2/lib/py38-linux/__init__.py
diff --git a/pyexiv2/lib/py3.8-linux/exiv2api.so → pyexiv2/lib/py38-linux/exiv2api.so b/pyexiv2/lib/py3.8-linux/exiv2api.so → pyexiv2/lib/py38-linux/exiv2api.so
diff --git a/pyexiv2/lib/py38-win/__init__.py b/pyexiv2/lib/py38-win/__init__.py
diff --git a/pyexiv2/lib/py3.8-win/exiv2api.pyd → pyexiv2/lib/py38-win/exiv2api.pyd b/pyexiv2/lib/py3.8-win/exiv2api.pyd → pyexiv2/lib/py38-win/exiv2api.pyd
diff --git a/pyexiv2/lib/py39-darwin/__init__.py b/pyexiv2/lib/py39-darwin/__init__.py
diff --git a/pyexiv2/lib/py3.9-darwin/exiv2api.so → pyexiv2/lib/py39-darwin/exiv2api.so b/pyexiv2/lib/py3.9-darwin/exiv2api.so → pyexiv2/lib/py39-darwin/exiv2api.so
diff --git a/pyexiv2/lib/py39-linux/__init__.py b/pyexiv2/lib/py39-linux/__init__.py
diff --git a/pyexiv2/lib/py3.9-linux/exiv2api.so → pyexiv2/lib/py39-linux/exiv2api.so b/pyexiv2/lib/py3.9-linux/exiv2api.so → pyexiv2/lib/py39-linux/exiv2api.so
diff --git a/pyexiv2/lib/py39-win/__init__.py b/pyexiv2/lib/py39-win/__init__.py
diff --git a/pyexiv2/lib/py3.9-win/exiv2api.pyd → pyexiv2/lib/py39-win/exiv2api.pyd b/pyexiv2/lib/py3.9-win/exiv2api.pyd → pyexiv2/lib/py39-win/exiv2api.pyd