Skip to content

Commit 714cc4f

Browse files
Merge remote-tracking branch 'origin/main' into codex/readable-cli-diff-edit-log
2 parents eb25be6 + 877043b commit 714cc4f

57 files changed

Lines changed: 1458 additions & 360 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@ test-linux-publish-config: ## Validate Linux package publish configuration.
196196
test-macos-publish-config: ## Validate macOS package publish configuration.
197197
tests/macos_publish_config.sh
198198

199+
.PHONY: test-windows-publish-config
200+
test-windows-publish-config: ## Validate Windows package publish configuration.
201+
tests/windows_publish_config.sh
202+
199203
.PHONY: test-release-asset-names
200204
test-release-asset-names: ## Validate GitHub Release asset naming configuration.
201205
tests/release_asset_names.sh

apps/desktop/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@codeflash-ai/locality-desktop",
33
"private": true,
4-
"version": "0.2.2",
4+
"version": "0.2.3",
55
"type": "module",
66
"scripts": {
77
"dev": "vite --host 127.0.0.1 --port 1420",

apps/desktop/scripts/prepare-windows-bundle.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ $ErrorActionPreference = "Stop"
33
$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
44
$Root = Resolve-Path (Join-Path $ScriptDir "..\..\..")
55
$Out = Join-Path $Root "apps\desktop\src-tauri\windows"
6+
$MountLogoSource = Join-Path $Root "apps\desktop\src-tauri\icons\locality-mount-logo.ico"
7+
$MountLogoOut = Join-Path $Out "locality-mount-logo.ico"
68
. (Join-Path $Root "scripts\windows-codesign.ps1")
79
New-Item -ItemType Directory -Force -Path $Out | Out-Null
810
$Sidecars = @(
@@ -39,12 +41,16 @@ if ($env:LOCALITY_WINDOWS_BUNDLE_PREPARED -ne "1") {
3941
Copy-Item -LiteralPath (Join-Path $Root "target\release\loc.exe") -Destination (Join-Path $Out "loc.exe") -Force
4042
Copy-Item -LiteralPath (Join-Path $Root "target\release\localityd.exe") -Destination (Join-Path $Out "localityd.exe") -Force
4143
Copy-Item -LiteralPath (Join-Path $Root "target\release\locality-cloud-files.exe") -Destination (Join-Path $Out "locality-cloud-files.exe") -Force
44+
Copy-Item -LiteralPath $MountLogoSource -Destination $MountLogoOut -Force
4245
} else {
4346
foreach ($Sidecar in $Sidecars) {
4447
if (-not (Test-Path -LiteralPath $Sidecar)) {
4548
throw "LOCALITY_WINDOWS_BUNDLE_PREPARED=1 but missing prepared sidecar: $Sidecar"
4649
}
4750
}
51+
if (-not (Test-Path -LiteralPath $MountLogoOut)) {
52+
throw "LOCALITY_WINDOWS_BUNDLE_PREPARED=1 but missing prepared mount logo: $MountLogoOut"
53+
}
4854
}
4955

5056
if (Test-LocalityWindowsCodeSigningRequested) {
@@ -57,3 +63,4 @@ if (Test-LocalityWindowsCodeSigningRequested) {
5763
Write-Host "Prepared Windows CLI in $(Join-Path $Out 'loc.exe')"
5864
Write-Host "Prepared Windows daemon in $(Join-Path $Out 'localityd.exe')"
5965
Write-Host "Prepared Windows Cloud Files helper in $(Join-Path $Out 'locality-cloud-files.exe')"
66+
Write-Host "Prepared Windows mount logo in $MountLogoOut"

apps/desktop/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "locality-desktop"
3-
version = "0.2.2"
3+
version = "0.2.3"
44
edition.workspace = true
55
license.workspace = true
66
repository.workspace = true
-259 KB
Binary file not shown.
-8.1 KB
Loading
-12 Bytes
Binary file not shown.
-12 Bytes
Loading

0 commit comments

Comments
 (0)