Skip to content

Use install folder for setup instance path #74

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
Mar 7, 2018
Merged

Use install folder for setup instance path #74

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
32 changes: 16 additions & 16 deletions UnitySetup/UnitySetup.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class UnitySetupInstance

UnitySetupInstance([string]$path) {

$ivyPath = [io.path]::Combine("$path", 'Data\UnityExtensions\Unity\Networking\ivy.xml');
$ivyPath = [io.path]::Combine("$path", 'Editor\Data\UnityExtensions\Unity\Networking\ivy.xml');
if(!(Test-Path $ivyPath)) { throw "Path is not a Unity setup: $path"}
[xml]$xmlDoc = Get-Content $ivyPath

Expand All @@ -52,20 +52,20 @@ class UnitySetupInstance
$this.Components = [UnitySetupComponentType]::Setup

$componentTests = @{
[UnitySetupComponentType]::Documentation = ,"$Path\Data\Documentation";
[UnitySetupComponentType]::StandardAssets = ,"$Path\Standard Assets";
[UnitySetupComponentType]::Windows_IL2CPP = ,"$Path\Data\PlaybackEngines\windowsstandalonesupport\Variations\win32_development_il2cpp";
[UnitySetupComponentType]::Metro = "$Path\Data\PlaybackEngines\MetroSupport\Templates\UWP_.NET_D3D",
"$Path\Data\PlaybackEngines\MetroSupport\Templates\UWP_D3D";
[UnitySetupComponentType]::UWP_IL2CPP = ,"$Path\Data\PlaybackEngines\MetroSupport\Templates\UWP_IL2CPP_D3D";
[UnitySetupComponentType]::Android = ,"$Path\Data\PlaybackEngines\AndroidPlayer";
[UnitySetupComponentType]::iOS = , "$Path\Data\PlaybackEngines\iOSSupport";
[UnitySetupComponentType]::AppleTV = , "$Path\Data\PlaybackEngines\AppleTVSupport";
[UnitySetupComponentType]::Facebook = , "$Path\Data\PlaybackEngines\Facebook";
[UnitySetupComponentType]::Linux = , "$Path\Data\PlaybackEngines\LinuxStandaloneSupport";
[UnitySetupComponentType]::Mac = , "$Path\Data\PlaybackEngines\MacStandaloneSupport";
[UnitySetupComponentType]::Vuforia = , "$Path\Data\PlaybackEngines\VuforiaSupport";
[UnitySetupComponentType]::WebGL = , "$Path\Data\PlaybackEngines\WebGLSupport";
[UnitySetupComponentType]::Documentation = ,"$Path\Editor\Data\Documentation";
[UnitySetupComponentType]::StandardAssets = ,"$Path\Editor\Standard Assets";
[UnitySetupComponentType]::Windows_IL2CPP = ,"$Path\Editor\Data\PlaybackEngines\windowsstandalonesupport\Variations\win32_development_il2cpp";
[UnitySetupComponentType]::Metro = "$Path\Editor\Data\PlaybackEngines\MetroSupport\Templates\UWP_.NET_D3D",
"$Path\Editor\Data\PlaybackEngines\MetroSupport\Templates\UWP_D3D";
[UnitySetupComponentType]::UWP_IL2CPP = ,"$Path\Editor\Data\PlaybackEngines\MetroSupport\Templates\UWP_IL2CPP_D3D";
[UnitySetupComponentType]::Android = ,"$Path\Editor\Data\PlaybackEngines\AndroidPlayer";
[UnitySetupComponentType]::iOS = , "$Path\Editor\Data\PlaybackEngines\iOSSupport";
[UnitySetupComponentType]::AppleTV = , "$Path\Editor\Data\PlaybackEngines\AppleTVSupport";
[UnitySetupComponentType]::Facebook = , "$Path\Editor\Data\PlaybackEngines\Facebook";
[UnitySetupComponentType]::Linux = , "$Path\Editor\Data\PlaybackEngines\LinuxStandaloneSupport";
[UnitySetupComponentType]::Mac = , "$Path\Editor\Data\PlaybackEngines\MacStandaloneSupport";
[UnitySetupComponentType]::Vuforia = , "$Path\Editor\Data\PlaybackEngines\VuforiaSupport";
[UnitySetupComponentType]::WebGL = , "$Path\Editor\Data\PlaybackEngines\WebGLSupport";
}

$componentTests.Keys | ForEach-Object {
Expand Down Expand Up @@ -493,7 +493,7 @@ function Get-UnitySetupInstance

Get-ChildItem $path -Recurse -ErrorAction Ignore |
ForEach-Object {
[UnitySetupInstance]::new((Join-Path $_.Directory "..\..\..\..\" | Convert-Path))
[UnitySetupInstance]::new((Join-Path $_.Directory "..\..\..\..\..\" | Convert-Path))
}
}
}
Expand Down