Skip to content

Fix modules install path #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2019
Merged

Fix modules install path #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions commands/uvm-generate-modules-json/tests/fixures/win/v2019/2019.1.10f1_modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
"visible": false,
"sync": "android-sdk-ndk-tools",
"selected": false,
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/build-tools",
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK",
"renameTo": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/build-tools/28.0.3",
"renameFrom": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/android-9"
},
Expand All @@ -315,7 +315,7 @@
"visible": false,
"sync": "android-sdk-ndk-tools",
"selected": false,
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/platforms",
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK",
"renameTo": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/platforms/android-28",
"renameFrom": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/android-9"
},
Expand Down
4 changes: 2 additions & 2 deletions commands/uvm-generate-modules-json/tests/fixures/win/v2019/2019.2.0b9_modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
"visible": false,
"sync": "android-sdk-ndk-tools",
"selected": false,
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/build-tools",
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK",
"renameTo": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/build-tools/28.0.3",
"renameFrom": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/android-9"
},
Expand All @@ -302,7 +302,7 @@
"visible": false,
"sync": "android-sdk-ndk-tools",
"selected": false,
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/platforms",
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK",
"renameTo": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/platforms/android-28",
"renameFrom": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/android-9"
},
Expand Down
4 changes: 2 additions & 2 deletions commands/uvm-generate-modules-json/tests/fixures/win/v2019/2019.3.0a8_modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"downloadSize": 52600000,
"visible": false,
"selected": false,
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/build-tools",
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK",
"renameTo": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/build-tools/28.0.3",
"renameFrom": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/android-9"
},
Expand Down Expand Up @@ -82,7 +82,7 @@
"downloadSize": 60600000,
"visible": false,
"selected": false,
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/platforms",
"destination": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK",
"renameTo": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/platforms/android-28",
"renameFrom": "{UNITY_PATH}/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/android-9"
},
Expand Down
14 changes: 12 additions & 2 deletions uvm_core/src/sys/linux/unity/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,18 @@ pub fn installpath(component:Component) -> Option<PathBuf> {
path.map(|p| Path::new(p).to_path_buf())
}

pub fn install_location(component:Component) -> Option<PathBuf> {
self::installpath(component)
pub fn install_location(component: Component) -> Option<PathBuf> {
use Component::*;
let path = match component {
AndroidSdkPlatformTools => {
Some("PlaybackEngines/AndroidPlayer/SDK/platform-tools")
}
AndroidSdkNdkTools => {
Some("PlaybackEngines/AndroidPlayer/SDK/tools")
}
_ => None,
};
path.map(|p| Path::new(p).to_path_buf()).or_else(|| installpath(component))
}

pub fn selected(component:Component) -> bool {
Expand Down
20 changes: 15 additions & 5 deletions uvm_core/src/sys/mac/unity/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::unity::Component;
use std::path::{Path, PathBuf};

pub fn installpath(component:Component) -> Option<PathBuf> {
pub fn installpath(component: Component) -> Option<PathBuf> {
use Component::*;
let path = match component {
Mono | VisualStudio | FacebookGameRoom => None,
Expand Down Expand Up @@ -33,14 +33,24 @@ pub fn installpath(component:Component) -> Option<PathBuf> {
path.map(|p| Path::new(p).to_path_buf())
}

pub fn install_location(component:Component) -> Option<PathBuf> {
self::installpath(component)
pub fn install_location(component: Component) -> Option<PathBuf> {
use Component::*;
let path = match component {
AndroidSdkPlatformTools => {
Some("PlaybackEngines/AndroidPlayer/SDK/platform-tools")
}
AndroidSdkNdkTools => {
Some("PlaybackEngines/AndroidPlayer/SDK/tools")
}
_ => None,
};
path.map(|p| Path::new(p).to_path_buf()).or_else(|| installpath(component))
}

pub fn selected(component:Component) -> bool {
pub fn selected(component: Component) -> bool {
use Component::*;
match component {
MonoDevelop | Documentation | ExampleProject | Example | VisualStudio => true,
_ => false
_ => false,
}
}
53 changes: 41 additions & 12 deletions uvm_core/src/sys/win/unity/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,24 @@ use std::path::{Path, PathBuf};

pub enum InstallerType {
Exe,
Zip
Zip,
}

pub fn installpath(component:Component, installer_type:InstallerType) -> Option<PathBuf> {
pub fn installpath(component: Component, installer_type: InstallerType) -> Option<PathBuf> {
use Component::*;
use InstallerType::*;
match installer_type {
Exe => {
let path = match component {
VisualStudio | ExampleProject | Example | FacebookGameRoom | VisualStudioProfessionalUnityWorkload | VisualStudioEnterpriseUnityWorkload => None,
AndroidSdkPlatformTools | AndroidSdkNdkTools => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK"),
VisualStudio
| ExampleProject
| Example
| FacebookGameRoom
| VisualStudioProfessionalUnityWorkload
| VisualStudioEnterpriseUnityWorkload => None,
AndroidSdkPlatformTools | AndroidSdkNdkTools => {
Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK")
}
AndroidSdkBuildTools => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK"),
AndroidSdkPlatforms => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK"),
AndroidNdk => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\NDK"),
Expand All @@ -24,33 +31,55 @@ pub fn installpath(component:Component, installer_type:InstallerType) -> Option<

path.map(|p| Path::new(p).to_path_buf())
}
Zip => install_location(component)
Zip => {
let path = match component {
AndroidSdkPlatforms
| AndroidSdkBuildTools
| AndroidSdkPlatformTools
| AndroidSdkNdkTools => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK"),
_ => None,
};

path.map(|p| Path::new(p).to_path_buf()).or_else(|| install_location(component))
}
}
}

pub fn install_location(component:Component) -> Option<PathBuf> {
pub fn install_location(component: Component) -> Option<PathBuf> {
use Component::*;
let path = match component {
VisualStudio | ExampleProject | Example | FacebookGameRoom | VisualStudioProfessionalUnityWorkload | VisualStudioEnterpriseUnityWorkload => None,
VisualStudio
| ExampleProject
| Example
| FacebookGameRoom
| VisualStudioProfessionalUnityWorkload
| VisualStudioEnterpriseUnityWorkload => None,
Mono | MonoDevelop => Some(r""),
Documentation => Some(r"Editor\Data"),
StandardAssets => Some(r"Editor"),
Android => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer"),
AndroidSdkBuildTools => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK\build-tools"),
AndroidSdkPlatforms => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK\platforms"),
AndroidSdkPlatformTools | AndroidSdkNdkTools => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK"),
AndroidSdkPlatformTools => {
Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK\platform-tools")
}
AndroidSdkNdkTools => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\SDK\tools"),
AndroidNdk => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\NDK"),
AndroidOpenJdk => Some(r"Editor\Data\PlaybackEngines\AndroidPlayer\OpenJDK"),
Ios => Some(r"Editor\Data\PlaybackEngines\iOSSupport"),
TvOs | AppleTV => Some(r"Editor\Data\PlaybackEngines\AppleTVSupport"),
Linux | LinuxMono => Some(r"Editor\Data\PlaybackEngines\LinuxStandaloneSupport"),
Mac | MacIL2CPP | MacMono => Some(r"Editor\Data\PlaybackEngines\MacStandaloneSupport"),
Metro | UwpIL2CPP | UwpNet | UniversalWindowsPlatform => Some(r"Editor\Data\PlaybackEngines\MetroSupport"),
Metro | UwpIL2CPP | UwpNet | UniversalWindowsPlatform => {
Some(r"Editor\Data\PlaybackEngines\MetroSupport")
}
Samsungtv | SamsungTV => Some(r"Editor\Data\PlaybackEngines\STVPlayer"),
Tizen => Some(r"Editor\Data\PlaybackEngines\TizenPlayer"),
Vuforia | VuforiaAR => Some(r"Editor\Data\PlaybackEngines\VuforiaSupport"),
WebGl => Some(r"Editor\Data\PlaybackEngines\WebGLSupport"),
Windows | WindowsMono | WindowsIL2CCP => Some(r"Editor\Data\PlaybackEngines\WindowsStandaloneSupport"),
Windows | WindowsMono | WindowsIL2CCP => {
Some(r"Editor\Data\PlaybackEngines\WindowsStandaloneSupport")
}
Facebook | FacebookGames => Some(r"Editor\Data\PlaybackEngines\Facebook"),
Lumin => None,
Language(_) => Some(r"Editor\Data\Localization"),
Expand All @@ -60,10 +89,10 @@ pub fn install_location(component:Component) -> Option<PathBuf> {
path.map(|p| Path::new(p).to_path_buf())
}

pub fn selected(component:Component) -> bool {
pub fn selected(component: Component) -> bool {
use Component::*;
match component {
Documentation | StandardAssets | ExampleProject | Example | VisualStudio => true,
_ => false
_ => false,
}
}