Merge pull request #285 from theseus-rs/correct-wasm-build-configuration

build: correct wasm build configuration

Author: brianheineman

examples/class_loader/Cargo.toml

@@ -8,8 +8,8 @@ version.workspace = true
 [dependencies]
 ristretto_classloader = { path = "../../ristretto_classloader" }
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
+[target.'cfg(target_family = "wasm")'.dependencies]
 tokio = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread"] }

examples/runtime_class_loader/Cargo.toml

@@ -8,8 +8,8 @@ version.workspace = true
 [dependencies]
 ristretto_classloader = { path = "../../ristretto_classloader" }
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
+[target.'cfg(target_family = "wasm")'.dependencies]
 tokio = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread"] }

ristretto_classloader/Cargo.toml

@@ -25,20 +25,20 @@ tracing = { workspace = true }
 walkdir = { workspace = true }
 zip = { workspace = true }
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
+[target.'cfg(target_family = "wasm")'.dependencies]
 tokio = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokio = { workspace = true, features = ["fs"] }
 
 [dev-dependencies]
 criterion = { workspace = true }
 indoc = { workspace = true }
 
-[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
+[target.'cfg(target_family = "wasm")'.dev-dependencies]
 tokio = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+[target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 
 [features]

ristretto_classloader/src/runtime/bootstrap.rs

@@ -32,17 +32,17 @@ pub async fn home_class_loader(java_home: &PathBuf) -> Result<(PathBuf, String,
     // property (e.g. 21.0.5).
     let java_version = if version_file.exists() {
         let version_file = java_home.join("version.txt");
-        #[cfg(target_arch = "wasm32")]
+        #[cfg(target_family = "wasm")]
         let java_version = std::fs::read_to_string(version_file)?;
-        #[cfg(not(target_arch = "wasm32"))]
+        #[cfg(not(target_family = "wasm"))]
         let java_version = tokio::fs::read_to_string(version_file).await?;
         java_version.trim().to_string()
     } else {
         let release_file = java_home.join("release");
 
-        #[cfg(target_arch = "wasm32")]
+        #[cfg(target_family = "wasm")]
         let release = std::fs::read_to_string(release_file)?;
-        #[cfg(not(target_arch = "wasm32"))]
+        #[cfg(not(target_family = "wasm"))]
         let release = tokio::fs::read_to_string(release_file).await?;
 
         let Some(java_version_line) = release
@@ -73,9 +73,9 @@ pub async fn home_class_loader(java_home: &PathBuf) -> Result<(PathBuf, String,
 pub async fn version_class_loader(version: &str) -> Result<(PathBuf, String, ClassLoader)> {
     let current_dir = env::current_dir().unwrap_or_default();
 
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     let home_dir = current_dir;
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     let home_dir = {
         #[expect(deprecated)]
         env::home_dir().unwrap_or(current_dir)
@@ -138,9 +138,9 @@ async fn extract_archive(
     archive: &Vec<u8>,
     out_dir: &PathBuf,
 ) -> Result<PathBuf> {
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     std::fs::create_dir_all(out_dir)?;
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     tokio::fs::create_dir_all(out_dir).await?;
 
     let Some(extension) = file_name.split('.').last() else {
@@ -165,7 +165,7 @@ async fn extract_archive(
         tar.unpack(extract_dir.clone())?;
     };
 
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     let runtime_dir = {
         let mut entries = std::fs::read_dir(&extract_dir)?;
         let Some(runtime_dir) = entries.next() else {
@@ -175,7 +175,7 @@ async fn extract_archive(
         };
         runtime_dir?
     };
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     let runtime_dir = {
         let mut entries = tokio::fs::read_dir(&extract_dir).await?;
         let Some(runtime_dir) = entries.next_entry().await? else {
@@ -192,9 +192,9 @@ async fn extract_archive(
     // Rename the runtime directory to the installation directory. Another process may have
     // already installed the runtime, so we need to check if the installation directory exists.
     // If it does, we can ignore the error.
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     let rename_result = std::fs::rename(runtime_dir.clone(), installation_dir.clone());
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     let rename_result = tokio::fs::rename(runtime_dir.clone(), installation_dir.clone()).await;
 
     if let Err(error) = rename_result {
@@ -208,9 +208,9 @@ async fn extract_archive(
         }
     }
 
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     std::fs::remove_dir_all(&extract_dir)?;
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     tokio::fs::remove_dir_all(&extract_dir).await?;
 
     debug!(

ristretto_cli/Cargo.toml

@@ -29,10 +29,10 @@ ristretto_vm = { path = "../ristretto_vm", version = "0.14.0" }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
+[target.'cfg(target_family = "wasm")'.dependencies]
 tokio = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 
 [features]

ristretto_cli/src/main.rs

@@ -58,7 +58,7 @@ struct Cli {
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-#[cfg(target_arch = "wasm32")]
+#[cfg(target_family = "wasm")]
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<()> {
     logging::initialize();
@@ -69,7 +69,7 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(target_family = "wasm"))]
 #[tokio::main]
 async fn main() -> Result<()> {
     logging::initialize();

ristretto_vm/Cargo.toml

@@ -29,11 +29,11 @@ thiserror = { workspace = true }
 tracing = { workspace = true }
 whoami = { workspace = true }
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
+[target.'cfg(target_family = "wasm")'.dependencies]
 getrandom = { workspace = true, features = ["wasm_js"] }
 tokio = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
 getrandom = { workspace = true }
 tokio = { workspace = true, features = ["fs"] }
 

ristretto_vm/src/native_methods/java/lang/thread.rs

@@ -282,9 +282,9 @@ async fn sleep(_thread: Arc<Thread>, mut parameters: Parameters) -> Result<Optio
     let millis = parameters.pop_long()?;
     let millis = u64::try_from(millis)?;
     let duration = Duration::from_millis(millis);
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     tokio::time::sleep(duration).await;
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     std::thread::sleep(duration);
     Ok(None)
 }
@@ -299,9 +299,9 @@ async fn sleep_nanos_0(_thread: Arc<Thread>, mut parameters: Parameters) -> Resu
     let nanos = parameters.pop_long()?;
     let nanos = u64::try_from(nanos)?;
     let duration = Duration::from_nanos(nanos);
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     tokio::time::sleep(duration).await;
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     std::thread::sleep(duration);
     Ok(None)
 }
@@ -326,9 +326,9 @@ async fn suspend_0(_thread: Arc<Thread>, _parameters: Parameters) -> Result<Opti
 
 #[async_recursion(?Send)]
 async fn r#yield(_thread: Arc<Thread>, _parameters: Parameters) -> Result<Option<Value>> {
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(target_family = "wasm"))]
     tokio::task::yield_now().await;
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(target_family = "wasm")]
     std::thread::yield_now();
     Ok(None)
 }