Make winobjc and objfw runtimes unstable

Author: madsmtm

block-sys/Cargo.toml

@@ -41,10 +41,10 @@ gnustep-2-0 = ["objc-sys/gnustep-2-0", "gnustep-1-9"]
 gnustep-2-1 = ["objc-sys/gnustep-2-1", "gnustep-2-0"]
 
 # Link to Microsoft's libobjc2
-winobjc = ["objc-sys/winobjc", "gnustep-1-8"]
+unstable-winobjc = ["objc-sys/unstable-winobjc", "gnustep-1-8"]
 
-# TODO
-objfw = []
+# Link to ObjFW
+unstable-objfw = []
 
 [dependencies]
 objc-sys = { path = "../objc-sys", version = "=0.2.0-alpha.1", default-features = false, optional = true }

block-sys/README.md

@@ -73,15 +73,19 @@ Sources:
 
 ### Microsoft's [`WinObjC`](https://github.com/microsoft/WinObjC)
 
-- Feature flag: `winobjc`.
+- Feature flag: `unstable-winobjc`.
+
+**Unstable: Hasn't been tested on Windows yet!**
 
 Essentially just [a fork](https://github.com/microsoft/libobjc2) based on
 GNUStep's `libobjc2` version 1.8.
 
 
-### [`ObjFW`](https://github.com/ObjFW/ObjFW) (WIP)
+### [`ObjFW`](https://github.com/ObjFW/ObjFW)
+
+- Feature flag: `unstable-objfw`.
 
-- Feature flag: `objfw`.
+**Unstable: Doesn't work yet!**
 
 TODO.
 

block-sys/build.rs

@@ -10,7 +10,7 @@ fn main() {
     let mut apple = env::var_os("CARGO_FEATURE_APPLE").is_some();
     let compiler_rt = env::var_os("CARGO_FEATURE_COMPILER_RT").is_some();
     let mut gnustep = env::var_os("CARGO_FEATURE_GNUSTEP_1_7").is_some();
-    let objfw = env::var_os("CARGO_FEATURE_OBJFW").is_some();
+    let objfw = env::var_os("CARGO_FEATURE_UNSTABLE_OBJFW").is_some();
 
     if std::env::var("DOCS_RS").is_ok() {
         if let "macos" | "ios" | "tvos" | "watchos" = &*target_os {

block2/Cargo.toml

@@ -28,7 +28,6 @@ gnustep-1-8 = ["gnustep-1-7", "block-sys/gnustep-1-8"]
 gnustep-1-9 = ["gnustep-1-8", "block-sys/gnustep-1-9"]
 gnustep-2-0 = ["gnustep-1-9", "block-sys/gnustep-2-0"]
 gnustep-2-1 = ["gnustep-2-0", "block-sys/gnustep-2-1"]
-winobjc = ["gnustep-1-8", "block-sys/winobjc"]
 
 [dependencies]
 objc2-encode = { path = "../objc2-encode", version = "=2.0.0-beta.2", default-features = false }

objc-sys/Cargo.toml

@@ -40,12 +40,12 @@ gnustep-2-0 = ["gnustep-1-9"]
 gnustep-2-1 = ["gnustep-2-0"]
 
 # Link to Microsoft's libobjc2
-winobjc = ["gnustep-1-8"]
+unstable-winobjc = ["gnustep-1-8"]
 
-# TODO
-objfw = []
+# Link to ObjFW
+unstable-objfw = []
 
-# Private/unstable features - must not be relied on!
+# Private
 unstable-exception = ["cc"]
 
 [build-dependencies]

objc-sys/README.md

@@ -56,17 +56,21 @@ chosen using the standard `X_DEPLOYMENT_TARGET` environment variables:
   `gnustep-1-8`.
 
 
-### Window's [`WinObjC`](https://github.com/microsoft/WinObjC)
+### Microsoft's [`WinObjC`](https://github.com/microsoft/WinObjC)
 
-- Feature flag: `winobjc`.
+- Feature flag: `unstable-winobjc`.
+
+**Unstable: Hasn't been tested on Windows yet!**
 
 This is essentially just [a fork](https://github.com/microsoft/libobjc2) based
 on GNUStep's `libobjc2` version 1.8, with very few user-facing changes.
 
 
-### [`ObjFW`](https://github.com/ObjFW/ObjFW) (WIP)
+### [`ObjFW`](https://github.com/ObjFW/ObjFW)
+
+- Feature flag: `unstable-objfw`.
 
-- Feature flag: `objfw`.
+**Unstable: Doesn't work yet!**
 
 TODO.
 
@@ -79,7 +83,7 @@ and `objc_autoreleasePoolPop` is a vital requirement for most applications.
 
 Just so we're being clear, this rules out the GCC [`libobjc`][gcc-libobjc]
 runtime (see [this][gcc-objc-support]), the [`mulle-objc`] runtime and
-[cocotron]. (But support for [`ObjFW`] and [`darling`] may be added).
+[cocotron]. (But support for [`darling`] may be added).
 More information on different runtimes can be found in GNUStep's
 [Objective-C Compiler and Runtime FAQ][gnustep-faq].
 
@@ -88,7 +92,6 @@ More information on different runtimes can be found in GNUStep's
 [gcc-objc-support]: https://gcc.gnu.org/onlinedocs/gcc/Standards.html#Objective-C-and-Objective-C_002b_002b-Languages
 [`mulle-objc`]: https://github.com/mulle-objc/mulle-objc-runtime
 [cocotron]: https://cocotron.org/
-[`ObjFW`]: https://github.com/ObjFW/ObjFW
 [`darling`]: https://github.com/darlinghq/darling-objc4
 [gnustep-faq]: http://wiki.gnustep.org/index.php/Objective-C_Compiler_and_Runtime_FAQ
 

objc-sys/build.rs

@@ -71,7 +71,7 @@ fn main() {
 
     let mut apple = env::var_os("CARGO_FEATURE_APPLE").is_some();
     let mut gnustep = env::var_os("CARGO_FEATURE_GNUSTEP_1_7").is_some();
-    let objfw = env::var_os("CARGO_FEATURE_OBJFW").is_some();
+    let objfw = env::var_os("CARGO_FEATURE_UNSTABLE_OBJFW").is_some();
 
     // Choose defaults when generating docs
     if std::env::var("DOCS_RS").is_ok() {
@@ -106,7 +106,7 @@ fn main() {
                 } else {
                     GNUStep(1, 7)
                 }
-            } else if env::var_os("CARGO_FEATURE_WINOBJC").is_some() {
+            } else if env::var_os("CARGO_FEATURE_UNSTABLE_WINOBJC").is_some() {
                 WinObjC
             } else if env::var_os("CARGO_FEATURE_GNUSTEP_2_1").is_some() {
                 GNUStep(2, 1)

objc-sys/src/exception.rs

@@ -61,7 +61,7 @@ extern_c! {
     // objc_exception_get_functions
     // objc_exception_set_functions
 
-    #[cfg(any(gnustep, winobjc))]
+    #[cfg(gnustep)]
     pub fn objc_exception_rethrow(exc_buf: *mut c_void) -> !;
 
     #[cfg(apple_new)]

objc2-foundation/Cargo.toml

@@ -28,7 +28,6 @@ gnustep-1-8 = ["gnustep-1-7", "objc2/gnustep-1-8", "block2?/gnustep-1-8"]
 gnustep-1-9 = ["gnustep-1-8", "objc2/gnustep-1-9", "block2?/gnustep-1-9"]
 gnustep-2-0 = ["gnustep-1-9", "objc2/gnustep-2-0", "block2?/gnustep-2-0"]
 gnustep-2-1 = ["gnustep-2-0", "objc2/gnustep-2-1", "block2?/gnustep-2-1"]
-winobjc = ["gnustep-1-8", "objc2/winobjc", "block2?/winobjc"]
 
 [dependencies]
 block2 = { path = "../block2", version = "=0.2.0-alpha.3", default-features = false, optional = true }

objc2/Cargo.toml

@@ -47,7 +47,6 @@ gnustep-1-8 = ["gnustep-1-7", "objc-sys/gnustep-1-8"]
 gnustep-1-9 = ["gnustep-1-8", "objc-sys/gnustep-1-9"]
 gnustep-2-0 = ["gnustep-1-9", "objc-sys/gnustep-2-0"]
 gnustep-2-1 = ["gnustep-2-0", "objc-sys/gnustep-2-1"]
-winobjc = ["gnustep-1-8", "objc-sys/winobjc"]
 
 [dependencies]
 malloc_buf = { version = "1.0", optional = true }