Skip to content
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.

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

Detect 2019 modules and allow to install 2019, skipping dmg install for now #392

Merged
merged 6 commits into from
Feb 26, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Support reading version from unity_builtin_extra (on Linux only right…
… now)
lacostej committed Feb 25, 2020
commit 770f289d02d9d6bc13fa657bd8818d65bb9a9b59
33 changes: 20 additions & 13 deletions lib/u3d/installation.rb
Original file line number Diff line number Diff line change
@@ -127,21 +127,35 @@ def self.unity_version(config_path)
end
end

# FIXME deprecated
# FIXME: deprecated
class PlaybackEngineUtils < IvyPlaybackEngineUtils
end

class ModulePlaybackEngineUtils
def self.list_module_configs(playbackengine_parent_path)
# FIXME this is Mac specific
Dir.glob("#{playbackengine_parent_path}/PlaybackEngines/*/modules.asset") |
# FIXME: this is Mac specific
Dir.glob("#{playbackengine_parent_path}/PlaybackEngines/*/modules.asset") |
Dir.glob("#{playbackengine_parent_path}/Unity.app/Contents/PlaybackEngines/*/modules.asset")
end

def self.module_name(config_path)
File.basename(File.dirname(config_path)).gsub("Support", "")
end
end
end

class InstallationUtils
def self.read_version_from_unity_builtin_extra(file)
File.open(file, "rb") do |f|
f.seek(20)
s = ""
while (c = f.read(1))
break if c == "\x00"
s += c
end
s
end
end
end

class MacInstallation < Installation
require 'plist'
@@ -256,15 +270,8 @@ def find_build_number_in(path = nil)

class LinuxInstallation < Installation
def version
# I don't find an easy way to extract the version on Linux
path = "#{root_path}/Editor/Data/"
package = IvyPlaybackEngineUtils.list_module_configs(path).first
raise "Couldn't find a module under #{path}" unless package
version = IvyPlaybackEngineUtils.unity_version(package) # FIXME
if (m = version.match(/^(.*)x(.*)Linux$/))
version = "#{m[1]}#{m[2]}"
end
version
path = "#{root_path}/Editor/Data/Resources/unity_builtin_extra"
InstallationUtils.read_version_from_unity_builtin_extra(path)
end

def build_number