feat: Reduce build time by including Lilu as a submodule

ChefKissInc · Aug 29, 2024 · 84ccc6f · 84ccc6f
1 parent 746f09e
commit 84ccc6f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,10 +22,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: "recursive"
-      - name: CI Bootstrap
-        run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
-      - name: Lilu Bootstrap
-        run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/Lilu/master/Lilu/Scripts/bootstrap.sh) && eval "$src" || exit 1
       - run: xcodebuild -configuration Debug -arch x86_64 build
       - run: xcodebuild -configuration Release -arch x86_64 build
       - name: Upload to Artifacts
@@ -54,9 +50,5 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: "recursive"
-      - name: CI Bootstrap
-        run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
-      - name: Lilu Bootstrap
-        run: src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/Lilu/master/Lilu/Scripts/bootstrap.sh) && eval "$src" || exit 1
       - run: xcodebuild analyze -quiet -scheme NootedRed -configuration Debug -arch x86_64 CLANG_ANALYZER_OUTPUT=plist-html CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang-analyze" && [ "$(find clang-analyze -name "*.html")" = "" ]
       - run: xcodebuild analyze -quiet -scheme NootedRed -configuration Release -arch x86_64 CLANG_ANALYZER_OUTPUT=plist-html CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang-analyze" && [ "$(find clang-analyze -name "*.html")" = "" ]
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "MacKernelSDK"]
 	path = MacKernelSDK
 	url = https://github.com/Acidanthera/MacKernelSDK.git
+[submodule "Lilu"]
+	path = Lilu
+	url = https://github.com/acidanthera/Lilu
diff --git a/Lilu b/Lilu
diff --git a/NootedRed.xcodeproj/project.pbxproj b/NootedRed.xcodeproj/project.pbxproj
@@ -276,7 +276,7 @@
 				CE405EDA1E4A080F00AA0B3D /* plugin_start.hpp */,
 			);
 			name = Headers;
-			path = Lilu.kext/Contents/Resources/Headers;
+			path = Lilu/Lilu/Headers;
 			sourceTree = SOURCE_ROOT;
 		};
 		CE405EC51E49DD7100AA0B3D /* Library */ = {
@@ -285,7 +285,7 @@
 				CE405ED81E4A080700AA0B3D /* plugin_start.cpp */,
 			);
 			name = Library;
-			path = Lilu.kext/Contents/Resources/Library;
+			path = Lilu/Lilu/Library;
 			sourceTree = SOURCE_ROOT;
 		};
 		CE405EC81E49DD7B00AA0B3D /* SDK */ = {
@@ -485,7 +485,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/Lilu.kext/Contents/Resources",
+					"$(PROJECT_DIR)/Lilu/Lilu",
 					"$(PROJECT_DIR)/MacKernelSDK/Headers",
 				);
 				KERNEL_EXTENSION_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MacKernelSDK/Headers";
@@ -544,7 +544,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/Lilu.kext/Contents/Resources",
+					"$(PROJECT_DIR)/Lilu/Lilu",
 					"$(PROJECT_DIR)/MacKernelSDK/Headers",
 				);
 				KERNEL_EXTENSION_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MacKernelSDK/Headers";