Skip to content

Commit 18870ed

Browse files
committed
Update Emscripten binary naming and adjust package method to copy .js and .d.ts files
1 parent 46ea06e commit 18870ed

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

conanfile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ def layout(self):
8080
self.cpp.package.bindirs = ["bin"]
8181
self.cpp.package.libs = ["nest2d"]
8282
if self.settings.os == "Emscripten":
83-
self.cpp.build.bin = ["libnest2d.js"]
84-
self.cpp.package.bin = ["libnest2d.js"]
85-
self.cpp.build.bindirs += ["libnest2d"]
83+
self.cpp.build.bin = ["libnest2d_js.js"]
84+
self.cpp.package.bin = ["libnest2d_js.js"]
85+
self.cpp.build.bindirs += ["libnest2d_js"]
8686

8787
self.cpp.package.includedirs = ["include"]
8888

@@ -158,12 +158,12 @@ def build(self):
158158
cmake.install()
159159

160160
def deploy(self):
161-
copy(self, "libnest2d*", src=os.path.join(self.package_folder, "bin"), dst=self.install_folder)
161+
copy(self, "libnest2d_js*", src=os.path.join(self.package_folder, "bin"), dst=self.install_folder)
162162
copy(self, "*", src=os.path.join(self.package_folder, "bin"), dst=self.install_folder)
163163

164164
def package(self):
165-
copy(self, pattern="libnest2d*", src=os.path.join(self.build_folder, "liblibnest2d_js"),
166-
dst=os.path.join(self.package_folder, "bin"))
165+
copy(self, f"*.d.ts", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
166+
copy(self, f"*.js", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
167167
packager = AutoPackager(self)
168168
packager.run()
169169

0 commit comments

Comments
 (0)