Commit 86a5dffb authored by Drew's avatar Drew Committed by GitHub

Merge pull request #107 from AnarchyTools/use-atbin

Add the ability to link with an atbin
parents 98cb3523 f101a187
Pipeline #2181 passed with stage
in 4 minutes and 59 seconds
Subproject commit e8203454fc75d572f0d9a6232084b335312893d7 Subproject commit d089d2587ca133695d017941d6fbd41e8c145a60
This diff is collapsed.
...@@ -25,6 +25,24 @@ ...@@ -25,6 +25,24 @@
:module-map "synthesized" :module-map "synthesized"
} }
:use-satbin {
:tool "atllbuild"
:name "usesatbin"
:output-type "executable"
:sources ["use/**.swift"]
:dependencies ["satbin"]
:link-with-atbin ["bin/staticatbin.atbin"]
}
:use-datbin {
:tool "atllbuild"
:name "usesatbin"
:output-type "executable"
:sources ["used/**.swift"]
:dependencies ["datbin"]
:link-with-atbin ["bin/dynamicatbin.atbin"]
}
:dlib { :dlib {
:tool "atllbuild" :tool "atllbuild"
:name "dlib" :name "dlib"
...@@ -37,7 +55,7 @@ ...@@ -37,7 +55,7 @@
;; a corner case of the platform logic; we want to match ;; a corner case of the platform logic; we want to match
;; the dependencies platforms ;; the dependencies platforms
:dependencies ["slib"] :dependencies ["slib"]
:link-with ["slib.a"] :link-with-product ["slib.a"]
} }
:exec { :exec {
...@@ -76,6 +94,11 @@ ...@@ -76,6 +94,11 @@
:platforms ["ios-x86_64" "ios-i386"] :platforms ["ios-x86_64" "ios-i386"]
} }
:use {
:tool "nop"
:dependencies ["use-satbin" "use-datbin"]
}
:default { :default {
:tool "nop" :tool "nop"
:dependencies ["datbin" "satbin" "ebin" "simatbin"] :dependencies ["datbin" "satbin" "ebin" "simatbin"]
......
public class Foo { } public class Foo {public init() { }}
\ No newline at end of file \ No newline at end of file
import slib
let f = Foo()
print(f)
\ No newline at end of file
import dlib
let f = Foo()
print(f)
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
:output-type "dynamic-library" :output-type "dynamic-library"
:name "dynamicBar" :name "dynamicBar"
:sources ["src/bar.swift"] :sources ["src/bar.swift"]
:link-with ["dynamicFoo.dynamic"] :link-with-product ["dynamicFoo.dynamic"]
} }
:default { :default {
:dependencies ["foo" "bar"] :dependencies ["foo" "bar"]
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
:output-type "executable" :output-type "executable"
:name "dynamic_library_tester" :name "dynamic_library_tester"
:sources ["src/main.swift"] :sources ["src/main.swift"]
:link-with ["dynamicBar.dynamic" "dynamicFoo.dynamic"] :link-with-product ["dynamicBar.dynamic" "dynamicFoo.dynamic"]
} }
} }
) )
\ No newline at end of file
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
:xctest-strict true :xctest-strict true
:dependencies ["default"] :dependencies ["default"]
:publish-product true :publish-product true
:link-with ["UmbrellaHeader.a"] :link-with-product ["UmbrellaHeader.a"]
} }
:check { :check {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
:dependencies ["build-lib"] :dependencies ["build-lib"]
:xctestify true :xctestify true
:xctest-strict true :xctest-strict true
:link-with ["Foo.a"] :link-with-product ["Foo.a"]
} }
:run-tests { :run-tests {
:tool "xctestrun" :tool "xctestrun"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
:dependencies ["build-lib"] :dependencies ["build-lib"]
:xctestify true :xctestify true
:xctest-strict true :xctest-strict true
:link-with ["Foo.a"] :link-with-product ["Foo.a"]
} }
:run-tests { :run-tests {
:tool "xctestrun" :tool "xctestrun"
......
...@@ -97,6 +97,8 @@ $ATBUILD check ...@@ -97,6 +97,8 @@ $ATBUILD check
echo "****************ATBIN TEST**************" echo "****************ATBIN TEST**************"
cd $DIR/tests/fixtures/atbin cd $DIR/tests/fixtures/atbin
$ATBUILD use
$ATBUILD $ATBUILD
#did we build all the things we were supposed to? #did we build all the things we were supposed to?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment