make env.volumes only change package path when used

[Emilgardis]

This fixes windows usage.

It also tries to fix windows builds when using env.volumes by making windows compatible
paths for env.volumes

not using env.volumes will now also mount the project in /project again

[Emilgardis]

I have not tested this with env.volumes yet

[Emilgardis]

bors try --target x86

[bors]

try

Build succeeded:

• conclusion

[Emilgardis]

This should be feature complete now 🎉

Example docker invocation on windows

with env.volumes

docker.EXE run
--userns "host"
-v "G:\\workspace\\cross_testing\\hello.txt:/mnt/g/workspace/cross_testing/hello.txt"
-e "HELLO=/mnt/g/workspace/cross_testing/hello.txt"
-e "PKG_CONFIG_ALLOW_CROSS=1"
--rm -e "XARGO_HOME=/xargo"
-e "CARGO_HOME=/cargo"
-e "CARGO_TARGET_DIR=/target"
-e "USER=Emil"
-e "CROSS_RUNNER="
-v "C:\\Users\\Emil\\.xargo:/xargo:Z"
-v "C:\\Users\\Emil\\.cargo:/cargo:Z"
-v "/cargo/bin"
-v "G:\\workspace\\cross_testing\\foo:/mnt/g/workspace/cross_testing/foo:Z"
-v "C:\\Users\\Emil\\.rustup\\toolchains\\nightly-x86_64-unknown-linux-gnu:/rust:Z,ro"
-v "G:\\workspace\\cross_testing\\foo\\target:/target:Z"
-w "/mnt/g/workspace/cross_testing/foo"
-i -t "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
sh
-c "PATH=$PATH:/rust/bin cargo run -vv --target aarch64-unknown-linux-gnu"

without

docker.EXE run 
--userns host 
-e "PKG_CONFIG_ALLOW_CROSS=1" 
--rm 
-e "XARGO_HOME=/xargo" 
-e "CARGO_HOME=/cargo" 
-e "CARGO_TARGET_DIR=/target" 
-e "USER=Emil" 
-e "CROSS_RUNNER=" 
-v "C:\\Users\\Emil\\.xargo:/xargo:Z" 
-v "C:\\Users\\Emil\\.cargo:/cargo:Z" 
-v "/cargo/bin" 
-v "G:\\workspace\\cross_testing\\foo:/project:Z" 
-v "C:\\Users\\Emil\\.rustup\\toolchains\\nightly-x86_64-unknown-linux-gnu:/rust:Z,ro" 
-v "G:\\workspace\\small dev space\\cross_testing\\foo\\target:/target:Z" 
-w "/project" 
-i  -t "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
sh 
-c "PATH=$PATH:/rust/bin cargo run -vv --target aarch64-unknown-linux-gnu"

[Emilgardis]

it would be possible to fallback to a manual implementation of "normalizing". the logic should be quite simple but I don't feel like it's necessary to do.

[Emilgardis]

I take that back, I tried to do it correctly but handling this is quite annoying :)

[Emilgardis]

maybe

fn wslpath2(path: impl AsRef<Path>) -> Result<String> {
    fn get_path_prefix_drive(path: &Path) -> Option<&str> {
        match path.components().next().unwrap() {
            std::path::Component::Prefix(prefix_component) => match prefix_component.kind() {
                std::path::Prefix::VerbatimDisk(_) => Some(
                    prefix_component
                        .as_os_str()
                        .to_str()
                        .expect("windows drive letters should be ascii A-Z")
                        .strip_prefix(r"\\?\")?
                        .strip_suffix(":")?,
                ),
                std::path::Prefix::Disk(_) => Some(
                    prefix_component
                        .as_os_str()
                        .to_str()
                        .expect("windows drive letters should be ascii A-Z")
                        .strip_suffix(":")?,
                ),
                _ => None,
            },
            _ => None,
        }
    }
    let path = path.as_ref();
    let components = path.components().skip(2);
    let mut path_c = String::from("/mnt/");

    path_c
        .push_str(&get_path_prefix_drive(path).ok_or_else(|| eyre::eyre!("no drive letter found"))?.to_lowercase());
    let mut sep = true;
    for comp in components {
        if sep {
            path_c.push('/');
        } else {
            sep = true;
        }
        match comp {
            std::path::Component::Normal(p) => path_c.push_str(
                p.to_str()
                    .ok_or_else(|| eyre::eyre!("path needs to be utf8"))?,
            ),
            std::path::Component::ParentDir => path_c.push_str(".."),
            std::path::Component::CurDir => path_c.push('.'),
            _ => sep = false,
        }
    }
    Ok(path_c)
}

[Emilgardis]

has anyone been able to test this and give this a r+ @cross-rs/maintainers <3

[Emilgardis]

ping @cross-rs/maintainers

It would be good to have this included for 0.3.0

[reitermarkus]

I'm not using Windows so I cannot test this, but it looks good so far.

not using env.volumes will now also mount the project in /project again

Does this have any advantage or is this needed to fix Windows support?

[Emilgardis]

not using env.volumes will now also mount the project in /project again

Does this have any advantage or is this needed to fix Windows support?

No advantage, except for not leaking paths in the general case, like what was done before.

bors r=reitermarkus

[bors]

Build succeeded:

• conclusion