Remnants

Author: raghavan-deepglow

MANIFEST.in

@@ -1,6 +1,5 @@
 
 include README.md
-recursive-include misty/mstplib Makefile *.c *.h
-# If you vendor bacnet-stack under misty/, include it too:
-recursive-include misty/bacnet-stack-0.8.4 *.*
+recursive-include src Makefile *.c *.h
+recursive-include third_party/bacnet-stack-0.8.4 *.*
 

build_snap

@@ -1,5 +1,6 @@
+
 # setup.py
-import sys, subprocess, shutil
+import subprocess, shutil
 from pathlib import Path
 from setuptools import setup
 from setuptools.command.build_py import build_py as _build_py
@@ -8,56 +9,47 @@
 class BinaryDistWheel(bdist_wheel):
     def finalize_options(self):
         super().finalize_options()
-        self.root_is_pure = False  # wheel is platform-specific
+        self.root_is_pure = False  # platform-specific wheel
 
 class build_py(_build_py):
     def run(self):
+        # Build python modules into build_lib first
         super().run()
 
-        project_root = Path(__file__).resolve().parent
-        mstplib_dir = project_root / "misty" / "mstplib"
-        if not (mstplib_dir / "Makefile").exists():
-            raise RuntimeError(f"Makefile not found in {mstplib_dir}")
-
-        # 1) Compile using your Makefile target
-        print(f"[misty] make clean_build in {mstplib_dir}")
-        subprocess.check_call(["make", "clean_build"], cwd=str(mstplib_dir))
+        root = Path(__file__).resolve().parent
+        src_dir = root / "src"            # <-- your flat C src dir
+        so_path = src_dir / "build" / "libmstp_agent.so"
 
-        # 2) We build a single canonical filename on all platforms
-        found = mstplib_dir / "libmstp_agent.so"
-        if not found.exists():
-            raise RuntimeError("Expected misty/mstplib/libmstp_agent.so after build")
+        # Compile the shared library into src/build/
+        print(f"[misty] make clean_build in {src_dir}")
+        subprocess.check_call(["make", "clean_build"], cwd=str(src_dir))
 
+        if not so_path.exists():
+            raise RuntimeError(f"Expected {so_path} after build")
 
-        # 3) Copy into the built package so it lands in the wheel
+        # Copy the .so into the package in the build tree so it lands in the wheel
         pkg_out = Path(self.build_lib) / "misty" / "mstplib"
         pkg_out.mkdir(parents=True, exist_ok=True)
-        shutil.copy2(found, pkg_out / found.name)
-        print(f"[misty] bundled {found.name} -> {pkg_out}")
-
+        shutil.copy2(so_path, pkg_out / "libmstp_agent.so")
+        print(f"[misty] bundled libmstp_agent.so -> {pkg_out}")
 
 def setup_packages():
     setup(
         name="misty",
-        version="0.0.15",  # bump
+        version="0.0.16",  # bump when publishing
         description="MSTP support for bacpypes",
-        long_description=(
-            "The misty package helps build bacpypes Applications that work on MS/TP Networks. "
-            "BIP (BACnet/IP) applications can be easily ported to use misty."
-        ),
+        long_description="The misty package helps build bacpypes Applications that work on MS/TP Networks.",
         license="GNU General Public License v2.0",
         author="Riptide, Inc",
         author_email="raghavan@riptideio.com",
         url="https://github.com/riptideio/misty",
         packages=["misty", "misty.mstplib"],
         package_dir={"misty": "misty"},
         cmdclass={"bdist_wheel": BinaryDistWheel, "build_py": build_py},
+        include_package_data=False,          # MANIFEST.in will NOT affect wheel contents
+        # package_data not required because we copy the .so into build_lib above
         install_requires=["bacpypes>=0.18.0", "six>=1.15.0"],
-        scripts=[],
-
-        include_package_data=False,  # MANIFEST.in will NOT affect the wheel
-        package_data={"misty": ["mstplib/libmstp_agent.so"]},
-        zip_safe=False
+        zip_safe=False,
     )
 
 if __name__ == "__main__":