Refactor.

appkit/dune

@@ -1,4 +1,5 @@
 (library
  (name appkit)
  (public_name camlkit-gui.appkit)
+ (flags :standard -ccopt "-framework AppKit")
  (libraries foundation))

appkit_extra/dune

@@ -1,4 +1,5 @@
 (library
  (name appkit_extra)
  (public_name camlkit-gui.appkit-extra)
+ (flags :standard -ccopt "-framework AppKit")
  (libraries foundation))

bin/dune

@@ -1,3 +1,8 @@
 (executable
  (name main)
+ (enabled_if (and
+ (<> %{context_name} default.ios)
+ (<> %{context_name} device.ios)
+ (<> %{context_name} simulator.ios)
+ (<> %{context_name} catalyst.ios)))
  (libraries foundation appkit webkit))

camlkit-base-ios.opam

@@ -16,7 +16,6 @@ depends: [
  "dune" {>= "3.13"}
  "ctypes-ios"
  "ctypes-foreign-ios"
- "odoc" {with-doc}
 ]
 build: [
  [
@@ -25,7 +24,6 @@ build: [
  "-j" jobs
  "-x" "ios"
  "@install"
- "@doc" {with-doc}
  ]
 ]
 dev-repo: "git+https://github.com/dboris/camlkit.git"

camlkit-gui-ios.opam

@@ -1,8 +1,8 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 version: "0.1.1"
-synopsis: "OCaml bindings to the AppKit and UIKit frameworks"
-description: "OCaml bindings to the AppKit and UIKit frameworks"
+synopsis: "OCaml bindings to the UIKit framework"
+description: "OCaml bindings to the UIKit framework"
 maintainer: ["Boris D. <[email protected]>"]
 authors: ["Boris D. <[email protected]>"]
 license: "ISC"

camlkit-gui.opam

@@ -1,8 +1,8 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 version: "0.1.1"
-synopsis: "OCaml bindings to the AppKit and UIKit frameworks"
-description: "OCaml bindings to the AppKit and UIKit frameworks"
+synopsis: "OCaml bindings to the AppKit framework"
+description: "OCaml bindings to the AppKit framework"
 maintainer: ["Boris D. <[email protected]>"]
 authors: ["Boris D. <[email protected]>"]
 license: "ISC"

demo/dune

@@ -4,8 +4,7 @@
  (= %{context_name} device.ios)
  (= %{context_name} simulator.ios)
  (= %{context_name} catalyst.ios)))
- (flags :standard -ccopt "-framework UIKit")
- (libraries camlkit-base.foundation camlkit-gui.uikit))
+ (libraries camlkit-base.foundation camlkit-gui-ios.uikit))
 
 (subdir Demo.app
  (rule

dune-project

@@ -26,14 +26,14 @@
 
 (package
  (name camlkit-gui)
- (synopsis "OCaml bindings to the AppKit and UIKit frameworks")
- (description "OCaml bindings to the AppKit and UIKit frameworks")
+ (synopsis "OCaml bindings to the AppKit framework")
+ (description "OCaml bindings to the AppKit framework")
  (depends
  ocaml
  dune
  (camlkit-base (= :version))
  (alcotest :with-test))
- (tags (objc bindings cocoa ios gnustep)))
+ (tags (objc bindings cocoa macos gnustep)))
 
 (package
  (name camlkit)
@@ -58,19 +58,19 @@
  ctypes
  ctypes-foreign
  (alcotest :with-test))
- (tags (objc bindings cocoa ios gnustep)))
+ (tags (objc bindings cocoa ios)))
 
 (package
  (name camlkit-gui-ios)
- (synopsis "OCaml bindings to the AppKit and UIKit frameworks")
- (description "OCaml bindings to the AppKit and UIKit frameworks")
+ (synopsis "OCaml bindings to the UIKit framework")
+ (description "OCaml bindings to the UIKit framework")
  (allow_empty)
  (depends
  ocaml
  dune
  (camlkit-base (= :version))
  (alcotest :with-test))
- (tags (objc bindings cocoa ios gnustep)))
+ (tags (objc bindings cocoa ios)))
 
 (package
  (name camlkit-ios)
@@ -83,4 +83,4 @@
  (camlkit-base-ios (= :version))
  (camlkit-gui-ios (= :version))
  (alcotest :with-test))
- (tags (objc cocoa ios gnustep)))
+ (tags (objc cocoa ios)))

uikit/dune

@@ -1,4 +1,10 @@
 (library
  (name uikit)
- (public_name camlkit-gui.uikit)
+ (public_name camlkit-gui-ios.uikit)
+ (enabled_if (or
+ (= %{context_name} default.ios)
+ (= %{context_name} device.ios)
+ (= %{context_name} simulator.ios)
+ (= %{context_name} catalyst.ios)))
+ (flags :standard -ccopt "-framework UIKit")
  (libraries foundation))

uikit_extra/dune

@@ -1,4 +1,10 @@
 (library
  (name uikit_extra)
- (public_name camlkit-gui.uikit-extra)
+ (public_name camlkit-gui-ios.uikit-extra)
+ (enabled_if (or
+ (= %{context_name} default.ios)
+ (= %{context_name} device.ios)
+ (= %{context_name} simulator.ios)
+ (= %{context_name} catalyst.ios)))
+ (flags :standard -ccopt "-framework UIKit")
  (libraries foundation))