Skip to content

Commit 73a51f5

Browse files
committed
Review fixes
1 parent d48fbf4 commit 73a51f5

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

recipes/wasmi/all/conandata.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ sources:
77
patches:
88
"0.42.1":
99
- patch_file: "patches/0001-xrplf-0.42.1.patch"
10-
patch_type: conan
10+
patch_type: conan

recipes/wasmi/all/conanfile.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ def generate(self):
4141
def build(self):
4242
apply_conandata_patches(self)
4343
cmake = CMake(self)
44-
cmake.verbose = True
4544
cmake.configure(build_script_folder=os.path.join(self.source_folder, "crates", "c_api"))
4645
cmake.build()
4746

@@ -54,4 +53,3 @@ def package_info(self):
5453
self.cpp_info.libs = ["wasmi"]
5554
self.cpp_info.names["cmake_find_package"] = "wasmi"
5655
self.cpp_info.names["cmake_find_package_multi"] = "wasmi"
57-

recipes/wasmi/all/patches/0001-xrplf-0.42.1.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ index b15c787a..2420bea2 100644
55
@@ -43,6 +43,11 @@ endif()
66
list(TRANSFORM WASMI_SHARED_FILES PREPEND ${WASMI_TARGET_DIR}/)
77
list(TRANSFORM WASMI_STATIC_FILES PREPEND ${WASMI_TARGET_DIR}/)
8-
8+
99
+if(NOT BUILD_SHARED_LIBS)
10-
+ set(WASMI_SHARED_FILES )
10+
+ set(WASMI_SHARED_FILES)
1111
+endif()
1212
+
1313
+
@@ -17,7 +17,7 @@ index b15c787a..2420bea2 100644
1717
@@ -112,23 +117,25 @@ install(
1818
DESTINATION ${CMAKE_INSTALL_LIBDIR}
1919
)
20-
20+
2121
-if(WASMI_TARGET MATCHES "darwin")
2222
- set(INSTALLED_LIB "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libwasmi.dylib")
2323
- install(
@@ -55,23 +55,23 @@ index b15c787a..2420bea2 100644
5555
+ endif()
5656
endif()
5757
endif()
58-
58+
5959
diff --git a/crates/c_api/include/wasm.h b/crates/c_api/include/wasm.h
6060
index 5ee617ff..0199192d 100644
6161
--- a/crates/c_api/include/wasm.h
6262
+++ b/crates/c_api/include/wasm.h
6363
@@ -146,6 +146,13 @@ WASM_DECLARE_OWN(store)
64-
64+
6565
WASM_API_EXTERN own wasm_store_t* wasm_store_new(wasm_engine_t*);
66-
66+
6767
+// Store fuel functions (forward declarations)
6868
+struct wasmi_error;
6969
+
7070
+WASM_API_EXTERN struct wasmi_error* wasm_store_get_fuel(const wasm_store_t*, uint64_t* fuel);
7171
+WASM_API_EXTERN struct wasmi_error* wasm_store_set_fuel(wasm_store_t*, uint64_t fuel);
7272
+//WASM_API_EXTERN void *wasm_store_get_data(const wasm_store_t*);
7373
+//WASM_API_EXTERN void wasm_store_set_data(wasm_store_t*, void *data);
74-
74+
7575
///////////////////////////////////////////////////////////////////////////////
7676
// Type Representations
7777
diff --git a/crates/c_api/include/wasmi.h b/crates/c_api/include/wasmi.h
@@ -98,7 +98,7 @@ index 2caffa37..0c0584ec 100644
9898
*/
9999
-#define WASMI_VERSION_PATCH 0
100100
+#define WASMI_VERSION_PATCH 1
101-
101+
102102
#endif // WASMI_H
103103
diff --git a/crates/c_api/src/store.rs b/crates/c_api/src/store.rs
104104
index 56d4898f..543dbff8 100644

0 commit comments

Comments
 (0)