Improve support for the Swift Package Manager

Still not quite there (compiler errors), but this brings support a lot closer.
alejandro-isaza · Dec 9, 2016 · 0a15376 · 0a15376
1 parent 968d4ad
commit 0a15376
Show file tree

Hide file tree

Showing 27 changed files with 130 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,12 +7,10 @@ xcuserdata/
 *.xccheckout
 *.xcscmblueprint
 
-# Object files
-*.o
-*.lo
-.deps/
-.libs/
-.build/
-
 # Carthage
 Carthage/
+
+# Swift Package Manager
+#
+Packages/
+.build/
diff --git a/HDF5Kit.xcodeproj/project.pbxproj b/HDF5Kit.xcodeproj/project.pbxproj
diff --git a/Source/Attribute.swift b/Source/Attribute.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 open class Attribute {
     public internal(set) var id: hid_t = -1
 

diff --git a/Source/Dataset.swift b/Source/Dataset.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 open class Dataset: Object {
     /// The address in the file of the dataset or `nil` if the offset is undefined. That address is expressed as the offset in bytes from the beginning of the file.
     public var offset: Int? {

diff --git a/Source/Dataspace.swift b/Source/Dataspace.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public class Dataspace {
     var id: hid_t
 

diff --git a/Source/Datatype.swift b/Source/Datatype.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public enum DataClass: Int32 {
     case noClass   = -1  // error
     case integer   = 0   // integer types

diff --git a/Source/DoubleAttribute.swift b/Source/DoubleAttribute.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 open class DoubleAttribute: Attribute {
 
     public func read() throws -> [Double] {

diff --git a/Source/DoubleDataset.swift b/Source/DoubleDataset.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public class DoubleDataset: Dataset {
     public subscript(slices: HyperslabIndexType...) -> [Double] {
         // There is a problem with Swift where it gives a compiler error if `set` is implemented here

diff --git a/Source/Error.swift b/Source/Error.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public enum Error: Swift.Error {
     case ioError
 }
diff --git a/Source/File.swift b/Source/File.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public class File: GroupType {
     public enum CreateMode: UInt32 {
         case truncate  = 0x02 // Overwrite existing files

diff --git a/Source/FloatAttribute.swift b/Source/FloatAttribute.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 open class FloatAttribute: Attribute {
 
     public func read() throws -> [Float] {

diff --git a/Source/FloatDataset.swift b/Source/FloatDataset.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public class FloatDataset: Dataset {
     public subscript(slices: HyperslabIndexType...) -> [Float] {
         // There is a problem with Swift where it gives a compiler error if `set` is implemented here

diff --git a/Source/Group.swift b/Source/Group.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public protocol GroupType {
     var id: hid_t { get }
 }

diff --git a/Source/HyperslabIndex.swift b/Source/HyperslabIndex.swift
@@ -5,6 +5,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 postfix operator ..
 
 prefix operator ..

diff --git a/Source/IntAttribute.swift b/Source/IntAttribute.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 open class IntAttribute: Attribute {
 
     public func read() throws -> [Int] {

diff --git a/Source/IntDataset.swift b/Source/IntDataset.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public class IntDataset: Dataset {
     public subscript(slices: HyperslabIndexType...) -> [Int] {
         // There is a problem with Swift where it gives a compiler error if `set` is implemented here

diff --git a/Source/NativeType.swift b/Source/NativeType.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public enum NativeType {
     case int
     case uint

diff --git a/Source/Object.swift b/Source/Object.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 open class Object {
     public internal(set) var id: hid_t = -1
 

diff --git a/Source/StringAttribute.swift b/Source/StringAttribute.swift
@@ -1,9 +1,13 @@
- // Copyright © 2016 Alejandro Isaza.
+// Copyright © 2016 Alejandro Isaza.
 //
 // This file is part of HDF5Kit. The full HDF5Kit copyright notice, including
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+ #if SWIFT_PACKAGE
+    import CHDF5
+ #endif
+
 open class StringAttribute: Attribute {
 
     public func read() throws -> [String] {

diff --git a/Source/StringDataset.swift b/Source/StringDataset.swift
@@ -4,6 +4,10 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
+#if SWIFT_PACKAGE
+    import CHDF5
+#endif
+
 public class StringDataset: Dataset {
     open subscript(slices: HyperslabIndexType...) -> [String] {
         // There is a problem with Swift where it gives a compiler error if `set` is implemented here

diff --git a/Tests/AttributeTests.swift → Tests/HDF5KitTests/AttributeTests.swift b/Tests/AttributeTests.swift → Tests/HDF5KitTests/AttributeTests.swift
diff --git a/Tests/DataspaceTests.swift → Tests/HDF5KitTests/DataspaceTests.swift b/Tests/DataspaceTests.swift → Tests/HDF5KitTests/DataspaceTests.swift
diff --git a/Tests/FileTests.swift → Tests/HDF5KitTests/FileTests.swift b/Tests/FileTests.swift → Tests/HDF5KitTests/FileTests.swift
diff --git a/Tests/GroupTests.swift → Tests/HDF5KitTests/GroupTests.swift b/Tests/GroupTests.swift → Tests/HDF5KitTests/GroupTests.swift
diff --git a/Tests/Helpers.swift → Tests/HDF5KitTests/Helpers.swift b/Tests/Helpers.swift → Tests/HDF5KitTests/Helpers.swift
diff --git a/Tests/HyperslabTests.swift → Tests/HDF5KitTests/HyperslabTests.swift b/Tests/HyperslabTests.swift → Tests/HDF5KitTests/HyperslabTests.swift
diff --git a/Tests/IndexingTests.swift → Tests/HDF5KitTests/IndexingTests.swift b/Tests/IndexingTests.swift → Tests/HDF5KitTests/IndexingTests.swift