Linux support (#36)

* CI: enable tests on linux * add `_sbrk` for linux (and other systems including device) * fix tests for linux (missed dylib suffix) * bump versions
boozook · Sep 13, 2023 · 123456c · 123456c
1 parent 7409a45
commit 123456c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -110,7 +110,7 @@ jobs:
       matrix:
         os:
           - macos-latest
-          # - ubuntu-latest
+          - ubuntu-latest
           # - windows-latest
         sdk:
           - latest
@@ -161,7 +161,7 @@ jobs:
       matrix:
         os:
           - macos-latest
-          # - ubuntu-latest
+          - ubuntu-latest
           # - windows-latest
         sdk:
           - latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/sys/Cargo.toml b/api/sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-sys"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 build = "src/build.rs"
 

diff --git a/api/sys/src/lib.rs b/api/sys/src/lib.rs
@@ -124,7 +124,8 @@ pub mod misc {
 
 			#[doc(hidden)]
 			#[no_mangle]
-			#[cfg(target_os = "windows")]
+			// it not needed on MacOS
+			#[cfg(not(target_os = "macos"))]
 			// TODO: Somehow link with proper impl: https://stackoverflow.com/q/76439798/829264
 			pub extern "C" fn _sbrk() {}
 		};

diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-playdate"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 readme = "README.md"

diff --git a/cargo/tests/build/simple.rs b/cargo/tests/build/simple.rs
@@ -98,6 +98,12 @@ fn dev_lib_debug() -> Result<()> {
 }
 
 
+fn dylib_name() -> String {
+	const DYLIB_EXT: &str = dylib_suffix_for_host();
+	"pdex.".to_owned() + DYLIB_EXT
+}
+
+
 #[test]
 /// target: default host
 fn sim_host_release() -> Result<()> {
@@ -112,7 +118,7 @@ fn sim_host_release() -> Result<()> {
 		let cargo_target_fullname = format!("{cargo_package_name}-{LIB_NAME}");
 		let artifact = export_dir.join("playdate")
 		                         .join(cargo_target_fullname)
-		                         .join(PathBuf::from("build/pdex.dylib"));
+		                         .join(PathBuf::from("build/").join(dylib_name()));
 		test_artifact_sim(&artifact, false)
 	}
 
@@ -131,7 +137,7 @@ fn sim_host_debug() -> Result<()> {
 		let cargo_target_fullname = format!("{cargo_package_name}-{LIB_NAME}");
 		let artifact = export_dir.join("playdate")
 		                         .join(cargo_target_fullname)
-		                         .join(PathBuf::from("build/pdex.dylib"));
+		                         .join(PathBuf::from("build/").join(dylib_name()));
 		test_artifact_sim(&artifact, false)
 	}
 
@@ -152,7 +158,7 @@ fn sim_host_release_exp() -> Result<()> {
 		let cargo_target_fullname = format!("{cargo_package_name}-{LIB_NAME}");
 		let artifact = export_dir.join("playdate")
 		                         .join(cargo_target_fullname)
-		                         .join(PathBuf::from("build/pdex.dylib"));
+		                         .join(PathBuf::from("build/").join(dylib_name()));
 		test_artifact_sim(&artifact, false)
 	}
 
@@ -171,7 +177,7 @@ fn dev_sim_release_exp() -> Result<()> {
 	                                                           .map(OsStr::new);
 	let expectations = [
 	                    ("pdex.elf", dev_target, true),
-	                    ("pdex.dylib", &host_target, false),
+	                    (&dylib_name(), &host_target, false),
 	];
 
 	for path in simple_crates()? {
@@ -283,7 +289,7 @@ mod examples {
 
 		let expectations = [
 		                    ("pdex.elf", dev_target, true),
-		                    ("pdex.dylib", &host_target, false),
+		                    (&dylib_name(), &host_target, false),
 		];
 
 		for path in simple_crates()? {

diff --git a/cargo/tests/crates/simple/bin.rs b/cargo/tests/crates/simple/bin.rs
@@ -6,4 +6,5 @@ extern crate game;
 use game::eventHandlerShim;
 
 #[used]
-pub static EVENT_HANDLER_SHIM: extern "C" fn(*const pd::ffi::PlaydateAPI, pd::ffi::PDSystemEvent, u32) -> i32 = eventHandlerShim;
+pub static EVENT_HANDLER_SHIM: extern "C" fn(*const pd::ffi::PlaydateAPI, pd::ffi::PDSystemEvent, u32) -> i32 =
+	eventHandlerShim;