fix #20

Author: Arkueid

package/main_pygame_simple.py

@@ -24,8 +24,8 @@ def main():
     else:
         model.LoadModelJson(
             os.path.join(resources.RESOURCES_DIRECTORY, 
-                        #  "v2/kasumi2/kasumi2.model.json"
-                        "v2/haru/haru.model.json"
+                         "v2/kasumi2/kasumi2.model.json"
+                        # "v2/haru/haru.model.json"
                          )
         )
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 requires-python = ">=3.2"
-dynamic = ["version"]
+dynamic = ["version", "license"]
 name = "live2d-py"
 dependencies = [
     "pyopengl",
@@ -16,7 +16,6 @@ authors = [
 ]
 description = "A non-web Live2D library for Python."
 readme = "README.md"
-license = {file = "LICENSE"}
 keywords = ["Live2D", "Cubism Live2D", "Cubism SDK", "Cubism SDK for Python"]
 
 [project.urls]

setup.py

@@ -4,8 +4,10 @@
 import subprocess
 import sys
 
-from setuptools import setup, Extension, find_packages
+from setuptools import setup
 from setuptools.command.build_ext import build_ext
+from setuptools.command.install import install
+from setuptools.command.bdist_wheel import bdist_wheel
 
 NAME = "live2d-py"
 VERSION = "0.4.4"  # TODO: edit before push
@@ -18,79 +20,71 @@
 INSTALL_REQUIRES = ["numpy", "pyopengl", "pillow"]
 
 
-class CMakeExtension(Extension):
-
-    def __init__(self, name, sourcedir=""):
-        Extension.__init__(self, name, sources=[], py_limited_api=True)
-        self.sourcedir = os.path.abspath(sourcedir)
-
-
 def is_virtualenv():
     return 'VIRTUAL_ENV' in os.environ
 
 
 def get_base_python_path(venv_path):
     return re.search("home = (.*)\n", open(os.path.join(venv_path, "pyvenv.cfg"), 'r').read()).group(1)
 
+def run_cmake():
+    cmake_args = []
+    build_args = ["--config", "Release"]
 
-class CMakeBuild(build_ext):
+    if platform.system() == "Windows":
+        if platform.python_compiler().find("64 bit") > 0:
+            print("Building for 64 bit")
+            cmake_args += ["-A", "x64"]
+        else:
+            print("Building for 32 bit")
+            cmake_args += ["-A", "Win32"]
+        # native options
+        build_args += ["--", "/m:2"]
+    else:
+        cmake_args += ["-DCMAKE_BUILD_TYPE=" + "Release"]
+        build_args += ["--", "-j2"]
+    build_folder = os.path.join(os.getcwd(), "build")
+
+    if not os.path.exists(build_folder):
+        os.makedirs(build_folder)
+
+    if is_virtualenv():
+        python_installation_path = get_base_python_path(os.environ["VIRTUAL_ENV"])
+    else:
+        python_installation_path = os.path.split(sys.executable)[0]
+    print("Python installation path: " + python_installation_path)
+    sys.stdout.flush()
+
+    cmake_args += ["-DPYTHON_INSTALLATION_PATH=" + python_installation_path]
+
+    cmake_setup = ["cmake", ".."] + cmake_args
+    cmake_build = ["cmake", "--build", "."] + build_args
+
+    print("Building extension for Python {}".format(sys.version.split('\n', 1)[0]))
+    print("Invoking CMake setup: '{}'".format(' '.join(cmake_setup)))
+    sys.stdout.flush()
+    subprocess.check_call(cmake_setup, cwd=build_folder)
+    print("Invoking CMake build: '{}'".format(' '.join(cmake_build)))
+    sys.stdout.flush()
+    subprocess.check_call(cmake_build, cwd=build_folder)
 
-    def get_cmake_version(self):
-        try:
-            out = subprocess.check_output(["cmake", "--version"])
-        except:
-            sys.stderr.write("CMake must be installed to build the following extensions: " + ", ".join(str(self.extensions)))
-            sys.exit(1)
-        return re.search(r"cmake version ([0-9.]+)", out.decode()).group(1)
 
-    def run(self):
-        cmake_version = self.get_cmake_version()
-        if platform.system() == "Windows":
-            if cmake_version < "3.16":
-                sys.stderr.write("CMake >= 3.16 is required")
-        for ext in self.extensions:
-            self.build_extension(ext)
-
-    def build_extension(self, ext):
-        cmake_args = []
-        build_args = ["--config", "Release"]
-
-        if platform.system() == "Windows":
-            if platform.python_compiler().find("64 bit") > 0:
-                print("Building for 64 bit")
-                cmake_args += ["-A", "x64"]
-            else:
-                print("Building for 32 bit")
-                cmake_args += ["-A", "Win32"]
-            # native options
-            build_args += ["--", "/m:2"]
-        else:
-            cmake_args += ["-DCMAKE_BUILD_TYPE=" + "Release"]
-            build_args += ["--", "-j2"]
-        build_folder = os.path.abspath(self.build_temp)
+class CMakeBuild(build_ext):
 
-        if not os.path.exists(build_folder):
-            os.makedirs(build_folder)
+    def run(self):
+        run_cmake()
 
-        if is_virtualenv():
-            python_installation_path = get_base_python_path(os.environ["VIRTUAL_ENV"])
-        else:
-            python_installation_path = os.path.split(sys.executable)[0]
-        print("Python installation path: " + python_installation_path)
-        sys.stdout.flush()
 
-        cmake_args += ["-DPYTHON_INSTALLATION_PATH=" + python_installation_path]
+class BuildWheel(bdist_wheel):
+    def run(self):
+        run_cmake()
+        bdist_wheel.run(self)
 
-        cmake_setup = ["cmake", ext.sourcedir] + cmake_args
-        cmake_build = ["cmake", "--build", "."] + build_args
 
-        print("Building extension for Python {}".format(sys.version.split('\n', 1)[0]))
-        print("Invoking CMake setup: '{}'".format(' '.join(cmake_setup)))
-        sys.stdout.flush()
-        subprocess.check_call(cmake_setup, cwd=build_folder)
-        print("Invoking CMake build: '{}'".format(' '.join(cmake_build)))
-        sys.stdout.flush()
-        subprocess.check_call(cmake_build, cwd=build_folder)
+class Install(install):
+    def run(self):
+        run_cmake()
+        install.run(self)
 
 
 setup(
@@ -101,14 +95,16 @@ def build_extension(self, ext):
     long_description_content_type="text/markdown",
     author=AUTHOR,
     author_email=AUTHOR_EMAIL,
-    license="MIT",
+    license="LICENSE",
     url=URL,
     install_requires=INSTALL_REQUIRES,
-    ext_modules=[CMakeExtension("LAppModelWrapper", ".")],
-    cmdclass={"build_ext": CMakeBuild},
-    packages=find_packages("package"),
-    package_data={"": ["*.pyd", "*.so", "*.pyi"]},
-    package_dir={"": "package"},
+    cmdclass={
+        "build_ext": CMakeBuild,
+        "bdist_wheel": BuildWheel,
+        "install": Install
+    },
+    packages=["package.live2d"],
+    package_data={"package.live2d": ["*", "**/*.pyd", "**/*.so", "**/*.pyi", "**/*.py"]},
     keywords=["Live2D", "Cubism Live2D", "Cubism SDK", "Cubism SDK for Python"],
     python_requires=REQUIRES_PYTHON
 )