Fixes compilation of RxCocoa on Linux.

tottakai · Oct 9, 2016 · 5e9b1ff · 5e9b1ff
1 parent 77469a7
commit 5e9b1ff
Show file tree

Hide file tree

Showing 18 changed files with 174 additions and 40 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,6 @@
 import PackageDescription
 
+#if !os(Linux)
 let package = Package(
  name: "RxSwift",
  targets: [
@@ -45,3 +46,44 @@ let package = Package(
  "Tests"
  ]
 )
+#else 
+let package = Package(
+ name: "RxSwift",
+ targets: [
+ Target(
+ name: "RxSwift"
+ ),
+ Target(
+ name: "RxBlocking",
+ dependencies: [
+ .Target(name: "RxSwift")
+ ]
+ ),
+ Target(
+ name: "RxCocoa",
+ dependencies: [
+ .Target(name: "RxSwift")
+ ]
+ ),
+ Target(
+ name: "RxTest",
+ dependencies: [
+ .Target(name: "RxSwift")
+ ]
+ ),
+ Target(
+ name: "AllTestz",
+ dependencies: [
+ .Target(name: "RxSwift"),
+ .Target(name: "RxBlocking"),
+ .Target(name: "RxTest"),
+ .Target(name: "RxCocoa")
+ ]
+ )
+ ],
+ exclude: [
+ "Tests",
+ "Sources/RxCocoaRuntime"
+ ]
+)
+#endif
diff --git a/RxCocoa/CocoaUnits/Driver/Driver.swift b/RxCocoa/CocoaUnits/Driver/Driver.swift
@@ -72,9 +72,17 @@ public func driveOnScheduler(_ scheduler: SchedulerType, action: () -> ()) {
  driverObserveOnScheduler = originalObserveOnScheduler
 }
 
+#if os(Linux)
+ import Glibc
+#endif
+
 func _forceCompilerToStopDoingInsaneOptimizationsThatBreakCode(_ scheduler: SchedulerType) {
  let a: Int32 = 1
+#if os(Linux)
+ let b = 314 + Int32(Glibc.random() & 1)
+#else
  let b = 314 + Int32(arc4random() & 1)
+#endif
  if a == b {
  print(scheduler)
  }

diff --git a/RxCocoa/Common/DelegateProxy.swift b/RxCocoa/Common/DelegateProxy.swift
@@ -6,10 +6,12 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if DELEGATE_PROXY_ON
+
 import Foundation
 #if !RX_NO_MODULE
  import RxSwift
- #if SWIFT_PACKAGE
+ #if SWIFT_PACKAGE && !os(Linux)
  import RxCocoaRuntime
  #endif
 #endif
@@ -274,3 +276,6 @@ open class DelegateProxy : _RXDelegateProxy {
  return p
  }
 }
+
+#endif
+
diff --git a/RxCocoa/Common/DelegateProxyType.swift b/RxCocoa/Common/DelegateProxyType.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if DELEGATE_PROXY_ON
+
 import Foundation
 #if !RX_NO_MODULE
 import RxSwift
@@ -278,3 +280,5 @@ extension ObservableType {
  return Disposables.create(subscription, disposable)
  }
 }
+
+#endif
diff --git a/RxCocoa/Common/NSLayoutConstraint+Rx.swift b/RxCocoa/Common/NSLayoutConstraint+Rx.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(OSX)
+
 import Foundation
 
 #if os(OSX)
@@ -41,3 +43,5 @@ extension Reactive where Base: NSLayoutConstraint {
 }
 
 #endif
+
+#endif
diff --git a/RxCocoa/Common/RxCocoaObjCRuntimeError+Extensions.swift b/RxCocoa/Common/RxCocoaObjCRuntimeError+Extensions.swift
@@ -8,12 +8,12 @@
 
 import Foundation
 #if !RX_NO_MODULE
- #if SWIFT_PACKAGE
+ #if SWIFT_PACKAGE && SWIZZLING_ON
  import RxCocoaRuntime
  #endif
 #endif
 
-#if !DISABLE_SWIZZLING
+#if SWIZZLING_ON
  /**
  RxCocoa ObjC runtime interception mechanism.
  */

diff --git a/RxCocoa/Foundation/KVORepresentable+CoreGraphics.swift b/RxCocoa/Foundation/KVORepresentable+CoreGraphics.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(OSX)
+
 import Foundation
 #if !RX_NO_MODULE
  import RxSwift
@@ -68,4 +70,6 @@ extension CGSize : KVORepresentable {
  KVOValue.getValue(&typedValue)
  self = typedValue
  }
-}
+}
+
+#endif
diff --git a/RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift b/RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if KVO_ON
+
 import Foundation
 #if !RX_NO_MODULE
  import RxSwift
@@ -28,7 +30,7 @@ extension Reactive where Base: NSObject {
  }
 }
 
-#if !DISABLE_SWIZZLING
+#if SWIZZLING_ON
  // KVO
  extension Reactive where Base: NSObject {
  /**
@@ -43,3 +45,5 @@ extension Reactive where Base: NSObject {
  }
  }
 #endif
+
+#endif
diff --git a/RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift b/RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if KVO_ON
+
 import Foundation
 #if !RX_NO_MODULE
  import RxSwift
@@ -49,3 +51,5 @@ extension Reactive where Base: NSObject {
  }
  }
 #endif
+
+#endif
diff --git a/RxCocoa/Foundation/NSObject+Rx.swift b/RxCocoa/Foundation/NSObject+Rx.swift
@@ -6,21 +6,25 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if !os(Linux)
+
 import Foundation
 #if !RX_NO_MODULE
  import RxSwift
- #if SWIFT_PACKAGE
+ #if SWIFT_PACKAGE && SWIZZLING_ON
  import RxCocoaRuntime
  #endif
 #endif
 
-#if !DISABLE_SWIZZLING
+#if SWIZZLING_ON
 var deallocatingSubjectTriggerContext: UInt8 = 0
 var deallocatingSubjectContext: UInt8 = 0
 #endif
 var deallocatedSubjectTriggerContext: UInt8 = 0
 var deallocatedSubjectContext: UInt8 = 0
 
+#if KVO_ON
+
 /**
 KVO is a tricky mechanism.
 
@@ -67,7 +71,9 @@ extension Reactive where Base: NSObject {
  }
 }
 
-#if !DISABLE_SWIZZLING
+#endif
+
+#if SWIZZLING_ON
 // KVO
 extension Reactive where Base: NSObject {
  /**
@@ -117,7 +123,7 @@ extension Reactive where Base: AnyObject {
  }
  }
 
-#if !DISABLE_SWIZZLING
+#if SWIZZLING_ON
 
  /**
  Observable sequence of message arguments that completes when object is deallocated.
@@ -237,7 +243,7 @@ extension Reactive where Base: AnyObject {
 
 // MARK: Message interceptors
 
-#if !DISABLE_SWIZZLING
+#if SWIZZLING_ON
 
  fileprivate protocol MessageInterceptorSubject: class {
  init()
@@ -322,6 +328,8 @@ fileprivate class DeallocObservable {
 
 // MARK: KVO
 
+#if KVO_ON
+
 fileprivate protocol KVOObservableProtocol {
  var target: AnyObject { get }
  var keyPath: String { get }
@@ -393,7 +401,9 @@ fileprivate class KVOObservable<Element>
 
 }
 
-#if !DISABLE_SWIZZLING
+#endif
+
+#if SWIZZLING_ON
 
  fileprivate func observeWeaklyKeyPathFor(_ target: NSObject, keyPath: String, options: NSKeyValueObservingOptions) -> Observable<AnyObject?> {
  let components = keyPath.components(separatedBy: ".").filter { $0 != "self" }
@@ -520,3 +530,5 @@ extension Reactive where Base: AnyObject {
  return observable
  }
 }
+
+#endif
diff --git a/RxCocoa/Foundation/NSURLSession+Rx.swift b/RxCocoa/Foundation/NSURLSession+Rx.swift
@@ -61,8 +61,8 @@ func convertURLRequestToCurlCommand(_ request: URLRequest) -> String {
  let method = request.httpMethod ?? "GET"
  var returnValue = "curl -X \(method) "
 
- if  request.httpMethod == "POST" && request.httpBody != nil {
- let maybeBody = NSString(data: request.httpBody!, encoding: String.Encoding.utf8.rawValue) as? String
+ if let httpBody = request.httpBody, request.httpMethod == "POST" {
+ let maybeBody = String(data: httpBody, encoding: String.Encoding.utf8)
  if let body = maybeBody {
  returnValue += "-d \"\(escapeTerminalString(body))\" "
  }
@@ -123,11 +123,14 @@ extension Reactive where Base: URLSession {
  return Observable.create { observer in
 
  // smart compiler should be able to optimize this out
- var d: Date?
+ let d: Date?
 
  if Logging.URLRequests(request) {
  d = Date()
  }
+ else {
+ d = nil
+ }
 
  let task = self.base.dataTask(with: request) { (data, response, error) in
 
@@ -204,10 +207,10 @@ extension Reactive where Base: URLSession {
  - returns: Observable sequence of response JSON.
  */
  // @warn_unused_result(message:"http://git.io/rxs.uo")
- public func JSON(_ request: URLRequest) -> Observable<AnyObject> {
- return data(request).map { (data) -> AnyObject in
+ public func JSON(_ request: URLRequest) -> Observable<Any> {
+ return data(request).map { (data) -> Any in
  do {
- return try JSONSerialization.jsonObject(with: data, options: []) as AnyObject
+ return try JSONSerialization.jsonObject(with: data, options: [])
  } catch let error {
  throw RxCocoaURLError.deserializationError(error: error)
  }
@@ -232,7 +235,8 @@ extension Reactive where Base: URLSession {
  - returns: Observable sequence of response JSON.
  */
  // @warn_unused_result(message:"http://git.io/rxs.uo")
- public func JSON(_ URL: Foundation.URL) -> Observable<AnyObject> {
+ public func JSON(_ URL: Foundation.URL) -> Observable<Any> {
  return JSON(URLRequest(url: URL))
  }
 }
+
diff --git a/RxCocoa/OSX/NSButton+Rx.swift b/RxCocoa/OSX/NSButton+Rx.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(OSX)
+
 import Foundation
 #if !RX_NO_MODULE
 import RxSwift
@@ -35,3 +37,5 @@ extension Reactive where Base: NSButton {
  )
  }
 }
+
+#endif
diff --git a/RxCocoa/OSX/NSControl+Rx.swift b/RxCocoa/OSX/NSControl+Rx.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(OSX)
+
 import Foundation
 import Cocoa
 #if !RX_NO_MODULE
@@ -85,3 +87,5 @@ extension Reactive where Base: NSControl {
  }.asObserver()
  }
 }
+
+#endif
diff --git a/RxCocoa/OSX/NSImageView+Rx.swift b/RxCocoa/OSX/NSImageView+Rx.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(OSX)
+
 import Foundation
 #if !RX_NO_MODULE
 import RxSwift
@@ -68,3 +70,5 @@ extension Reactive where Base: NSImageView {
  }.asObserver()
  }
 }
+
+#endif
diff --git a/RxCocoa/OSX/NSSlider+Rx.swift b/RxCocoa/OSX/NSSlider+Rx.swift
@@ -6,6 +6,8 @@
 // Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+#if os(OSX)
+
 import Foundation
 #if !RX_NO_MODULE
 import RxSwift
@@ -30,3 +32,5 @@ extension Reactive where Base: NSSlider {
  }
 
 }
+
+#endif