1 Commits

Author SHA1 Message Date
Eric Ratliff
b0b2482774 feat: Add Windows support and stabilize SDK installation (v1.0.0-rc1)
Complete Windows compatibility overhaul with robust cross-platform SDK management.
This release candidate establishes feature freeze for the 1.0.0 release.

Key improvements:
- Fixed Android SDK installation on Windows
  * Use cmd.exe wrapper for sdkmanager.bat with piped stdin
  * Properly reorganize cmdline-tools directory structure
  * Write license acceptances synchronously to avoid hangs

- Fixed FTC SDK configuration
  * Auto-generate local.properties with Android SDK path
  * Escape backslashes in Kotlin build.gradle.kts strings
  * Support both new installs and upgrades via ensure_local_properties()

- Enhanced Windows console output
  * Enable ANSI color support via enable_ansi_support crate
  * Maintain color compatibility across Windows versions

- Improved error handling and debugging
  * Added comprehensive logging throughout SDK installation
  * Better context messages for troubleshooting failures

Cross-platform testing verified on:
- Windows 11 with Eclipse Adoptium JDK 21
- Linux (existing support maintained)

Breaking changes: None
This RC introduces feature freeze - subsequent 1.0.x releases will be
bug fixes only. New features deferred to 1.1.0.

Closes Windows compatibility milestone.
2026-01-25 18:35:24 -06:00
6 changed files with 61 additions and 8 deletions

View File

@@ -511,11 +511,11 @@ Built with frustration at unnecessarily complex robotics frameworks, and hope th
## Project Status ## Project Status
**Current Version:** 1.0.0-beta2 **Current Version:** 1.0.0-rc1
**What Works:** **What Works:**
- ✅ Project generation - ✅ Project generation
- ✅ Cross-platform build/deploy - ✅ Cross-platform build/deploy (Linux, macOS, Windows)
- ✅ SDK management - ✅ SDK management
- ✅ Configuration management - ✅ Configuration management
- ✅ Project upgrades - ✅ Project upgrades
@@ -530,6 +530,12 @@ Built with frustration at unnecessarily complex robotics frameworks, and hope th
--- ---
## Support & Contact
**Questions? Issues? Suggestions?** **Questions? Issues? Suggestions?**
Open an issue on NXGit or reach out to the FTC community. Let's make robot programming accessible for everyone! 🚀 - 📧 Email: [eric@nxws.dev](mailto:eric@nxws.dev)
- 🐛 Issues: Open an issue on the repository
- 💬 Community: Reach out via the FTC community
Building better tools so you can build better robots. 🤖

View File

@@ -71,7 +71,7 @@ fn ensure_sdks(config: &SdkConfig) -> Result<()> {
// Check FTC SDK // Check FTC SDK
if !config.ftc_sdk_path.exists() { if !config.ftc_sdk_path.exists() {
println!("FTC SDK not found. Installing..."); println!("FTC SDK not found. Installing...");
crate::sdk::ftc::install(&config.ftc_sdk_path)?; crate::sdk::ftc::install(&config.ftc_sdk_path, &config.android_sdk_path)?;
} else { } else {
println!("{} FTC SDK found at: {}", "".green(), config.ftc_sdk_path.display()); println!("{} FTC SDK found at: {}", "".green(), config.ftc_sdk_path.display());
crate::sdk::ftc::verify(&config.ftc_sdk_path)?; crate::sdk::ftc::verify(&config.ftc_sdk_path)?;

View File

@@ -9,7 +9,7 @@ pub fn install_sdks() -> Result<()> {
let config = SdkConfig::new()?; let config = SdkConfig::new()?;
// Install FTC SDK // Install FTC SDK
crate::sdk::ftc::install(&config.ftc_sdk_path)?; crate::sdk::ftc::install(&config.ftc_sdk_path, &config.android_sdk_path)?;
// Install Android SDK // Install Android SDK
crate::sdk::android::install(&config.android_sdk_path)?; crate::sdk::android::install(&config.android_sdk_path)?;

View File

@@ -20,6 +20,9 @@ pub fn upgrade_project(path: &str) -> Result<()> {
// Get SDK config // Get SDK config
let sdk_config = crate::sdk::SdkConfig::new()?; let sdk_config = crate::sdk::SdkConfig::new()?;
// Ensure FTC SDK has local.properties (in case it was installed before this feature)
ensure_local_properties(&sdk_config)?;
// Load or create project config // Load or create project config
let project_config = if has_config { let project_config = if has_config {
println!("Found existing .weevil.toml"); println!("Found existing .weevil.toml");
@@ -115,5 +118,23 @@ pub fn upgrade_project(path: &str) -> Result<()> {
println!("Test it: ./gradlew test"); println!("Test it: ./gradlew test");
println!(); println!();
Ok(())
}
fn ensure_local_properties(sdk_config: &crate::sdk::SdkConfig) -> Result<()> {
let local_properties_path = sdk_config.ftc_sdk_path.join("local.properties");
if !local_properties_path.exists() {
println!("Creating local.properties in FTC SDK...");
let android_sdk_str = sdk_config.android_sdk_path
.display()
.to_string()
.replace("\\", "/");
let local_properties = format!("sdk.dir={}\n", android_sdk_str);
fs::write(&local_properties_path, local_properties)?;
println!("{} Created local.properties", "".green());
}
Ok(()) Ok(())
} }

View File

@@ -87,7 +87,6 @@ impl ProjectBuilder {
FTC Robot Project generated by Weevil v1.0.0 FTC Robot Project generated by Weevil v1.0.0
## Quick Start ## Quick Start
```bash ```bash
# Test your code (runs on PC, no robot needed) # Test your code (runs on PC, no robot needed)
./gradlew test ./gradlew test
@@ -124,6 +123,9 @@ deploy.bat
fs::write(project_path.join(".weevil-version"), "1.0.0")?; fs::write(project_path.join(".weevil-version"), "1.0.0")?;
// build.gradle.kts - Pure Java with deployToSDK task // build.gradle.kts - Pure Java with deployToSDK task
// Escape backslashes for Windows paths in Kotlin strings
let sdk_path = sdk_config.ftc_sdk_path.display().to_string().replace("\\", "\\\\");
let build_gradle = format!(r#"plugins {{ let build_gradle = format!(r#"plugins {{
java java
}} }}
@@ -192,7 +194,7 @@ tasks.register<Exec>("buildApk") {{
println("✓ APK built successfully") println("✓ APK built successfully")
}} }}
}} }}
"#, sdk_config.ftc_sdk_path.display(), sdk_config.ftc_sdk_path.display()); "#, sdk_path, sdk_path);
fs::write(project_path.join("build.gradle.kts"), build_gradle)?; fs::write(project_path.join("build.gradle.kts"), build_gradle)?;
// settings.gradle.kts // settings.gradle.kts

View File

@@ -2,16 +2,19 @@ use std::path::Path;
use anyhow::{Result, Context}; use anyhow::{Result, Context};
use git2::Repository; use git2::Repository;
use colored::*; use colored::*;
use std::fs;
const FTC_SDK_URL: &str = "https://github.com/FIRST-Tech-Challenge/FtcRobotController.git"; const FTC_SDK_URL: &str = "https://github.com/FIRST-Tech-Challenge/FtcRobotController.git";
const FTC_SDK_VERSION: &str = "v10.1.1"; const FTC_SDK_VERSION: &str = "v10.1.1";
pub fn install(sdk_path: &Path) -> Result<()> { pub fn install(sdk_path: &Path, android_sdk_path: &Path) -> Result<()> {
if sdk_path.exists() { if sdk_path.exists() {
println!("{} FTC SDK already installed at: {}", println!("{} FTC SDK already installed at: {}",
"".green(), "".green(),
sdk_path.display() sdk_path.display()
); );
// Make sure local.properties exists even if SDK was already installed
create_local_properties(sdk_path, android_sdk_path)?;
return check_version(sdk_path); return check_version(sdk_path);
} }
@@ -28,11 +31,32 @@ pub fn install(sdk_path: &Path) -> Result<()> {
repo.checkout_tree(&obj, None)?; repo.checkout_tree(&obj, None)?;
repo.set_head_detached(obj.id())?; repo.set_head_detached(obj.id())?;
// Create local.properties with Android SDK path
create_local_properties(sdk_path, android_sdk_path)?;
println!("{} FTC SDK installed successfully", "".green()); println!("{} FTC SDK installed successfully", "".green());
Ok(()) Ok(())
} }
fn create_local_properties(sdk_path: &Path, android_sdk_path: &Path) -> Result<()> {
// Convert path to use forward slashes (works on both Windows and Unix)
let android_sdk_str = android_sdk_path
.display()
.to_string()
.replace("\\", "/");
let local_properties = format!("sdk.dir={}\n", android_sdk_str);
let properties_path = sdk_path.join("local.properties");
fs::write(&properties_path, local_properties)
.context("Failed to create local.properties")?;
println!("{} Created local.properties with Android SDK path", "".green());
Ok(())
}
fn check_version(sdk_path: &Path) -> Result<()> { fn check_version(sdk_path: &Path) -> Result<()> {
let repo = Repository::open(sdk_path)?; let repo = Repository::open(sdk_path)?;