Merge pull request #953 from swiftlang/t/actioncache

[llbuild3] Cleanup and Implement action cache support

Author: dmbryson

LICENSE.txt

@@ -222,6 +222,11 @@ licenses, and/or restrictions:
 
 Program             Directory
 -------             ---------
-Google Test         llbuild/utils/unittest/googletest
-LLVM                llbuild/lib/llvm, llbuild/include/llvm
+BLAKE3              thirdparty/BLAKE3
 CMake               cmake/modules/FindSQLite3.cmake
+LLVM                llbuild/lib/llvm, llbuild/include/llvm
+Google Protobuf     thirdparty/protobuf
+Google Test         llbuild/utils/unittest/googletest
+Swift Protobuf      thridparty/swift-protobuf
+result.hpp          products/llbuild3/Result.hpp
+

Makefile

@@ -1,4 +1,4 @@
-# Helper makefile for generating Tritium protobuf files
+# Helper makefile for generating llbuild3 protobuf files
 
 .PHONY: generate
 generate: generate-protos
@@ -15,7 +15,7 @@ generate-protos: proto-toolchain
 		--swift_out=src \
 		--swift_opt=Visibility=Public \
 		--swift_opt=ProtoPathModuleMappings=src/module_map.asciipb \
-		$$(find src -name \*.proto)
+		$$(find src -name \*.proto -not -name \*Internal\*)
 
 .PHONY: proto-toolchain
 proto-toolchain:

README.tritium.md renamed to README.llbuild3.md

@@ -1,4 +1,4 @@
-# Tritium — llbuild3
+# llbuild3
 
 ## Objectives
 
@@ -18,7 +18,7 @@
 
 ## API Overview — Ergonomics
 
-Tritium will incorporate concepts from llbuild1, llbuild2, and llbuild2fx.  The constructs are intended to enable a separation of the items that can be produced (Artifacts) from the computations that can produce them (Rules/Tasks), addressing an expression challenge that exists today in llbuild2fx rule definition.
+llbuild3 will incorporate concepts from llbuild1, llbuild2, and llbuild2fx.  The constructs are intended to enable a separation of the items that can be produced (Artifacts) from the computations that can produce them (Rules/Tasks), addressing an expression challenge that exists today in llbuild2fx rule definition.
 
 ### Dynamic Graph Definition
 
@@ -53,7 +53,7 @@ Tritium will incorporate concepts from llbuild1, llbuild2, and llbuild2fx.  The
 * Build
     * Outstanding, in-progress request to produce a specific artifact from the overall build namespace
 
-![Tritium Classes](./docs/tritium.jpg)
+![llbuild3 Classes](./docs/llbuild3.jpg)
 
 ### Engine Components
 
@@ -111,8 +111,8 @@ Next steps
 Code Structure
 
 * Framework Headers
-    * products/Tritium
+    * products/llbuild3
 * Framework Sources
-    * src/tritium
+    * src/llbuild3
 * Unit Tests
-    * unittests/TritiumCoreTests
+    * unittests/llbuild3CoreTests

Xcode/Configs/TritiumCommon.xcconfig renamed to Xcode/Configs/llbuild3Common.xcconfig

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-TRITIUM_INSTALL_BASE_PATH = $(TRITIUM_INSTALL_DIR:default=$(LOCAL_LIBRARY_DIR))
-TRITIUM_FRAMEWORKS_INSTALL_DIR = $(TRITIUM_INSTALL_BASE_PATH)/Frameworks
+LLBUILD3_INSTALL_BASE_PATH = $(LLBUILD3_INSTALL_DIR:default=$(LOCAL_LIBRARY_DIR))
+LLBUILD3_FRAMEWORKS_INSTALL_DIR = $(LLBUILD3_INSTALL_BASE_PATH)/Frameworks
 
 // Set the default product name.
 PRODUCT_NAME = $(TARGET_NAME)
@@ -69,4 +69,4 @@ CODE_SIGN_ENTITLEMENTS = $(LLBUILD_CODE_SIGN_ENTITLEMENTS__producttype_eq_$(PROD
 LLBUILD_CODE_SIGN_ENTITLEMENTS__producttype_eq_com_apple_product_type_tool = $(LLBUILD_TOOL_CODE_SIGN_ENTITLEMENTS)
 LLBUILD_TOOL_CODE_SIGN_ENTITLEMENTS =
 
-#include? "TritiumOverrides.xcconfig"
+#include? "llbuild3Overrides.xcconfig"

Xcode/Configs/TritiumDebug.xcconfig renamed to Xcode/Configs/llbuild3Debug.xcconfig

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 // Shared build settings.
-#include "TritiumCommon.xcconfig"
+#include "llbuild3Common.xcconfig"
 
 // Only build the active architecture for Debug.
 ONLY_ACTIVE_ARCH = YES

Xcode/Configs/TritiumRelease.xcconfig renamed to Xcode/Configs/llbuild3Release.xcconfig

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 // Shared build settings.
-#include "TritiumCommon.xcconfig"
+#include "llbuild3Common.xcconfig"
 
 // Prefer binary Info.plists for Release.
 INFOPLIST_OUTPUT_FORMAT = binary

Xcode/Tritium.xctestplan renamed to Xcode/llbuild3.xctestplan

@@ -16,7 +16,7 @@
       "target" : {
         "containerPath" : "container:llbuild.xcodeproj",
         "identifier" : "4072B5DD2C51BE5100B68221",
-        "name" : "TritiumTests"
+        "name" : "llbuild3Tests"
       }
     }
   ],

docs/tritium.jpg renamed to docs/llbuild3.jpg

@@ -16,8 +16,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "4072B5D62C51BE5100B68221"
-               BuildableName = "Tritium.framework"
-               BlueprintName = "Tritium"
+               BuildableName = "llbuild3.framework"
+               BlueprintName = "llbuild3"
                ReferencedContainer = "container:llbuild.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -30,8 +30,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "4072B5DD2C51BE5100B68221"
-               BuildableName = "TritiumTests.xctest"
-               BlueprintName = "TritiumTests"
+               BuildableName = "llbuild3Tests.xctest"
+               BlueprintName = "llbuild3Tests"
                ReferencedContainer = "container:llbuild.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -44,7 +44,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:Xcode/Tritium.xctestplan"
+            reference = "container:Xcode/llbuild3.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>
@@ -71,8 +71,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "4072B5D62C51BE5100B68221"
-            BuildableName = "Tritium.framework"
-            BlueprintName = "Tritium"
+            BuildableName = "llbuild3.framework"
+            BlueprintName = "llbuild3"
             ReferencedContainer = "container:llbuild.xcodeproj">
          </BuildableReference>
       </MacroExpansion>