Linux-based bootstrap

Dockerfile

+FROM drewcrawford/swift:latest
+ADD . /atbuild
+WORKDIR atbuild
+RUN bootstrap/build.sh linux
\ No newline at end of file

atpkg @ 9337c332

-Subproject commit 28b7e5ced8f8d66748402d50f13af3cc099c0c85
+Subproject commit 9337c33285e9432592d7f5ea695432649d144bf3

bootstrap/bootstrap-linux.swift-build

 client:
   name: swift-build
 
-targets:
-  "": [<atbuild>]
+tools: {}
 
+targets:
+  "": [<atllbuild>]
+  atllbuild: [<atllbuild>]
 commands:
-  atpkg-build:
-    tool: swift-compiler
-    sources:
-      - ../atpkg/src/parsing/Scanner.swift
-      - ../atpkg/src/parsing/Tokenization.swift
-      - ../atpkg/src/parsing/Parser.swift
-      - ../atpkg/src/Package.swift
-    outputs:
-      - <atpkg-obj>
-    objects:
-      - ../.built/bootstrap/atpkg/Scanner.o
-      - ../.built/bootstrap/atpkg/Tokenization.o
-      - ../.built/bootstrap/atpkg/Parser.o
-      - ../.built/bootstrap/atpkg/Package.o
-    module-name: atpkg
-    module-output-path: ../.built/bootstrap/atpkg/atpkg.swiftmodule
-    temps-path: ../.built/bootstrap/atpkg/tmp
-    other-args:
-      - -j8
-      - -I
-      - ../.built/bootstrap/atpkg
-  
-  attools-build:
-    tool: swift-compiler
-    sources:
-      - ../attools/src/atllbuild.swift
-      - ../attools/src/Nop.swift
-      - ../attools/src/Shell.swift
-      - ../attools/src/Tools.swift
-    outputs:
-      - <attools-obj>
-    objects:
-      - ../.built/bootstrap/attools/atllbuild.o
-      - ../.built/bootstrap/attools/Nop.o
-      - ../.built/bootstrap/attools/Shell.o
-      - ../.built/bootstrap/attools/Tools.o
-    module-name: attools
-    module-output-path: ../.built/bootstrap/attools/attools.swiftmodule
-    temps-path: ../.built/bootstrap/attools/tmp
-    other-args:
-      - -j8
-      - -I
-      - ../.built/bootstrap/attools
-
-  atbuild-build:
-    tool: swift-compiler
-    sources:
-      - ../atbuild/src/main.swift
-      - ../atbuild/src/PlatformPaths.swift
-      - ../atbuild/src/Task.swift
-    inputs:
-      - <atpkg-obj>
-      - <attools-obj>
-    outputs:
-      - <atbuild-obj>
-    objects:
-      - ../.built/bootstrap/atbuild/main.o
-      - ../.built/bootstrap/atbuild/PlatformPaths.o
-      - ../.built/bootstrap/atbuild/Task.o
-    module-name: atbuild
-    module-output-path: ../.built/bootstrap/atbuild/atbuild.swiftmodule
-    temps-path: ../.built/bootstrap/atbuild/tmp
-    other-args:
-      - -j8
-      - -I
-      - ../.built/bootstrap/atpkg
-      - -I
-      - ../.built/bootstrap/attools
-
-  atpkg-lib:
-    tool: shell
-    description: Producing atpkg static library.
-    inputs:
-      - <atpkg-obj>
-    outputs:
-      - <atpkg-lib>
-      - ../.built/bootstrap/atpkg/atpkg.a
-    args:
-      - /bin/sh
-      - -c
-      - ar cr ../.built/bootstrap/atpkg/atpkg.a ../.built/bootstrap/atpkg/Scanner.o ../.built/bootstrap/atpkg/Tokenization.o ../.built/bootstrap/atpkg/Parser.o ../.built/bootstrap/atpkg/Package.o
-
-  attools-lib:
-    tool: shell
-    description: Producing attools static library.
-    inputs:
-      - <attools-obj>
-    outputs:
-      - <attools-lib>
-      - ../.built/bootstrap/attools/attools.a
-    args:
-      - /bin/sh
-      - -c
-      - ar cr ../.built/bootstrap/attools/attools.a ../.built/bootstrap/attools/atllbuild.o ../.built/bootstrap/attools/Nop.o ../.built/bootstrap/attools/Shell.o ../.built/bootstrap/attools/Tools.o
-
-  atbuild-link:
+  <atllbuild-swiftc>:
+     tool: swift-compiler
+     executable: "/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/swiftc"
+     inputs: ["atbuild/src/main.swift"]
+     sources: ["atbuild/src/main.swift"]
+     objects: [".atllbuild/objects/main.swift.o"]
+     outputs: ["<atllbuild-swiftc>", ".atllbuild/objects/main.swift.o"]
+     module-name: atbuild
+     module-output-path: .atllbuild/products/atbuild.swiftmodule
+     temps-path: .atllbuild//llbuildtmp
+     other-args: ["-j8", "-D", "ATBUILD", "-I", ".atllbuild/products/", "-sdk", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"]
+  <atllbuild>:
     tool: shell
-    description: Producing atbuild binary.
-    inputs:
-      - <atpkg-lib>
-      - <attools-lib>
-      - <atbuild-obj>
-    outputs:
-      - <atbuild>
-      - ../.built/bootstrap/atbuild/atbuild
-    args:
-      - /Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/swiftc
-      - -o
-      - ../.built/bootstrap/atbuild/atbuild
-      - ../.built/bootstrap/atbuild/main.o
-      - ../.built/bootstrap/atbuild/PlatformPaths.o
-      - ../.built/bootstrap/atbuild/Task.o
-      - ../.built/bootstrap/attools/attools.a
-      - ../.built/bootstrap/atpkg/atpkg.a
+    inputs: ["<atllbuild-swiftc>", ".atllbuild/objects/main.swift.o", ".atllbuild/products/attools.a", ".atllbuild/products/atpkg.a"]
+    outputs: ["<atllbuild>", ".atllbuild/products/atbuild"]
+    args: ["/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin/swiftc", "-o", ".atllbuild/products/atbuild", ".atllbuild/objects/main.swift.o", ".atllbuild/products/attools.a", ".atllbuild/products/atpkg.a"]
+    description: Linking executable .atllbuild/products/atbuild

build.atpkg

@@ -20,7 +20,7 @@
 
   :configurations {
         :bootstrap {
-             :yes {
+             :osx {
                 :attools {
                   :bootstrapOnly true
                   :llbuildyaml "bootstrap/bootstrap-macosx-attools.swift-build"
@@ -30,6 +30,16 @@
                   :llbuildyaml "bootstrap/bootstrap-macosx.swift-build"
                 }
              }
+             :linux {
+                :attools {
+                  :bootstrapOnly true
+                  :llbuildyaml "bootstrap/bootstrap-linux-attools.swift-build"
+                }
+                :atbuild {
+                  :bootstrapOnly true
+                  :llbuildyaml "bootstrap/bootstrap-linux.swift-build"
+                }
+             }
         }
   }