Commit 133713be authored by Drew's avatar Drew

Merge branch 'master' of github.com:AnarchyTools/atbuild

parents d14eb4fa fe2e626a
Pipeline #1617 passed with stage
stages: stages:
- build - build
before_script:
- git submodule update --init --recursive
linux: linux:
stage: build stage: build
script: script:
- apt-get update - apt-get update
- apt-get install --no-install-recommends xz-utils curl ca-certificates -y - apt-get install --no-install-recommends xz-utils curl git ca-certificates -y
- curl -L https://github.com/AnarchyTools/atbuild/releases/download/0.9.0/atbuild-0.9.0-linux.tar.xz | tar xJ -C /usr/local - curl -L https://github.com/AnarchyTools/atbuild/releases/download/0.9.0/atbuild-0.9.0-linux.tar.xz | tar xJ -C /usr/local
- git submodule update --init --recursive
- bootstrap/build.sh linux - bootstrap/build.sh linux
- tests/test.sh - tests/test.sh
- mkdir atbuild-${CI_BUILD_REF_NAME} - mkdir atbuild-${CI_BUILD_REF_NAME}
- cp bin/atbuild atbuild-${CI_BUILD_REF_NAME} - cp bin/atbuild atbuild-${CI_BUILD_REF_NAME}
- tar cJf tar cJf atbuild-${CI_BUILD_REF_NAME}-linux.tar.xz atbuild-${CI_BUILD_REF_NAME} - tar cJf atbuild-${CI_BUILD_REF_NAME}-linux.tar.xz atbuild-${CI_BUILD_REF_NAME}
tags: tags:
- autoscale-linux - autoscale-linux
artifacts: artifacts:
paths: paths:
- atbuild-${CI_BUILD_REF_NAME}-linux.tar.xz - atbuild-${CI_BUILD_REF_NAME}-linux.tar.xz
image: drewcrawford/swift:latest
osx: osx:
stage: build stage: build
script: script:
- git submodule update --init --recursive
- export PATH=/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin:"${PATH}" - export PATH=/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin:"${PATH}"
- ./bootstrap/build.sh - ./bootstrap/build.sh
- bin/atbuild check - bin/atbuild check
- mkdir atbuild-${CI_BUILD_REF_NAME} - mkdir atbuild-${CI_BUILD_REF_NAME}
- cp bin/atbuild atbuild-${CI_BUILD_REF_NAME} - cp bin/atbuild atbuild-${CI_BUILD_REF_NAME}
- tar cJf tar cJf atbuild-${CI_BUILD_REF_NAME}-osx.tar.xz atbuild-${CI_BUILD_REF_NAME} - tar cJf atbuild-${CI_BUILD_REF_NAME}-osx.tar.xz atbuild-${CI_BUILD_REF_NAME}
tags: tags:
- openswift - openswift
artifacts: artifacts:
......
...@@ -398,7 +398,7 @@ final class ATllbuild : Tool { ...@@ -398,7 +398,7 @@ final class ATllbuild : Tool {
} }
if let umbrellaHeader = task[Options.UmbrellaHeader.rawValue]?.string { if let umbrellaHeader = task[Options.UmbrellaHeader.rawValue]?.string {
precondition(moduleMap == .Synthesized, ":\(Options.UmbrellaHeader.rawValue) \"synthesized\" must be used with the \(Options.UmbrellaHeader.rawValue) option") precondition(moduleMap == .Synthesized, ":\(Options.ModuleMap.rawValue) \"synthesized\" must be used with the \(Options.UmbrellaHeader.rawValue) option")
let s = synthesizeModuleMap(name: name, umbrellaHeader: "Umbrella.h") let s = synthesizeModuleMap(name: name, umbrellaHeader: "Umbrella.h")
try! s.write(toFile: workDirectory+"/include/module.modulemap", atomically: false, encoding: NSUTF8StringEncoding) try! s.write(toFile: workDirectory+"/include/module.modulemap", atomically: false, encoding: NSUTF8StringEncoding)
try! manager.copyItemAtPath_SWIFTBUG(srcPath: task.importedPath + umbrellaHeader, toPath: workDirectory + "/include/Umbrella.h") try! manager.copyItemAtPath_SWIFTBUG(srcPath: task.importedPath + umbrellaHeader, toPath: workDirectory + "/include/Umbrella.h")
......
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