Windows and Linux build environments; check clean on both (E-01)
MuPDF builds with MSBuild on Windows (/MT, OpenSSL from vcpkg); Git for Windows' MinGit stands in for the source build there. CEF loads from where libcef lives and sets its API version first on every platform. File identity on Windows compares volume and index. The checkout and reference/ keep LF on Windows. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
d59159cea2
commit
68b5af76e0
40 files changed
+380
-82
No files matched your search
@@ -181,7 +181,6 @@ fn the_current_heading_follows_the_cursor_across_columns() {
|
||||
settle(&cx, |app| current(app) == Some(0));
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn pdfs_export_a_range_and_locked_files_ask() {
|
||||
let dir = tempfile::tempdir().expect("a temp dir");
|
||||
@@ -205,11 +204,17 @@ fn pdfs_export_a_range_and_locked_files_ask() {
|
||||
});
|
||||
written(&cx, &pdf, None);
|
||||
let source = dir.path().join("long.fodt");
|
||||
let alias = dir.path().join("alias.pdf");
|
||||
std::os::unix::fs::symlink(&source, &alias).expect("the alias");
|
||||
let link = dir.path().join("link.pdf");
|
||||
std::fs::hard_link(&source, &link).expect("the hard link");
|
||||
for target in [&source, &alias, &link] {
|
||||
#[cfg(unix)]
|
||||
let aliases = {
|
||||
let alias = dir.path().join("alias.pdf");
|
||||
std::os::unix::fs::symlink(&source, &alias).expect("the alias");
|
||||
vec![alias]
|
||||
};
|
||||
#[cfg(not(unix))]
|
||||
let aliases: Vec<std::path::PathBuf> = Vec::new();
|
||||
for target in [source.clone(), link].iter().chain(&aliases) {
|
||||
cx.update(|app| {
|
||||
docs.update(app, |docs, cx| {
|
||||
docs.export_to(id, target.clone(), ely_lok::Pdf::default(), cx)
|
||||
|
||||
@@ -158,7 +158,7 @@ fn a_signed_file_saved_as_a_copy_reopens_as_the_copy() {
|
||||
settle(cx, |app| view.read(app).edited == 1);
|
||||
let copy = dir.path().join("copy.pdf");
|
||||
let reopened = save_signed_as(cx, &viewer, &view, ©);
|
||||
let tab = cx.update(|_, app| (viewer.read(app).active_tab().map(|tab| (tab.risk, tab.dirty(app)))));
|
||||
let tab = cx.update(|_, app| viewer.read(app).active_tab().map(|tab| (tab.risk, tab.dirty(app))));
|
||||
assert_eq!(tab, Some((None, false)), "an unsigned, saved copy");
|
||||
assert!(!shows_signed(cx, &viewer, &reopened), "the copy holds no signature");
|
||||
assert_eq!(cx.update(|_, app| reopened.read(app).sizes[0]), (792.0, 612.0), "the edit is in the copy");
|
||||
|
||||
@@ -13,7 +13,7 @@ use ely_lok::{LokView, show::Media};
|
||||
use ely_office::prelude::*;
|
||||
use ely_platform::media::{Player, State};
|
||||
use gpui::{
|
||||
AnyElement, App, Context, Entity, IntoElement, ParentElement as _, Styled as _, SurfaceSource,
|
||||
AnyElement, App, Context, Entity, ParentElement as _, Styled as _, SurfaceSource,
|
||||
TaskExt as _, Window, div,
|
||||
};
|
||||
|
||||
@@ -275,6 +275,7 @@ pub(crate) fn video(
|
||||
frame: SurfaceSource,
|
||||
(at, size): (gpui::Point<gpui::Pixels>, gpui::Point<gpui::Pixels>),
|
||||
) -> AnyElement {
|
||||
use gpui::IntoElement as _;
|
||||
gpui::surface(frame)
|
||||
.absolute()
|
||||
.left(at.x)
|
||||
|
||||
@@ -461,7 +461,14 @@ fn a_worktree_registered_through_a_link_lists_its_real_path() {
|
||||
)
|
||||
.expect("adds");
|
||||
// Other tools may write the path through a link.
|
||||
#[cfg(unix)]
|
||||
std::os::unix::fs::symlink(dir.path(), dir.path().join("link")).expect("links");
|
||||
#[cfg(windows)]
|
||||
{
|
||||
let link = dir.path().join("link");
|
||||
let made = std::process::Command::new("cmd").arg("/C").arg("mklink").arg("/J").arg(&link).arg(dir.path()).output().expect("cmd");
|
||||
assert!(made.status.success(), "a junction: {}", String::from_utf8_lossy(&made.stderr));
|
||||
}
|
||||
let gitdir = root.join(".git/worktrees/tree/gitdir");
|
||||
std::fs::write(
|
||||
&gitdir,
|
||||
|
||||
Reference in new issue
Block a user