fix(bindings/swift): reorg the package to correct its name (#2479)

bindings/swift/.gitignore

@@ -4,9 +4,10 @@
 /*.xcodeproj
 xcuserdata/
 DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc
 
-/include
-/lib
+/OpenDAL/.build
+/OpenDAL/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+/OpenDAL/.swiftpm/config/registries.json
+/OpenDAL/Sources/COpenDAL/include
+/OpenDAL/Sources/COpenDAL/lib

bindings/swift/Makefile

@@ -16,32 +16,32 @@
 # under the License.
 
 C_BINDING_SRC_DIR=../c
+SWIFT_PKG_DIR=./OpenDAL
 ROOT_DIR=../..
 
-INCLUDE_DIR=./include
-LIB_DIR=./lib
+INCLUDE_DIR=$(SWIFT_PKG_DIR)/Sources/COpenDAL/include
+LIB_DIR=$(SWIFT_PKG_DIR)/Sources/COpenDAL/lib
 DIRS=$(INCLUDE_DIR) $(LIB_DIR)
 
 .PHONY: all
 all: build-swift
 
 .PHONY: build-c
 build-c: $(DIRS)
-	cd $(C_BINDING_SRC_DIR)
 	cargo build --release --manifest-path $(C_BINDING_SRC_DIR)/Cargo.toml
 	cp $(C_BINDING_SRC_DIR)/include/* $(INCLUDE_DIR)
 	cp $(ROOT_DIR)/target/release/libopendal_c.a $(LIB_DIR)
 
 .PHONY: build-swift
 build-swift: build-c
-	swift build
+	cd $(SWIFT_PKG_DIR) && swift build
 
 .PHONY: test
 test: build-c
-	swift test
+	cd $(SWIFT_PKG_DIR) && swift test
 
 $(DIRS):
-	mkdir $@
+	mkdir -p $@
 
 .PHONY: clean
 clean:

bindings/swift/Package.swift → bindings/swift/OpenDAL/Package.swift

@@ -17,8 +17,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+import Foundation
 import PackageDescription
 
+let packageRoot = (#file as NSString).deletingLastPathComponent
+
 let package = Package(
     name: "OpenDAL",
     products: [
@@ -32,8 +35,7 @@ let package = Package(
             name: "OpenDAL",
             dependencies: ["COpenDAL"],
             linkerSettings: [
-                .unsafeFlags(["-L./lib"]),
-                .linkedLibrary("opendal_c"),
+                .unsafeFlags(["-L\(packageRoot)/Sources/COpenDAL/lib"]),
             ]),
         .testTarget(
             name: "OpenDALTests",

bindings/swift/Sources/COpenDAL/module.modulemap → bindings/swift/OpenDAL/Sources/COpenDAL/module.modulemap

@@ -16,7 +16,7 @@
 // under the License.
 
 module COpenDAL [system] {
-    header "../../include/opendal.h"
+    header "include/opendal.h"
     link "opendal_c"
 
     export *