Commit 5444319e authored by Drew's avatar Drew

Merge branch 'master' of code.sealedabstract.com:drewcrawford/Caroline

parents 40b2b507 64d8a54a
Pipeline #2359 passed with stages
in 3 minutes and 3 seconds
...@@ -5,16 +5,19 @@ stages: ...@@ -5,16 +5,19 @@ stages:
osx: osx:
stage: test stage: test
script: script:
- atpm fetch
- atbuild check - atbuild check
tags: tags:
- xc7 - xc7
- openswift - openswift
- atbuild - atbuild
- atpm
osxxcode: osxxcode:
stage: test stage: test
script: script:
- atpm fetch
- atbuild coretest-gen - atbuild coretest-gen
- atbuild coretest --toolchain xcode - atbuild coretest --toolchain xcode
...@@ -22,12 +25,14 @@ osxxcode: ...@@ -22,12 +25,14 @@ osxxcode:
- xc7 - xc7
- openswift - openswift
- atbuild - atbuild
- atpm
linux: linux:
stage: test stage: test
script: script:
- apt-get update - apt-get update
- apt-get install atbuild -y - apt-get install atbuild atpm -y
- atpm fetch
- atbuild coretest - atbuild coretest
tags: tags:
...@@ -53,6 +58,7 @@ documentation: ...@@ -53,6 +58,7 @@ documentation:
osxcorepackage: osxcorepackage:
stage: package stage: package
script: script:
- atpm fetch
- atbuild core-framework --toolchain xcode --configuration release - atbuild core-framework --toolchain xcode --configuration release
tags: tags:
...@@ -60,6 +66,7 @@ osxcorepackage: ...@@ -60,6 +66,7 @@ osxcorepackage:
- openswift - openswift
- atbuild - atbuild
- package-framework - package-framework
- atpm
artifacts: artifacts:
paths: paths:
...@@ -68,6 +75,7 @@ osxcorepackage: ...@@ -68,6 +75,7 @@ osxcorepackage:
osxtoolpackage: osxtoolpackage:
stage: package stage: package
script: script:
- atpm fetch
- atbuild package-statictool --configuration release - atbuild package-statictool --configuration release
tags: tags:
...@@ -75,6 +83,7 @@ osxtoolpackage: ...@@ -75,6 +83,7 @@ osxtoolpackage:
- openswift - openswift
- atbuild - atbuild
- package-homebrew - package-homebrew
- atpm
artifacts: artifacts:
paths: paths:
...@@ -85,7 +94,8 @@ linuxtoolpackage: ...@@ -85,7 +94,8 @@ linuxtoolpackage:
stage: package stage: package
script: script:
- apt-get update - apt-get update
- apt-get install atbuild package-deb -y - apt-get install atbuild atpm package-deb -y
- atpm fetch
- atbuild package-statictool --configuration release - atbuild package-statictool --configuration release
tags: tags:
...@@ -101,6 +111,7 @@ linuxtoolpackage: ...@@ -101,6 +111,7 @@ linuxtoolpackage:
ioscorepackage: ioscorepackage:
stage: package stage: package
script: script:
- atpm fetch
- atbuild core-framework --toolchain xcode --platform ios --configuration release - atbuild core-framework --toolchain xcode --platform ios --configuration release
tags: tags:
...@@ -108,6 +119,7 @@ ioscorepackage: ...@@ -108,6 +119,7 @@ ioscorepackage:
- openswift - openswift
- atbuild - atbuild
- package-framework - package-framework
- atpm
artifacts: artifacts:
paths: paths:
......
;; Anarchy Tools Package Manager lock file
;;
;; If you want to pin a package to a git commit add a ':pin'
;; line to that package definition. This will override all version
;; information the build files specify.
;;
;; You may override the repository URL for a package by specifying
;; it in an ':override-url' line. This is very handy if you develop
;; the dependency in parallel to the package that uses it
(lock-file
:packages [
{
:url "https://code.sealedabstract.com/drewcrawford/StandBack.git"
:payloads [
{
:key "git"
:used-commit "d36b65374eddc1585fbdcd3b5f18dd199770d8d4"
:pin false
}
]
}
]
)
(package (package
:name "Caroline" :name "Caroline"
:version "0.1" :version "0.1"
:external-packages [
{
:version [">=0.1"]
:url "https://code.sealedabstract.com/drewcrawford/StandBack.git"
}
]
:tasks { :tasks {
:statictool { :statictool {
:tool "atllbuild" :tool "atllbuild"
...@@ -10,6 +16,8 @@ ...@@ -10,6 +16,8 @@
:sources ["caroline-static-tool/**.swift"] :sources ["caroline-static-tool/**.swift"]
:publish-product true :publish-product true
:link-options ["-static-stdlib"] :link-options ["-static-stdlib"]
:dependencies ["StandBack.default"]
:link-with-product ["StandBack.a"]
} }
:statictool-atbin { :statictool-atbin {
......
This diff is collapsed.
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import StandBack
func findTests(_ sourceFiles: [String]) -> [String] { func findTests(_ sourceFiles: [String]) -> [String] {
var tests: [String] = [] var tests: [String] = []
for file in sourceFiles { for file in sourceFiles {
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import StandBack
#if os(Linux) #if os(Linux)
import Glibc import Glibc
#else #else
......
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