Add fixes from publishing

zeroctr · Dec 16, 2020 · dd226b1 · dd226b1
1 parent d24981a
commit dd226b1
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/c-api/build.rs b/lib/c-api/build.rs
@@ -417,15 +417,25 @@ fn exclude_items_from_wasm_c_api(builder: Builder) -> Builder {
 fn build_inline_c_env_vars() {
     use std::ffi::OsStr;
 
-    let mut shared_object_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+    let mut shared_object_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
 
-    assert_eq!(shared_object_dir.file_name(), Some(OsStr::new("c-api")));
+    assert_eq!(shared_object_dir.file_name(), Some(OsStr::new("out")));
     shared_object_dir.pop();
 
-    assert_eq!(shared_object_dir.file_name(), Some(OsStr::new("lib")));
+    assert!(shared_object_dir
+        .file_name()
+        .as_ref()
+        .unwrap()
+        .to_string_lossy()
+        .to_string()
+        .starts_with("wasmer-c-api"));
     shared_object_dir.pop();
 
-    shared_object_dir.push("target");
+    assert_eq!(shared_object_dir.file_name(), Some(OsStr::new("build")));
+    shared_object_dir.pop();
+    shared_object_dir.pop();
+
+    assert_eq!(shared_object_dir.file_name(), Some(OsStr::new("target")));
     shared_object_dir.push(env::var("PROFILE").unwrap());
 
     let shared_object_dir = shared_object_dir.as_path().to_string_lossy();

diff --git a/lib/c-api/wasmer.h b/lib/c-api/wasmer.h
@@ -32,11 +32,11 @@
 #define WASMER_WASI_ENABLED
 
 // This file corresponds to the following Wasmer version.
-#define WASMER_VERSION "1.0.0-beta1"
+#define WASMER_VERSION "1.0.0-beta2"
 #define WASMER_VERSION_MAJOR 1
 #define WASMER_VERSION_MINOR 0
 #define WASMER_VERSION_PATCH 0
-#define WASMER_VERSION_PRE "beta1"
+#define WASMER_VERSION_PRE "beta2"
 
 #endif // WASMER_H_PRELUDE
 

diff --git a/lib/c-api/wasmer.hh b/lib/c-api/wasmer.hh
@@ -32,11 +32,11 @@
 #define WASMER_WASI_ENABLED
 
 // This file corresponds to the following Wasmer version.
-#define WASMER_VERSION "1.0.0-beta1"
+#define WASMER_VERSION "1.0.0-beta2"
 #define WASMER_VERSION_MAJOR 1
 #define WASMER_VERSION_MINOR 0
 #define WASMER_VERSION_PATCH 0
-#define WASMER_VERSION_PRE "beta1"
+#define WASMER_VERSION_PRE "beta2"
 
 #endif // WASMER_H_PRELUDE