Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile] Centralize vendored cargokit

laurenspriem1250bd4453a3
diff --git a/mobile/apps/photos/rust_builder/android/build.gradle b/mobile/apps/photos/rust_builder/android/build.gradle
index dd84cc2ea9..b7083bacd3 100644
--- a/mobile/apps/photos/rust_builder/android/build.gradle
+++ b/mobile/apps/photos/rust_builder/android/build.gradle
@@ -43,7 +43,7 @@ android {
}
}
-apply from: "../cargokit/gradle/plugin.gradle"
+apply from: "../../../../cargokit/gradle/plugin.gradle"
cargokit {
manifestDir = "../../../../../rust/bindings/frb/photos"
libname = "ente_photos_rust"
diff --git a/mobile/apps/photos/rust_builder/cargokit/.gitignore b/mobile/apps/photos/rust_builder/cargokit/.gitignore
deleted file mode 100644
index 2f7896d1d1..0000000000
--- a/mobile/apps/photos/rust_builder/cargokit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target/
diff --git a/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec b/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec
index a12db0ac29..c8774c088d 100644
--- a/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec
+++ b/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec
@@ -43,7 +43,7 @@ A new Flutter FFI plugin project.
exit 1
fi
unset ORT_IOS_XCFWK_PATH ORT_IOS_XCFWK_LOCATION
- sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rust
+ sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rust
SCRIPT
:execution_position => :before_compile,
:input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
diff --git a/mobile/apps/photos/rust_builder/linux/CMakeLists.txt b/mobile/apps/photos/rust_builder/linux/CMakeLists.txt
index 09d023fd13..ce191daf72 100644
--- a/mobile/apps/photos/rust_builder/linux/CMakeLists.txt
+++ b/mobile/apps/photos/rust_builder/linux/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.10)
set(PROJECT_NAME "ente_photos_rust")
project(${PROJECT_NAME} LANGUAGES CXX)
-include("../cargokit/cmake/cargokit.cmake")
+include("../../../../cargokit/cmake/cargokit.cmake")
apply_cargokit(${PROJECT_NAME} ../../../../../rust/bindings/frb/photos ente_photos_rust "")
# List of absolute paths to libraries that should be bundled with the plugin.
diff --git a/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec b/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec
index 44ed1c8235..15f2610f43 100644
--- a/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec
+++ b/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec
@@ -26,7 +26,7 @@ A new Flutter FFI plugin project.
s.script_phase = {
:name => 'Build Rust library',
# First argument is relative path to the `rust` folder, second is name of rust library
- :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rust',
+ :script => 'sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rust',
:execution_position => :before_compile,
:input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
# Let XCode know that the static library referenced in -force_load below is
diff --git a/mobile/apps/photos/rust_builder/windows/CMakeLists.txt b/mobile/apps/photos/rust_builder/windows/CMakeLists.txt
index 75ad2d3417..f4e27cf13d 100644
--- a/mobile/apps/photos/rust_builder/windows/CMakeLists.txt
+++ b/mobile/apps/photos/rust_builder/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.14)
set(PROJECT_NAME "ente_photos_rust")
project(${PROJECT_NAME} LANGUAGES CXX)
-include("../cargokit/cmake/cargokit.cmake")
+include("../../../../cargokit/cmake/cargokit.cmake")
apply_cargokit(${PROJECT_NAME} ../../../../../../../../../rust/bindings/frb/photos ente_photos_rust "")
# List of absolute paths to libraries that should be bundled with the plugin.
diff --git a/mobile/cargokit/.gitignore b/mobile/cargokit/.gitignore
new file mode 100644
index 0000000000..88aec12b6e
--- /dev/null
+++ b/mobile/cargokit/.gitignore
@@ -0,0 +1,2 @@
+target/
+build_tool/pubspec.lock
diff --git a/mobile/apps/photos/rust_builder/cargokit/LICENSE b/mobile/cargokit/LICENSE
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/LICENSE
rename to mobile/cargokit/LICENSE
diff --git a/mobile/apps/photos/rust_builder/cargokit/README b/mobile/cargokit/README
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/README
rename to mobile/cargokit/README
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_pod.sh b/mobile/cargokit/build_pod.sh
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_pod.sh
rename to mobile/cargokit/build_pod.sh
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/README.md b/mobile/cargokit/build_tool/README.md
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/README.md
rename to mobile/cargokit/build_tool/README.md
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/analysis_options.yaml b/mobile/cargokit/build_tool/analysis_options.yaml
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/analysis_options.yaml
rename to mobile/cargokit/build_tool/analysis_options.yaml
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/bin/build_tool.dart b/mobile/cargokit/build_tool/bin/build_tool.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/bin/build_tool.dart
rename to mobile/cargokit/build_tool/bin/build_tool.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/build_tool.dart b/mobile/cargokit/build_tool/lib/build_tool.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/build_tool.dart
rename to mobile/cargokit/build_tool/lib/build_tool.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/android_environment.dart b/mobile/cargokit/build_tool/lib/src/android_environment.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
rename to mobile/cargokit/build_tool/lib/src/android_environment.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart b/mobile/cargokit/build_tool/lib/src/artifacts_provider.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart
rename to mobile/cargokit/build_tool/lib/src/artifacts_provider.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart b/mobile/cargokit/build_tool/lib/src/build_cmake.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart
rename to mobile/cargokit/build_tool/lib/src/build_cmake.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart b/mobile/cargokit/build_tool/lib/src/build_gradle.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart
rename to mobile/cargokit/build_tool/lib/src/build_gradle.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_pod.dart b/mobile/cargokit/build_tool/lib/src/build_pod.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_pod.dart
rename to mobile/cargokit/build_tool/lib/src/build_pod.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_tool.dart b/mobile/cargokit/build_tool/lib/src/build_tool.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_tool.dart
rename to mobile/cargokit/build_tool/lib/src/build_tool.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/builder.dart b/mobile/cargokit/build_tool/lib/src/builder.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/builder.dart
rename to mobile/cargokit/build_tool/lib/src/builder.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/cargo.dart b/mobile/cargokit/build_tool/lib/src/cargo.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/cargo.dart
rename to mobile/cargokit/build_tool/lib/src/cargo.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart b/mobile/cargokit/build_tool/lib/src/crate_hash.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart
rename to mobile/cargokit/build_tool/lib/src/crate_hash.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/environment.dart b/mobile/cargokit/build_tool/lib/src/environment.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/environment.dart
rename to mobile/cargokit/build_tool/lib/src/environment.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/logging.dart b/mobile/cargokit/build_tool/lib/src/logging.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/logging.dart
rename to mobile/cargokit/build_tool/lib/src/logging.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/options.dart b/mobile/cargokit/build_tool/lib/src/options.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/options.dart
rename to mobile/cargokit/build_tool/lib/src/options.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart b/mobile/cargokit/build_tool/lib/src/precompile_binaries.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart
rename to mobile/cargokit/build_tool/lib/src/precompile_binaries.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/rustup.dart b/mobile/cargokit/build_tool/lib/src/rustup.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/rustup.dart
rename to mobile/cargokit/build_tool/lib/src/rustup.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/target.dart b/mobile/cargokit/build_tool/lib/src/target.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/target.dart
rename to mobile/cargokit/build_tool/lib/src/target.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/util.dart b/mobile/cargokit/build_tool/lib/src/util.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/util.dart
rename to mobile/cargokit/build_tool/lib/src/util.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart b/mobile/cargokit/build_tool/lib/src/verify_binaries.dart
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart
rename to mobile/cargokit/build_tool/lib/src/verify_binaries.dart
diff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/pubspec.yaml b/mobile/cargokit/build_tool/pubspec.yaml
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/build_tool/pubspec.yaml
rename to mobile/cargokit/build_tool/pubspec.yaml
diff --git a/mobile/apps/photos/rust_builder/cargokit/cmake/cargokit.cmake b/mobile/cargokit/cmake/cargokit.cmake
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/cmake/cargokit.cmake
rename to mobile/cargokit/cmake/cargokit.cmake
diff --git a/mobile/apps/photos/rust_builder/cargokit/cmake/resolve_symlinks.ps1 b/mobile/cargokit/cmake/resolve_symlinks.ps1
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/cmake/resolve_symlinks.ps1
rename to mobile/cargokit/cmake/resolve_symlinks.ps1
diff --git a/mobile/apps/photos/rust_builder/cargokit/gradle/plugin.gradle b/mobile/cargokit/gradle/plugin.gradle
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/gradle/plugin.gradle
rename to mobile/cargokit/gradle/plugin.gradle
diff --git a/mobile/apps/photos/rust_builder/cargokit/run_build_tool.cmd b/mobile/cargokit/run_build_tool.cmd
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/run_build_tool.cmd
rename to mobile/cargokit/run_build_tool.cmd
diff --git a/mobile/apps/photos/rust_builder/cargokit/run_build_tool.sh b/mobile/cargokit/run_build_tool.sh
similarity index 100%
rename from mobile/apps/photos/rust_builder/cargokit/run_build_tool.sh
rename to mobile/cargokit/run_build_tool.sh